Fix build due to removal of old extended collections (#4779)

src/common/user-store/preferences-helpers.ts

@@ -6,7 +6,7 @@
 import moment from "moment-timezone";
 import path from "path";
 import os from "os";
-import { getAppVersion, ObservableToggleSet } from "../utils";
+import { getAppVersion } from "../utils";
 import type { editor } from "monaco-editor";
 import merge from "lodash/merge";
 import { SemVer } from "semver";
@@ -236,10 +236,10 @@ const terminalCopyOnSelect: PreferenceDescription<boolean> = {
   },
 };
 
-const hiddenTableColumns: PreferenceDescription<[string, string[]][], Map<string, ObservableToggleSet<string>>> = {
+const hiddenTableColumns: PreferenceDescription<[string, string[]][], Map<string, Set<string>>> = {
   fromStore(val) {
     return new Map(
-      (val ?? []).map(([tableId, columnIds]) => [tableId, new ObservableToggleSet(columnIds)]),
+      (val ?? []).map(([tableId, columnIds]) => [tableId, new Set(columnIds)]),
     );
   },
   toStore(val) {

src/common/user-store/user-store.ts

@@ -11,7 +11,7 @@ import migrations, { fileNameMigration } from "../../migrations/user-store";
 import { getAppVersion } from "../utils/app-version";
 import { kubeConfigDefaultPath } from "../kube-helpers";
 import { appEventBus } from "../app-event-bus/event-bus";
-import { ObservableToggleSet, toJS } from "../../renderer/utils";
+import { getOrInsertSet, toggle, toJS } from "../../renderer/utils";
 import { DESCRIPTORS, EditorConfiguration, ExtensionRegistry, KubeconfigSyncValue, UserPreferencesModel, TerminalConfig } from "./preferences-helpers";
 import logger from "../../main/logger";
 
@@ -71,7 +71,7 @@ export class UserStore extends BaseStore<UserStoreModel> /* implements UserStore
    * The column IDs under each configurable table ID that have been configured
    * to not be shown
    */
-  hiddenTableColumns = observable.map<string, ObservableToggleSet<string>>();
+  hiddenTableColumns = observable.map<string, Set<string>>();
 
   /**
    * Monaco editor configs
@@ -133,16 +133,11 @@ export class UserStore extends BaseStore<UserStoreModel> /* implements UserStore
     return columnIds.some(columnId => config.has(columnId));
   }
 
-  @action
   /**
    * Toggles the hidden configuration of a table's column
    */
   toggleTableColumnVisibility(tableId: string, columnId: string) {
-    if (!this.hiddenTableColumns.get(tableId)) {
-      this.hiddenTableColumns.set(tableId, new ObservableToggleSet());
-    }
-
-    this.hiddenTableColumns.get(tableId).toggle(columnId);
+    toggle(getOrInsertSet(this.hiddenTableColumns, tableId), columnId);
   }
 
   @action

src/common/utils/collection-functions.ts

@@ -3,6 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import { runInAction } from "mobx";
+
 /**
  * Get the value behind `key`. If it was not present, first insert `value`
  * @param map The map to interact with
@@ -26,6 +28,14 @@ export function getOrInsertMap<K, MK, MV>(map: Map<K, Map<MK, MV>>, key: K): Map
   return getOrInsert(map, key, new Map<MK, MV>());
 }
 
+/**
+ * Like `getOrInsert` but specifically for when `V` is `Set<any>` so that
+ * the typings are inferred.
+ */
+export function getOrInsertSet<K, SK>(map: Map<K, Set<SK>>, key: K): Set<SK> {
+  return getOrInsert(map, key, new Set<SK>());
+}
+
 /**
  * Like `getOrInsert` but with delayed creation of the item
  */
@@ -36,3 +46,17 @@ export function getOrInsertWith<K, V>(map: Map<K, V>, key: K, value: () => V): V
 
   return map.get(key);
 }
+
+/**
+ * If `key` is in `set`, remove it otherwise add it.
+ * @param set The set to manipulate
+ * @param key The key to toggle the "is in"-ness of
+ */
+export function toggle<K>(set: Set<K>, key: K): void {
+  runInAction(() => {
+    // Returns true if value was already in Set; otherwise false.
+    if (!set.delete(key)) {
+      set.add(key);
+    }
+  });
+}

src/common/utils/index.ts

@@ -38,7 +38,6 @@ export * from "./singleton";
 export * from "./sort-compare";
 export * from "./splitArray";
 export * from "./tar";
-export * from "./toggle-set";
 export * from "./toJS";
 export * from "./type-narrowing";
 export * from "./types";

src/common/utils/toggle-set.ts

@@ -1,24 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import { ObservableSet } from "mobx";
-
-export class ToggleSet<T> extends Set<T> {
-  public toggle(value: T): void {
-    if (!this.delete(value)) {
-      // Set.prototype.delete returns false if `value` was not in the set
-      this.add(value);
-    }
-  }
-}
-
-export class ObservableToggleSet<T> extends ObservableSet<T> {
-  public toggle(value: T): void {
-    if (!this.delete(value)) {
-      // Set.prototype.delete returns false if `value` was not in the set
-      this.add(value);
-    }
-  }
-}