Correctly migrate duplicate clusters in workspaces (#3211)

- Keep track of the set of all workspaces that each duplicated entry was
  a part of

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/common/cluster-store.ts

@@ -71,6 +71,11 @@ export interface ClusterModel {
    */
   workspace?: string;
 
+  /**
+   * @deprecated this is used only for hotbar migrations from 4.2.X
+   */
+  workspaces?: string[];
+
   /** User context in kubeconfig  */
   contextName: string;
 

src/main/cluster.ts

@@ -120,6 +120,10 @@ export class Cluster implements ClusterModel, ClusterState {
    * @deprecated
    */
   @observable workspace: string;
+  /**
+   * @deprecated
+   */
+  @observable workspaces: string[];
   /**
    * Kubernetes API server URL
    *
@@ -294,6 +298,10 @@ export class Cluster implements ClusterModel, ClusterState {
       this.workspace = model.workspace;
     }
 
+    if (model.workspaces) {
+      this.workspaces = model.workspaces;
+    }
+
     if (model.contextName) {
       this.contextName = model.contextName;
     }
@@ -589,6 +597,7 @@ export class Cluster implements ClusterModel, ClusterState {
       contextName: this.contextName,
       kubeConfigPath: this.kubeConfigPath,
       workspace: this.workspace,
+      workspaces: this.workspaces,
       preferences: this.preferences,
       metadata: this.metadata,
       accessibleNamespaces: this.accessibleNamespaces,

src/migrations/cluster-store/5.0.0-beta.13.ts

@@ -63,8 +63,16 @@ function mergeLabels(left: Record<string, string>, right: Record<string, string>
   };
 }
 
-function mergeSet(left: Iterable<string>, right: Iterable<string>): string[] {
+function mergeSet(...iterables: Iterable<string>[]): string[] {
-  return [...new Set([...left, ...right])];
+  const res = new Set<string>();
+
+  for (const iterable of iterables) {
+    for (const val of iterable) {
+      res.add(val);
+    }
+  }
+
+  return [...res];
 }
 
 function mergeClusterModel(prev: ClusterModel, right: Omit<ClusterModel, "id">): ClusterModel {
@@ -77,6 +85,7 @@ function mergeClusterModel(prev: ClusterModel, right: Omit<ClusterModel, "id">):
     labels: mergeLabels(prev.labels ?? {}, right.labels ?? {}),
     accessibleNamespaces: mergeSet(prev.accessibleNamespaces ?? [], right.accessibleNamespaces ?? []),
     workspace: prev.workspace || right.workspace,
+    workspaces: mergeSet([prev.workspace, right.workspace], prev.workspaces ?? [], right.workspaces ?? []),
   };
 }
 
@@ -113,6 +122,7 @@ export default {
         clusters.set(newId, {
           ...cluster,
           id: newId,
+          workspaces: [cluster.workspace].filter(Boolean),
         });
         moveStorageFolder({ folder, newId, oldId });
       }

src/migrations/hotbar-store/5.0.0-beta.10.ts

@@ -71,17 +71,20 @@ export default {
 
       for (const cluster of clusters) {
         const uid = generateNewIdFor(cluster);
-        const workspaceHotbar = workspaceHotbars.get(cluster.workspace);
 
-        migrationLog(`Adding cluster ${uid} to ${workspaceHotbar.name}`);
+        for (const workspaceId of cluster.workspaces ?? [cluster.workspace].filter(Boolean)) {
+          const workspaceHotbar = workspaceHotbars.get(workspaceId);
 
-        if (workspaceHotbar?.items.length < defaultHotbarCells) {
+          migrationLog(`Adding cluster ${uid} to ${workspaceHotbar.name}`);
-          workspaceHotbar.items.push({
+
-            entity: {
+          if (workspaceHotbar?.items.length < defaultHotbarCells) {
-              uid: generateNewIdFor(cluster),
+            workspaceHotbar.items.push({
-              name: cluster.preferences.clusterName || cluster.contextName,
+              entity: {
-            }
+                uid: generateNewIdFor(cluster),
-          });
+                name: cluster.preferences.clusterName || cluster.contextName,
+              }
+            });
+          }
         }
       }