Merge branch 'main' into update-renovate

iterative · Nov 28, 2022 · d1eefc3 · d1eefc3
2 parents ee04d8b + 469ba55
commit d1eefc3
Show file tree

Hide file tree

Showing 13 changed files with 12,905 additions and 12,891 deletions.
diff --git a/extension/src/experiments/columns/collect/util.ts b/extension/src/experiments/columns/collect/util.ts
@@ -76,16 +76,16 @@ const mergeParentColumnByPath = (
   parentPath: string,
   label: string
 ) => {
-  if (!acc[path]) {
+  if (acc[path]) {
+    acc[path].hasChildren = true
+  } else {
     acc[path] = {
       hasChildren: true,
       label,
       parentPath,
       path,
       type
     }
-  } else {
-    acc[path].hasChildren = true
   }
 }
 

diff --git a/extension/src/experiments/model/quickPicks.ts b/extension/src/experiments/model/quickPicks.ts
@@ -33,7 +33,7 @@ const getItem = (experiment: Experiment, firstThreeColumnOrder: string[]) => ({
         15
       )
 
-      return value !== null ? `${truncatedKey}:${value}` : ''
+      return value === null ? '' : `${truncatedKey}:${value}`
     })
     .filter(Boolean)
     .join(', '),

diff --git a/extension/src/experiments/model/tree.ts b/extension/src/experiments/model/tree.ts
@@ -355,7 +355,7 @@ export class ExperimentsTree
           path.slice(type.length + 1) || path,
           30
         )
-        return value !== null ? `| ${truncatedKey} | ${value} |\n` : ''
+        return value === null ? '' : `| ${truncatedKey} | ${value} |\n`
       })
       .join('')
 

diff --git a/extension/src/experiments/model/util.ts b/extension/src/experiments/model/util.ts
@@ -46,7 +46,7 @@ export const getDataFromColumnPath = (
   return {
     splitUpPath,
     value:
-      columnPath === 'Created' && typeof value === 'undefined'
+      columnPath === 'Created' && value === 'undefined'
         ? null
         : getStringifiedValue(value)
   }

diff --git a/extension/src/plots/model/collect.ts b/extension/src/plots/model/collect.ts
@@ -542,7 +542,9 @@ const transformRevisionData = (
 ): { revisions: string[]; datapoints: unknown[] } => {
   const field = multiSourceEncodingUpdate.strokeDash?.field
   const isMultiSource = !!field
-
+  const availableRevisions = selectedRevisions.filter(rev =>
+    Object.keys(revisionData).includes(rev)
+  )
   const transformNeeded =
     isMultiSource && (isMultiView || isConcatenatedField(field))
 
@@ -551,7 +553,7 @@ const transformRevisionData = (
       datapoints: selectedRevisions
         .flatMap(revision => revisionData?.[revision]?.[path])
         .filter(Boolean),
-      revisions: selectedRevisions
+      revisions: availableRevisions
     }
   }
 
@@ -562,12 +564,12 @@ const transformRevisionData = (
       datapoints: updateDatapoints(
         path,
         revisionData,
-        selectedRevisions,
+        availableRevisions,
         'rev',
         fields
       ),
       revisions: updateRevisions(
-        selectedRevisions,
+        availableRevisions,
         multiSourceEncodingUpdate.strokeDash.scale.domain
       )
     }
@@ -577,11 +579,11 @@ const transformRevisionData = (
     datapoints: updateDatapoints(
       path,
       revisionData,
-      selectedRevisions,
+      availableRevisions,
       field,
       fields
     ),
-    revisions: selectedRevisions
+    revisions: availableRevisions
   }
 }