file-tree: keep "" features option; update_by_features

Author: zjp-CN

os-checks/pages/file-tree.vue

@@ -68,7 +68,7 @@ const selectedPkg = ref<string | null>(null);
 const selectedChecker = ref<string | null>(null);
 const selectedKind = ref<string | null>(null);
 const selectedTarget = ref(ALL_TARGETS);
-const selectedFeatures = ref("");
+const selectedFeatures = ref<string | null>(null);
 const displayFilters = ref(true);
 
 const got = ref<Get>(getEmpty());
@@ -128,9 +128,11 @@ function get_ck_kinds(ck: string | null): string[] | null {
   }
   return null;
 }
+// switch to another Get
 watch(got, g => {
-  // reset pkg since it's less likely to see the same selected pkg in another repo
+  // reset pkg and features since it's less likely to see the same selected pkg in another repo
   selectedPkg.value = null;
+  selectedFeatures.value = null;
 
   // reset kind if the diagnositc is empty
   selectedKind.value = Dropdown.find_kind(selectedKind.value, g);
@@ -148,11 +150,17 @@ watch(got, g => {
   }
   if (reset_checker) selectedChecker.value = null;
 });
+
+// watch selection changes
 watch(
-  () => ({ pkg: selectedPkg.value, kind: selectedKind.value, ck: selectedChecker.value, g: got.value }),
-  ({ pkg, kind, ck, g }) => {
+  () => ({
+    pkg: selectedPkg.value, feat: selectedFeatures.value,
+    kind: selectedKind.value, ck: selectedChecker.value, g: got.value
+  }),
+  ({ pkg, feat, kind, ck, g }) => {
     const target = cloneDeep(g);
 
+    Dropdown.update_by_features(feat, target);
     Dropdown.update_by_pkg(pkg, target);
 
     const ck_kinds = get_ck_kinds(ck);

os-checks/shared/file-tree/dropdown.ts

@@ -9,19 +9,14 @@ export class Dropdown {
   map: KindCheckerMap;
   checkers: DropDownOptions;
   features: DropDownOptions;
-  // has non-empty features
-  has_features: boolean;
 
   /** called when a new fileTree is created */
   constructor(g: Get, map: KindCheckerMap) {
     this.pkgs = gen_pkgs(g);
     this.kinds = gen_kinds(g);
     this.map = map; // map is supposed to never change
     this.checkers = gen_checkers(this.kinds, map);
-    const { has, opt } = gen_features(g);
-    console.log(has, opt);
-    this.has_features = has;
-    this.features = opt;
+    this.features = gen_features(g);
   }
 
   /** called when a fitler is changed */
@@ -31,10 +26,7 @@ export class Dropdown {
     options.pkgs.counts[ALL_PKGS] = this.pkgs.counts[ALL_PKGS];
     options.kinds.counts[ALL_KINDS] = this.kinds.counts[ALL_KINDS];
     options.checkers.counts[ALL_CHECKERS] = this.checkers.counts[ALL_CHECKERS];
-
-    if (this.has_features)
-      options.features.counts[ALL_FEATURES_SETS] = this.features.counts[ALL_FEATURES_SETS];
-
+    options.features.counts[ALL_FEATURES_SETS] = this.features.counts[ALL_FEATURES_SETS];
     return options;
   }
 
@@ -49,6 +41,10 @@ export class Dropdown {
     if (pkg && pkg !== ALL_PKGS) update_by_pkg(pkg, g);
   }
 
+  static update_by_features(feat: string | null, g: Get) {
+    if (feat !== null && feat !== ALL_FEATURES_SETS) update_by_features(feat, g);
+  }
+
   static update_by_kind(kind: string | null, g: Get) {
     if (kind && kind !== ALL_KINDS) update_by_kind(kind, g);
   }
@@ -128,7 +124,7 @@ export function gen_targets(targets: Targets): DropDownOptions {
   return counts_to_options(counts);
 }
 
-function gen_features(g: Get): { opt: DropDownOptions, has: boolean } {
+function gen_features(g: Get): DropDownOptions {
   let counts: Counts = {};
   for (const data of g.fileTree.data) {
     for (const reports of data.raw_reports) {
@@ -138,14 +134,7 @@ function gen_features(g: Get): { opt: DropDownOptions, has: boolean } {
       else counts[feat] = len;
     }
   }
-  // if no feat or only empty feat, treat it as no option
-  const len = Object.entries(counts).length;
-  const has_features = !(len === 0 || (len === 1 && counts[""]));
-  // ALL_FEATURES_SETS must only apply to has non-empty features
-  return {
-    opt: has_features ? counts_to_options(counts, ALL_FEATURES_SETS) : emptyOptions(),
-    has: has_features
-  };
+  return counts_to_options(counts, ALL_FEATURES_SETS);
 }
 
 // filters update Get: got2 is updated in place; got is deep cloned
@@ -154,6 +143,16 @@ export function update_by_pkg(pkg: string, g: Get) {
   g.fileTree.data = g.fileTree.data.filter(val => val.pkg === pkg);
 }
 
+export function update_by_features(feat: string, g: Get) {
+  for (const data of g.fileTree.data) {
+    // only keep feat
+    data.raw_reports = data.raw_reports.filter(r => r.features === feat);
+    data.count = data.raw_reports.length;
+  }
+  // only keep non-zero nodes
+  g.fileTree.data = g.fileTree.data.filter(d => d.count !== 0);
+}
+
 export function update_by_kind(kind: string, g: Get) {
   update_by_checker([kind], g);
 }