Merge pull request #1006 from nextstrain/feat/allow-hiding-custom-cla…

…de-columns feat: allow hiding custom clade columns
nextstrain · Oct 3, 2022 · ade06e2 · ade06e2 · vercel · Oct 4, 2022
2 parents c8fe93e + d30d608
commit ade06e2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/packages_rs/nextclade-web/src/state/results.state.ts b/packages_rs/nextclade-web/src/state/results.state.ts
@@ -215,11 +215,25 @@ export const hasTreeAtom = selector<boolean>({
   },
 })
 
-export const cladeNodeAttrDescsAtom = atom<CladeNodeAttrDesc[]>({
-  key: 'cladeNodeAttrDescs',
+const cladeNodeAttrDescsStorageAtom = atom<CladeNodeAttrDesc[]>({
+  key: 'cladeNodeAttrDescsStorage',
   default: [],
 })
 
+export const cladeNodeAttrDescsAtom = selector<CladeNodeAttrDesc[]>({
+  key: 'cladeNodeAttrDescs',
+  get({ get }): CladeNodeAttrDesc[] {
+    return get(cladeNodeAttrDescsStorageAtom).filter(({ hideInWeb }) => !hideInWeb)
+  },
+
+  set({ set, reset }, descs: CladeNodeAttrDesc[] | DefaultValue) {
+    set(cladeNodeAttrDescsStorageAtom, descs)
+    if (isDefaultValue(descs)) {
+      reset(cladeNodeAttrDescsStorageAtom)
+    }
+  },
+})
+
 export const cladeNodeAttrKeysAtom = selector<string[]>({
   key: 'cladeNodeAttrKeys',
   get: ({ get }) => get(cladeNodeAttrDescsAtom).map((desc) => desc.name),

diff --git a/packages_rs/nextclade-web/src/types/auspice/index.d.ts b/packages_rs/nextclade-web/src/types/auspice/index.d.ts
@@ -203,6 +203,7 @@ declare module 'auspice' {
     name: string
     displayName: string
     description: string
+    hideInWeb: boolean
   }
 
   export declare interface AuspiceMetadata {

diff --git a/packages_rs/nextclade/src/tree/tree.rs b/packages_rs/nextclade/src/tree/tree.rs
@@ -167,6 +167,8 @@ pub struct CladeNodeAttrKeyDesc {
   pub name: String,
   pub display_name: String,
   pub description: String,
+  #[serde(default)]
+  pub hide_in_web: bool,
 }
 
 #[derive(Clone, Serialize, Deserialize, Validate, Debug)]