View state storage

client-app/src/admin/tests/viewmanager/ViewManagerTestModel.ts

@@ -76,10 +76,9 @@ export class ViewManagerTestModel extends HoistModel {
             .map(it => it.name);
         return [
             'type',
+            'instance',
             'typeDisplayName',
             'globalDisplayName',
-            'localStorageKey',
-            'sessionStorageKey',
             'manageGlobal',
             'enableGlobal',
             'enableSharing',
@@ -96,10 +95,9 @@ export class ViewManagerTestModel extends HoistModel {
         this.configFormModel = new FormModel({
             fields: [
                 {name: 'type', rules: [required], initialValue: 'testView'},
+                {name: 'instance', rules: [required], initialValue: 'default'},
                 {name: 'typeDisplayName', initialValue: 'view'},
                 {name: 'globalDisplayName', initialValue: 'global'},
-                {name: 'localStorageKey', initialValue: 'viewManagerTest'},
-                {name: 'sessionStorageKey', initialValue: 'viewManagerTest'},
                 {name: 'manageGlobal', initialValue: true},
                 {name: 'enableGlobal', initialValue: true},
                 {name: 'enableSharing', initialValue: true},
@@ -129,10 +127,9 @@ export class ViewManagerTestModel extends HoistModel {
         const data = configFormModel.getData(),
             {
                 type,
+                instance,
                 typeDisplayName,
                 globalDisplayName,
-                localStorageKey,
-                sessionStorageKey,
                 manageGlobal,
                 enableGlobal,
                 enableSharing,
@@ -142,23 +139,16 @@ export class ViewManagerTestModel extends HoistModel {
                 settleTime
             } = data;
 
-        const persistWith = localStorageKey
-            ? {
-                  localStorageKey,
-                  persistPendingValue: sessionStorageKey ? {sessionStorageKey} : false
-              }
-            : null;
-
         const newModel = await ViewManagerModel.createAsync({
             type,
+            instance,
             typeDisplayName,
             globalDisplayName,
             manageGlobal,
             enableGlobal,
             enableSharing,
             enableDefault,
             enableAutoSave,
-            persistWith,
             settleTime,
             initialViewSpec: views => views.find(v => v.name == initialViewName) ?? views[0]
         });
@@ -186,10 +176,7 @@ export class ViewManagerTestModel extends HoistModel {
         const persistWith = {viewManagerModel: this.viewManagerModel};
 
         this.groupingChooserModel = createGroupingChooserModel(persistWith);
-        this.filterChooserModel = createFilterChooserModel(
-            persistWith,
-            this.configFormModel.values.localStorageKey
-        );
+        this.filterChooserModel = createFilterChooserModel(persistWith);
 
         this.tabContainerModel = new TabContainerModel({
             persistWith,
@@ -320,10 +307,6 @@ class BaseWidgetModel extends HoistModel {
         return this.vmtModel.viewManagerModel;
     }
 
-    get localStorageKey(): string {
-        return this.vmtModel.configFormModel.values.localStorageKey;
-    }
-
     override onLinked() {
         super.onLinked();
         this.persistWith = {dashViewModel: this.dashViewModel};
@@ -359,7 +342,7 @@ class FilterChooserWidgetModel extends BaseWidgetModel {
 
     override onLinked() {
         super.onLinked();
-        this.filterChooserModel = createFilterChooserModel(this.persistWith, this.localStorageKey);
+        this.filterChooserModel = createFilterChooserModel(this.persistWith);
     }
 }
 
@@ -370,11 +353,11 @@ const filterChooserWidget = hoistCmp.factory({
     }
 });
 
-const createFilterChooserModel = (persistWith: PersistOptions, localStorageKey: string) => {
+const createFilterChooserModel = (persistWith: PersistOptions) => {
     return new FilterChooserModel({
         persistWith: {
             persistValue: persistWith,
-            persistFavorites: localStorageKey ? {localStorageKey: localStorageKey} : null
+            persistFavorites: {localStorageKey: 'filterChooserFavorites'}
         },
         fieldSpecs: [
             {field: 'color', values: ['green', 'blue', 'red']},

client-app/src/admin/tests/viewmanager/ViewManagerTestPanel.ts

@@ -131,20 +131,15 @@ const modelConfig = hoistCmp.factory({
                     item: textInput()
                 }),
                 formField({
-                    field: 'typeDisplayName',
-                    item: textInput({enableClear: true})
-                }),
-                formField({
-                    field: 'globalDisplayName',
-                    item: textInput({enableClear: true})
+                    field: 'instance',
+                    item: textInput()
                 }),
                 formField({
-                    field: 'localStorageKey',
+                    field: 'typeDisplayName',
                     item: textInput({enableClear: true})
                 }),
                 formField({
-                    field: 'sessionStorageKey',
-                    info: 'If set, will persist pendingValue',
+                    field: 'globalDisplayName',
                     item: textInput({enableClear: true})
                 }),
                 formField({

client-app/src/examples/portfolio/AppModel.ts

@@ -21,8 +21,7 @@ export class AppModel extends BaseAppModel {
             type: 'portfolioLayout',
             typeDisplayName: 'Layout',
             enableDefault: true,
-            manageGlobal: true,
-            persistWith: {localStorageKey: 'portfolioViewManager'}
+            manageGlobal: XH.getUser().isHoistAdmin
         });
 
         this.addReaction({