@jbrowse/plugin-data-management 2.12.3 → 2.13.0

package/dist/HierarchicalTrackSelectorWidget/components/tree/TrackCategory.js

@@ -58,7 +58,7 @@ function Category({ isOpen, setOpen, data, }) {
                 setOpen(!isOpen);
             }
         } },
-        react_1.default.createElement(material_1.Typography, null,
+        react_1.default.createElement(material_1.Typography, { "data-testid": `htsCategory-${name}` },
             isOpen ? react_1.default.createElement(ArrowDropDown_1.default, null) : react_1.default.createElement(ArrowRight_1.default, null),
             name,
             react_1.default.createElement(material_1.IconButton, { onClick: event => {

package/dist/HierarchicalTrackSelectorWidget/model.d.ts

@@ -2,6 +2,7 @@ import { Instance } from 'mobx-state-tree';
 import { AnyConfigurationModel } from '@jbrowse/core/configuration';
 import PluginManager from '@jbrowse/core/PluginManager';
 type MaybeAnyConfigurationModel = AnyConfigurationModel | undefined;
+type MaybeBoolean = boolean | undefined;
 /**
  * #stateModel HierarchicalTrackSelectorWidget
  */
@@ -103,8 +104,8 @@ export default function stateTreeFactory(pluginManager: PluginManager): import("
     favorites: string[];
     recentlyUsed: string[];
     selection: AnyConfigurationModel[];
-    sortTrackNames: boolean;
-    sortCategories: boolean;
+    sortTrackNames: MaybeBoolean;
+    sortCategories: MaybeBoolean;
     collapsed: import("mobx").ObservableMap<string, boolean>;
     filterText: string;
     recentlyUsedCounter: number;
@@ -250,11 +251,11 @@ export default function stateTreeFactory(pluginManager: PluginManager): import("
     /**
      * #getter
      */
-    readonly activeSortTrackNames: boolean;
+    readonly activeSortTrackNames: any;
     /**
      * #getter
      */
-    readonly activeSortCategories: boolean;
+    readonly activeSortCategories: any;
     /**
      * #getter
      * filter out tracks that don't match the current assembly/display types

package/dist/HierarchicalTrackSelectorWidget/model.js

@@ -11,19 +11,15 @@ const filterTracks_1 = require("./filterTracks");
 const generateHierarchy_1 = require("./generateHierarchy");
 const util_2 = require("./util");
 const facetedModel_1 = require("./facetedModel");
-// for settings that are not config dependent
-function keyNoConfigPostFix() {
-    return typeof window !== 'undefined'
-        ? [window.location.host, window.location.pathname].join('-')
-        : 'empty';
-}
 // for settings that are config dependent
 function keyConfigPostFix() {
     return typeof window !== 'undefined'
         ? [
-            keyNoConfigPostFix(),
+            window.location.pathname,
             new URLSearchParams(window.location.search).get('config'),
-        ].join('-')
+        ]
+            .filter(f => !!f)
+            .join('-')
         : 'empty';
 }
 function recentlyUsedK(assemblyNames) {
@@ -51,11 +47,15 @@ function sortCategoriesK() {
     return 'sortCategories';
 }
 function localStorageGetJSON(key, defaultValue) {
-    var _a;
-    return JSON.parse((_a = (0, util_1.localStorageGetItem)(key)) !== null && _a !== void 0 ? _a : defaultValue);
+    const val = (0, util_1.localStorageGetItem)(key);
+    return val !== undefined && val !== null && val
+        ? JSON.parse(val)
+        : defaultValue;
 }
 function localStorageSetJSON(key, val) {
-    (0, util_1.localStorageSetItem)(key, JSON.stringify(val));
+    if (val !== undefined && val !== null) {
+        (0, util_1.localStorageSetItem)(key, JSON.stringify(val));
+    }
 }
 const MAX_RECENTLY_USED = 10;
 /**
@@ -82,11 +82,11 @@ function stateTreeFactory(pluginManager) {
         faceted: mobx_state_tree_1.types.optional((0, facetedModel_1.facetedStateTreeF)(), {}),
     })
         .volatile(() => ({
-        favorites: localStorageGetJSON(favoritesK(), '[]'),
+        favorites: localStorageGetJSON(favoritesK(), []),
         recentlyUsed: [],
         selection: [],
-        sortTrackNames: !!localStorageGetJSON(sortTrackNamesK(), 'false'),
-        sortCategories: !!localStorageGetJSON(sortCategoriesK(), 'false'),
+        sortTrackNames: localStorageGetJSON(sortTrackNamesK(), undefined),
+        sortCategories: localStorageGetJSON(sortCategoriesK(), undefined),
         collapsed: mobx_1.observable.map(),
         filterText: '',
         recentlyUsedCounter: 0,
@@ -454,46 +454,35 @@ function stateTreeFactory(pluginManager) {
             // this should be the first autorun to properly initialize
             (0, mobx_state_tree_1.addDisposer)(self, (0, mobx_1.autorun)(() => {
                 const { assemblyNames, view } = self;
-                self.setRecentlyUsed(localStorageGetJSON(recentlyUsedK(assemblyNames), '[]'));
+                self.setRecentlyUsed(localStorageGetJSON(recentlyUsedK(assemblyNames), []));
                 if (view) {
-                    const val = (0, util_1.localStorageGetItem)(collapsedK(assemblyNames, view.type));
-                    if (!val) {
+                    const lc = localStorageGetJSON(collapsedK(assemblyNames, view.type), undefined);
+                    const r = ['hierarchical', 'defaultCollapsed'];
+                    const session = (0, util_1.getSession)(self);
+                    if (!lc) {
                         self.expandAllCategories();
-                        const session = (0, util_1.getSession)(self);
-                        if ((0, configuration_1.getConf)(session, [
-                            'hierarchical',
-                            'defaultCollapsed',
-                            'topLevelCategories',
-                        ])) {
+                        if ((0, configuration_1.getConf)(session, [...r, 'topLevelCategories'])) {
                             self.collapseTopLevelCategories();
                         }
-                        if ((0, configuration_1.getConf)(session, [
-                            'hierarchical',
-                            'defaultCollapsed',
-                            'subCategories',
-                        ])) {
+                        if ((0, configuration_1.getConf)(session, [...r, 'subCategories'])) {
                             self.collapseSubCategories();
                         }
-                        for (const entry of (0, configuration_1.getConf)(session, [
-                            'hierarchical',
-                            'defaultCollapsed',
-                            'categoryNames',
-                        ])) {
-                            self.setCategoryCollapsed(`Tracks-${entry}`, true);
+                        for (const elt of (0, configuration_1.getConf)(session, [...r, 'categoryNames'])) {
+                            self.setCategoryCollapsed(`Tracks-${elt}`, true);
                         }
                     }
                     else {
-                        self.setCollapsedCategories(JSON.parse(val));
+                        self.setCollapsedCategories(lc);
                     }
                 }
             }));
             // this should be the second autorun
             (0, mobx_state_tree_1.addDisposer)(self, (0, mobx_1.autorun)(() => {
-                const { assemblyNames, collapsed, view } = self;
-                localStorageSetJSON(recentlyUsedK(assemblyNames), self.recentlyUsed);
-                localStorageSetJSON(favoritesK(), self.favorites);
-                localStorageSetJSON(sortTrackNamesK(), self.sortTrackNames);
-                localStorageSetJSON(sortCategoriesK(), self.sortCategories);
+                const { sortTrackNames, sortCategories, favorites, recentlyUsed, assemblyNames, collapsed, view, } = self;
+                localStorageSetJSON(recentlyUsedK(assemblyNames), recentlyUsed);
+                localStorageSetJSON(favoritesK(), favorites);
+                localStorageSetJSON(sortTrackNamesK(), sortTrackNames);
+                localStorageSetJSON(sortCategoriesK(), sortCategories);
                 if (view) {
                     localStorageSetJSON(collapsedK(assemblyNames, view.type), collapsed);
                 }

package/esm/HierarchicalTrackSelectorWidget/components/tree/TrackCategory.js

@@ -29,7 +29,7 @@ export default function Category({ isOpen, setOpen, data, }) {
                 setOpen(!isOpen);
             }
         } },
-        React.createElement(Typography, null,
+        React.createElement(Typography, { "data-testid": `htsCategory-${name}` },
             isOpen ? React.createElement(ArrowDropDownIcon, null) : React.createElement(ArrowRightIcon, null),
             name,
             React.createElement(IconButton, { onClick: event => {

package/esm/HierarchicalTrackSelectorWidget/model.d.ts

@@ -2,6 +2,7 @@ import { Instance } from 'mobx-state-tree';
 import { AnyConfigurationModel } from '@jbrowse/core/configuration';
 import PluginManager from '@jbrowse/core/PluginManager';
 type MaybeAnyConfigurationModel = AnyConfigurationModel | undefined;
+type MaybeBoolean = boolean | undefined;
 /**
  * #stateModel HierarchicalTrackSelectorWidget
  */
@@ -103,8 +104,8 @@ export default function stateTreeFactory(pluginManager: PluginManager): import("
     favorites: string[];
     recentlyUsed: string[];
     selection: AnyConfigurationModel[];
-    sortTrackNames: boolean;
-    sortCategories: boolean;
+    sortTrackNames: MaybeBoolean;
+    sortCategories: MaybeBoolean;
     collapsed: import("mobx").ObservableMap<string, boolean>;
     filterText: string;
     recentlyUsedCounter: number;
@@ -250,11 +251,11 @@ export default function stateTreeFactory(pluginManager: PluginManager): import("
     /**
      * #getter
      */
-    readonly activeSortTrackNames: boolean;
+    readonly activeSortTrackNames: any;
     /**
      * #getter
      */
-    readonly activeSortCategories: boolean;
+    readonly activeSortCategories: any;
     /**
      * #getter
      * filter out tracks that don't match the current assembly/display types

package/esm/HierarchicalTrackSelectorWidget/model.js

@@ -8,19 +8,15 @@ import { filterTracks } from './filterTracks';
 import { generateHierarchy } from './generateHierarchy';
 import { findSubCategories, findTopLevelCategories } from './util';
 import { facetedStateTreeF } from './facetedModel';
-// for settings that are not config dependent
-function keyNoConfigPostFix() {
-    return typeof window !== 'undefined'
-        ? [window.location.host, window.location.pathname].join('-')
-        : 'empty';
-}
 // for settings that are config dependent
 function keyConfigPostFix() {
     return typeof window !== 'undefined'
         ? [
-            keyNoConfigPostFix(),
+            window.location.pathname,
             new URLSearchParams(window.location.search).get('config'),
-        ].join('-')
+        ]
+            .filter(f => !!f)
+            .join('-')
         : 'empty';
 }
 function recentlyUsedK(assemblyNames) {
@@ -48,11 +44,15 @@ function sortCategoriesK() {
     return 'sortCategories';
 }
 function localStorageGetJSON(key, defaultValue) {
-    var _a;
-    return JSON.parse((_a = localStorageGetItem(key)) !== null && _a !== void 0 ? _a : defaultValue);
+    const val = localStorageGetItem(key);
+    return val !== undefined && val !== null && val
+        ? JSON.parse(val)
+        : defaultValue;
 }
 function localStorageSetJSON(key, val) {
-    localStorageSetItem(key, JSON.stringify(val));
+    if (val !== undefined && val !== null) {
+        localStorageSetItem(key, JSON.stringify(val));
+    }
 }
 const MAX_RECENTLY_USED = 10;
 /**
@@ -79,11 +79,11 @@ export default function stateTreeFactory(pluginManager) {
         faceted: types.optional(facetedStateTreeF(), {}),
     })
         .volatile(() => ({
-        favorites: localStorageGetJSON(favoritesK(), '[]'),
+        favorites: localStorageGetJSON(favoritesK(), []),
         recentlyUsed: [],
         selection: [],
-        sortTrackNames: !!localStorageGetJSON(sortTrackNamesK(), 'false'),
-        sortCategories: !!localStorageGetJSON(sortCategoriesK(), 'false'),
+        sortTrackNames: localStorageGetJSON(sortTrackNamesK(), undefined),
+        sortCategories: localStorageGetJSON(sortCategoriesK(), undefined),
         collapsed: observable.map(),
         filterText: '',
         recentlyUsedCounter: 0,
@@ -451,46 +451,35 @@ export default function stateTreeFactory(pluginManager) {
             // this should be the first autorun to properly initialize
             addDisposer(self, autorun(() => {
                 const { assemblyNames, view } = self;
-                self.setRecentlyUsed(localStorageGetJSON(recentlyUsedK(assemblyNames), '[]'));
+                self.setRecentlyUsed(localStorageGetJSON(recentlyUsedK(assemblyNames), []));
                 if (view) {
-                    const val = localStorageGetItem(collapsedK(assemblyNames, view.type));
-                    if (!val) {
+                    const lc = localStorageGetJSON(collapsedK(assemblyNames, view.type), undefined);
+                    const r = ['hierarchical', 'defaultCollapsed'];
+                    const session = getSession(self);
+                    if (!lc) {
                         self.expandAllCategories();
-                        const session = getSession(self);
-                        if (getConf(session, [
-                            'hierarchical',
-                            'defaultCollapsed',
-                            'topLevelCategories',
-                        ])) {
+                        if (getConf(session, [...r, 'topLevelCategories'])) {
                             self.collapseTopLevelCategories();
                         }
-                        if (getConf(session, [
-                            'hierarchical',
-                            'defaultCollapsed',
-                            'subCategories',
-                        ])) {
+                        if (getConf(session, [...r, 'subCategories'])) {
                             self.collapseSubCategories();
                         }
-                        for (const entry of getConf(session, [
-                            'hierarchical',
-                            'defaultCollapsed',
-                            'categoryNames',
-                        ])) {
-                            self.setCategoryCollapsed(`Tracks-${entry}`, true);
+                        for (const elt of getConf(session, [...r, 'categoryNames'])) {
+                            self.setCategoryCollapsed(`Tracks-${elt}`, true);
                         }
                     }
                     else {
-                        self.setCollapsedCategories(JSON.parse(val));
+                        self.setCollapsedCategories(lc);
                     }
                 }
             }));
             // this should be the second autorun
             addDisposer(self, autorun(() => {
-                const { assemblyNames, collapsed, view } = self;
-                localStorageSetJSON(recentlyUsedK(assemblyNames), self.recentlyUsed);
-                localStorageSetJSON(favoritesK(), self.favorites);
-                localStorageSetJSON(sortTrackNamesK(), self.sortTrackNames);
-                localStorageSetJSON(sortCategoriesK(), self.sortCategories);
+                const { sortTrackNames, sortCategories, favorites, recentlyUsed, assemblyNames, collapsed, view, } = self;
+                localStorageSetJSON(recentlyUsedK(assemblyNames), recentlyUsed);
+                localStorageSetJSON(favoritesK(), favorites);
+                localStorageSetJSON(sortTrackNamesK(), sortTrackNames);
+                localStorageSetJSON(sortCategoriesK(), sortCategories);
                 if (view) {
                     localStorageSetJSON(collapsedK(assemblyNames, view.type), collapsed);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-data-management",
-  "version": "2.12.3",
+  "version": "2.13.0",
   "description": "JBrowse 2 linear genome view",
   "keywords": [
     "jbrowse",
@@ -60,5 +60,5 @@
   "distModule": "esm/index.js",
   "srcModule": "src/index.ts",
   "module": "esm/index.js",
-  "gitHead": "2775490221cde56af344acebb0afa7e14531cd81"
+  "gitHead": "efe02fb9616e20e929cceeed46eb96420c1b6923"
 }