@haniffalab/cherita-react 0.1.12-dev.2024-02-12.f6d21b70 → 0.1.12-dev.2024-02-12.b016d286

package/dist/components/dotplot/Dotplot.js

@@ -268,20 +268,28 @@ function Dotplot() {
       });
     });
   }, [dataset.controls.colorAxis.cmin, dataset.controls.colorAxis.cmax]);
-  if (hasSelections) {
+  if (!serverError) {
+    if (hasSelections) {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: "cherita-dotplot position-relative"
+      }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
+        data: data,
+        layout: layout,
+        useResizeHandler: true,
+        style: {
+          maxWidth: "100%",
+          maxHeight: "100%"
+        }
+      }));
+    }
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: "cherita-dotplot position-relative"
-    }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
-      data: data,
-      layout: layout,
-      useResizeHandler: true,
-      style: {
-        maxWidth: "100%",
-        maxHeight: "100%"
-      }
-    }));
+      className: "cherita-dotplot"
+    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "light"
+    }, "Select features and a category"));
+  } else {
+    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "danger"
+    }, serverError.message));
   }
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "cherita-dotplot"
-  }, /*#__PURE__*/_react.default.createElement("p", null, "Select OBS and VAR"));
 }

package/dist/components/heatmap/Heatmap.js

@@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.Heatmap = Heatmap;
 exports.HeatmapControls = HeatmapControls;
 require("bootstrap/dist/css/bootstrap.min.css");
-var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
+var _reactBootstrap = require("react-bootstrap");
 var _react = _interopRequireWildcard(require("react"));
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
 var _DatasetContext = require("../../context/DatasetContext");
 var _constants = require("../../constants/constants");
 var _requests = require("../../utils/requests");
 var _LoadingSpinner = require("../../utils/LoadingSpinner");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -32,7 +32,7 @@ function HeatmapControls() {
   var dataset = (0, _DatasetContext.useDataset)();
   var dispatch = (0, _DatasetContext.useDatasetDispatch)();
   var colormapList = _constants.PLOTLY_COLORSCALES.map(function (item) {
-    return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
+    return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
       key: item,
       active: dataset.controls.colorScale === item,
       onClick: function onClick() {
@@ -43,10 +43,10 @@ function HeatmapControls() {
       }
     }, item);
   });
-  return /*#__PURE__*/_react.default.createElement(_Dropdown.default, null, /*#__PURE__*/_react.default.createElement(_Dropdown.default.Toggle, {
+  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Toggle, {
     id: "dropdownColorscale",
     variant: "light"
-  }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, colormapList));
+  }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, colormapList));
 }
 function Heatmap() {
   var ENDPOINT = "heatmap";
@@ -116,20 +116,28 @@ function Heatmap() {
     colorscale.current = dataset.controls.colorScale;
     updateColorscale(colorscale.current);
   }, [dataset.controls.colorScale, updateColorscale]);
-  if (hasSelections) {
+  if (!serverError) {
+    if (hasSelections) {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: "cherita-heatmap position-relative"
+      }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
+        data: data,
+        layout: layout,
+        useResizeHandler: true,
+        style: {
+          maxWidth: "100%",
+          maxHeight: "100%"
+        }
+      }));
+    }
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: "cherita-heatmap position-relative"
-    }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
-      data: data,
-      layout: layout,
-      useResizeHandler: true,
-      style: {
-        maxWidth: "100%",
-        maxHeight: "100%"
-      }
-    }));
+      className: "cherita-heatmap"
+    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "light"
+    }, "Select features and a category"));
+  } else {
+    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "danger"
+    }, serverError.message));
   }
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "cherita-heatmap"
-  }, /*#__PURE__*/_react.default.createElement("p", null, "Select OBS and VAR"));
 }

package/dist/components/matrixplot/Matrixplot.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.Matrixplot = Matrixplot;
 exports.MatrixplotControls = MatrixplotControls;
 require("bootstrap/dist/css/bootstrap.min.css");
-var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
 var _DatasetContext = require("../../context/DatasetContext");
@@ -15,9 +14,9 @@ var _constants = require("../../constants/constants");
 var _reactBootstrap = require("react-bootstrap");
 var _requests = require("../../utils/requests");
 var _LoadingSpinner = require("../../utils/LoadingSpinner");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -33,7 +32,7 @@ function MatrixplotControls() {
   var dataset = (0, _DatasetContext.useDataset)();
   var dispatch = (0, _DatasetContext.useDatasetDispatch)();
   var colorScaleList = _constants.PLOTLY_COLORSCALES.map(function (item) {
-    return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
+    return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
       key: item,
       active: dataset.controls.colorScale === item,
       onClick: function onClick() {
@@ -45,7 +44,7 @@ function MatrixplotControls() {
     }, item);
   });
   var standardScaleList = _constants.MATRIXPLOT_STANDARDSCALES.map(function (item) {
-    return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
+    return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
       key: item.value,
       active: dataset.controls.standardScale === item.name,
       onClick: function onClick() {
@@ -56,13 +55,13 @@ function MatrixplotControls() {
       }
     }, item.name);
   });
-  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonToolbar, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_Dropdown.default, null, /*#__PURE__*/_react.default.createElement(_Dropdown.default.Toggle, {
+  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonToolbar, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Toggle, {
     id: "dropdownColorscale",
     variant: "light"
-  }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, colorScaleList))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup.Text, null, "Standard scale"), /*#__PURE__*/_react.default.createElement(_Dropdown.default, null, /*#__PURE__*/_react.default.createElement(_Dropdown.default.Toggle, {
+  }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, colorScaleList))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup.Text, null, "Standard scale"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Toggle, {
     id: "dropdownStandardScale",
     variant: "light"
-  }, dataset.controls.standardScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, standardScaleList)))));
+  }, dataset.controls.standardScale), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, standardScaleList)))));
 }
 function Matrixplot() {
   var ENDPOINT = "matrixplot";
@@ -134,20 +133,28 @@ function Matrixplot() {
     colorscale.current = dataset.controls.colorScale;
     updateColorscale(colorscale.current);
   }, [dataset.controls.colorScale, updateColorscale]);
-  if (hasSelections) {
+  if (!serverError) {
+    if (hasSelections) {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: "cherita-matrixplot position-relative"
+      }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
+        data: data,
+        layout: layout,
+        useResizeHandler: true,
+        style: {
+          maxWidth: "100%",
+          maxHeight: "100%"
+        }
+      }));
+    }
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: "cherita-matrixplot position-relative"
-    }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
-      data: data,
-      layout: layout,
-      useResizeHandler: true,
-      style: {
-        maxWidth: "100%",
-        maxHeight: "100%"
-      }
-    }));
+      className: "cherita-matrixplot"
+    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "light"
+    }, "Select features and a category"));
+  } else {
+    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "danger"
+    }, serverError.message));
   }
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "cherita-matrixplot"
-  }, /*#__PURE__*/_react.default.createElement("p", null, "Select OBS and VAR"));
 }

package/dist/components/obs-list/ObsList.js

@@ -10,10 +10,10 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _react = _interopRequireWildcard(require("react"));
 var _DatasetContext = require("../../context/DatasetContext");
 var _requests = require("../../utils/requests");
-var _reactBootstrap = require("react-bootstrap");
 var _chromaJs = _interopRequireDefault(require("chroma-js"));
 var _color = require("../../helpers/color");
 var _LoadingSpinner = require("../../utils/LoadingSpinner");
+var _reactBootstrap = require("react-bootstrap");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -64,16 +64,20 @@ function ObsColsList() {
     _useState4 = _slicedToArray(_useState3, 2),
     obs = _useState4[0],
     setObs = _useState4[1];
-  var _useState5 = (0, _react.useState)(null),
+  var _useState5 = (0, _react.useState)(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    active = _useState6[0],
-    setActive = _useState6[1];
-  var _useState7 = (0, _react.useState)({
+    updatedObsColsList = _useState6[0],
+    setUpdatedObsColsList = _useState6[1];
+  var _useState7 = (0, _react.useState)(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    active = _useState8[0],
+    setActive = _useState8[1];
+  var _useState9 = (0, _react.useState)({
       url: dataset.url
     }),
-    _useState8 = _slicedToArray(_useState7, 2),
-    params = _useState8[0],
-    setParams = _useState8[1];
+    _useState10 = _slicedToArray(_useState9, 2),
+    params = _useState10[0],
+    setParams = _useState10[1];
   var colorHelper = new _color.ColorHelper();
   (0, _react.useEffect)(function () {
     setParams(function (p) {
@@ -88,23 +92,36 @@ function ObsColsList() {
     fetchedData = _useFetch.fetchedData,
     isPending = _useFetch.isPending,
     serverError = _useFetch.serverError;
+  var validateSelection = (0, _react.useCallback)(function (selectedObs) {
+    if (updatedObsColsList) {
+      if (!_lodash.default.some(obsColsList, selectedObs)) {
+        setActive(null);
+        dispatch({
+          type: "obsSelected",
+          obs: null
+        });
+      }
+    }
+  }, [dispatch, obsColsList, updatedObsColsList]);
   (0, _react.useEffect)(function () {
     if (!isPending && !serverError) {
       setObs(fetchedData.reduce(function (result, key) {
         var colors = _chromaJs.default.scale("Accent").colors(key.n_values, "rgb");
         result[key.name] = {
-          is_truncated: key.is_truncated,
-          n_values: key.n_values,
-          type: key.type,
-          values: key.values,
-          state: key.values.map(function (value, index) {
+          type: key.type
+        };
+        if (key.type === "categorical") {
+          result[key.name]["is_truncated"] = key.is_truncated;
+          result[key.name]["n_values"] = key.n_values;
+          result[key.name]["values"] = key.values;
+          result[key.name]["state"] = key.values.map(function (value, index) {
             return {
               value: value,
               color: (0, _chromaJs.default)(colors[index]).rgb(),
               checked: true
             };
-          })
-        };
+          });
+        }
         return result;
       }, {}));
       setObsColsList(fetchedData.map(function (d) {
@@ -116,13 +133,15 @@ function ObsColsList() {
         }
         return d;
       }));
+      setUpdatedObsColsList(true);
     }
   }, [fetchedData, isPending, serverError]);
   (0, _react.useEffect)(function () {
     if (dataset.selectedObs) {
+      validateSelection(dataset.selectedObs);
       setActive(dataset.selectedObs.name);
     }
-  }, [dataset.selectedObs]);
+  }, [dataset.selectedObs, validateSelection]);
   (0, _react.useEffect)(function () {
     dispatch({
       type: "set.obs",
@@ -170,22 +189,28 @@ function ObsColsList() {
       }
     });
   }, [obsColsList]);
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "position-relative"
-  }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement("div", {
-    className: "list-group overflow-auto"
-  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, {
-    flush: true,
-    activeKey: active,
-    onSelect: function onSelect(key) {
-      if (key != null) {
-        dispatch({
-          type: "obsSelected",
-          obs: obsColsList.find(function (obs) {
-            return obs.name === key;
-          })
-        });
+  if (!serverError) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "position-relative"
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "list-group overflow-auto"
+    }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, {
+      flush: true,
+      activeKey: active,
+      onSelect: function onSelect(key) {
+        if (key != null) {
+          dispatch({
+            type: "obsSelected",
+            obs: obsColsList.find(function (obs) {
+              return obs.name === key;
+            })
+          });
+        }
       }
-    }
-  }, obsList)));
+    }, obsList)));
+  } else {
+    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "danger"
+    }, serverError.message));
+  }
 }

package/dist/components/obsm-list/ObsmList.js

@@ -9,6 +9,8 @@ require("bootstrap/dist/css/bootstrap.min.css");
 var _react = _interopRequireWildcard(require("react"));
 var _requests = require("../../utils/requests");
 var _DatasetContext = require("../../context/DatasetContext");
+var _LoadingSpinner = require("../../utils/LoadingSpinner");
+var _reactBootstrap = require("react-bootstrap");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -76,9 +78,15 @@ function ObsmKeysList() {
       }
     }, item);
   });
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: ""
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "list-group overflow-auto mh-100"
-  }, obsmList));
+  if (!serverError) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: ""
+    }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement("div", {
+      className: "list-group overflow-auto mh-100"
+    }, obsmList));
+  } else {
+    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "danger"
+    }, serverError.message));
+  }
 }

package/dist/components/var-list/VarList.js

@@ -13,6 +13,7 @@ var _requests = require("../../utils/requests");
 var _DatasetContext = require("../../context/DatasetContext");
 var _constants = require("../../constants/constants");
 var _reactBootstrap = require("react-bootstrap");
+var _LoadingSpinner = require("../../utils/LoadingSpinner");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -112,20 +113,24 @@ function VarNamesList(_ref2) {
     _useState8 = _slicedToArray(_useState7, 2),
     varNames = _useState8[0],
     setVarNames = _useState8[1];
-  var _useState9 = (0, _react.useState)(mode ? mode === _constants.SELECTION_MODES.SINGLE ? [dataset.selectVar] : dataset.selectedMultiVar : []),
+  var _useState9 = (0, _react.useState)(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    varButtons = _useState10[0],
-    setVarButtons = _useState10[1];
-  var _useState11 = (0, _react.useState)(mode === _constants.SELECTION_MODES.SINGLE ? null : []),
+    updatedVarNames = _useState10[0],
+    setUpdatedVarNames = _useState10[1];
+  var _useState11 = (0, _react.useState)(mode ? mode === _constants.SELECTION_MODES.SINGLE ? [dataset.selectVar] : dataset.selectedMultiVar : []),
     _useState12 = _slicedToArray(_useState11, 2),
-    active = _useState12[0],
-    setActive = _useState12[1];
-  var _useState13 = (0, _react.useState)({
+    varButtons = _useState12[0],
+    setVarButtons = _useState12[1];
+  var _useState13 = (0, _react.useState)(mode === _constants.SELECTION_MODES.SINGLE ? dataset.selectVar : dataset.selectedMultiVar),
+    _useState14 = _slicedToArray(_useState13, 2),
+    active = _useState14[0],
+    setActive = _useState14[1];
+  var _useState15 = (0, _react.useState)({
       url: dataset.url
     }),
-    _useState14 = _slicedToArray(_useState13, 2),
-    params = _useState14[0],
-    setParams = _useState14[1];
+    _useState16 = _slicedToArray(_useState15, 2),
+    params = _useState16[0],
+    setParams = _useState16[1];
   (0, _react.useEffect)(function () {
     setParams(function (p) {
       return _objectSpread(_objectSpread({}, p), {}, {
@@ -139,23 +144,49 @@ function VarNamesList(_ref2) {
     fetchedData = _useFetch.fetchedData,
     isPending = _useFetch.isPending,
     serverError = _useFetch.serverError;
+  var validateSelection = (0, _react.useCallback)(function (selectedVar, mode) {
+    if (updatedVarNames) {
+      if (mode === _constants.SELECTION_MODES.SINGLE) {
+        if (selectedVar && !_lodash.default.some(varNames, selectedVar)) {
+          setActive(null);
+          dispatch({
+            type: "varSelected",
+            var: null
+          });
+        }
+      } else {
+        if (selectedVar.length && !_lodash.default.every(selectedVar, function (v) {
+          return _lodash.default.some(varNames, v);
+        })) {
+          setActive([]);
+          dispatch({
+            type: "multiVarReset",
+            var: []
+          });
+        }
+      }
+    }
+  }, [dispatch, varNames, updatedVarNames]);
   (0, _react.useEffect)(function () {
     if (!isPending && !serverError) {
       setVarNames(fetchedData);
+      setUpdatedVarNames(true);
     }
   }, [fetchedData, isPending, serverError]);
   (0, _react.useEffect)(function () {
     if (mode === _constants.SELECTION_MODES.SINGLE && dataset.selectedVar) {
+      validateSelection(dataset.selectVar, mode);
       setActive(dataset.selectedVar.matrix_index);
     }
-  }, [mode, dataset.selectedVar]);
+  }, [mode, dataset.selectedVar, dataset.selectVar, validateSelection]);
   (0, _react.useEffect)(function () {
     if (mode === _constants.SELECTION_MODES.MULTIPLE) {
+      validateSelection(dataset.selectedMultiVar, mode);
       setActive(dataset.selectedMultiVar.map(function (i) {
         return i.matrix_index;
       }));
     }
-  }, [mode, dataset.selectedMultiVar]);
+  }, [mode, dataset.selectedMultiVar, validateSelection]);
   var selectVar = function selectVar(item) {
     setVarButtons(function () {
       if (varButtons[0] && varButtons.find(function (v) {
@@ -218,12 +249,18 @@ function VarNamesList(_ref2) {
       }
     });
   }, [active, dispatch, mode, varButtons]);
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: ""
-  }, /*#__PURE__*/_react.default.createElement("h4", null, mode), /*#__PURE__*/_react.default.createElement(VarSearchBar, {
-    varNames: varNames,
-    onSelect: selectVar
-  }), /*#__PURE__*/_react.default.createElement("div", {
-    className: "overflow-auto mt-2"
-  }, varList));
+  if (!serverError) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "position-relative"
+    }, /*#__PURE__*/_react.default.createElement("h4", null, mode), isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(VarSearchBar, {
+      varNames: varNames,
+      onSelect: selectVar
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: "overflow-auto mt-2"
+    }, varList));
+  } else {
+    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "danger"
+    }, serverError.message));
+  }
 }

package/dist/components/violin/Violin.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.Violin = Violin;
 exports.ViolinControls = ViolinControls;
 require("bootstrap/dist/css/bootstrap.min.css");
-var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
 var _DatasetContext = require("../../context/DatasetContext");
@@ -15,9 +14,9 @@ var _constants = require("../../constants/constants");
 var _reactBootstrap = require("react-bootstrap");
 var _requests = require("../../utils/requests");
 var _LoadingSpinner = require("../../utils/LoadingSpinner");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -44,7 +43,7 @@ function ViolinControls() {
     }
   }, [dataset.controls.standardScale]);
   var standardScaleList = _constants.VIOLINPLOT_STANDARDSCALES.map(function (item) {
-    return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
+    return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
       key: item.value,
       active: activeStandardScale === item.value,
       onClick: function onClick() {
@@ -55,10 +54,10 @@ function ViolinControls() {
       }
     }, item.name);
   });
-  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonToolbar, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup.Text, null, "Standard scale"), /*#__PURE__*/_react.default.createElement(_Dropdown.default, null, /*#__PURE__*/_react.default.createElement(_Dropdown.default.Toggle, {
+  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonToolbar, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ButtonGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.InputGroup.Text, null, "Standard scale"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Toggle, {
     id: "dropdownStandardScale",
     variant: "light"
-  }, activeStandardScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, standardScaleList)))));
+  }, activeStandardScale), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, standardScaleList)))));
 }
 function Violin(_ref) {
   var _ref$mode = _ref.mode,
@@ -131,20 +130,30 @@ function Violin(_ref) {
       setLayout(fetchedData.layout);
     }
   }, [fetchedData, hasSelections, isPending, serverError]);
-  if (hasSelections) {
+  if (!serverError) {
+    if (hasSelections) {
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: "cherita-violin position-relative"
+      }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement("h5", null, mode), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
+        data: data,
+        layout: layout,
+        useResizeHandler: true,
+        style: {
+          maxWidth: "100%",
+          maxHeight: "100%"
+        }
+      }));
+    }
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: "cherita-violin position-relative"
-    }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement("h5", null, mode), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
-      data: data,
-      layout: layout,
-      useResizeHandler: true,
-      style: {
-        maxWidth: "100%",
-        maxHeight: "100%"
-      }
-    }));
+      className: "cherita-violin"
+    }, mode === _constants.VIOLIN_MODES.MULTIKEY && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "light"
+    }, "Select features"), mode === _constants.VIOLIN_MODES.GROUPBY && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "light"
+    }, "Select categories and a feature"));
+  } else {
+    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
+      variant: "danger"
+    }, serverError.message));
   }
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "cherita-violin"
-  }, /*#__PURE__*/_react.default.createElement("p", null, "Select variables to plot"));
 }

package/dist/constants/constants.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VIOLIN_MODES = exports.VIOLINPLOT_STANDARDSCALES = exports.SELECTION_MODES = exports.PLOTLY_COLORSCALES = exports.MATRIXPLOT_STANDARDSCALES = exports.DOTPLOT_STANDARDSCALES = exports.CHROMA_COLORSCALES = void 0;
+exports.VIOLIN_MODES = exports.VIOLINPLOT_STANDARDSCALES = exports.SELECTION_MODES = exports.PLOTLY_COLORSCALES = exports.MATRIXPLOT_STANDARDSCALES = exports.LOCAL_STORAGE_KEY = exports.DOTPLOT_STANDARDSCALES = exports.CHROMA_COLORSCALES = void 0;
+var LOCAL_STORAGE_KEY = "CHERITA";
+exports.LOCAL_STORAGE_KEY = LOCAL_STORAGE_KEY;
 var PLOTLY_COLORSCALES = ["Blackbody", "Bluered", "Blues", "Cividis", "Earth", "Electric", "Greens", "Greys", "Hot", "Jet", "Picnic", "Portland", "Rainbow", "RdBu", "Reds", "Viridis", "YlGnBu", "YlOrRd"];
 exports.PLOTLY_COLORSCALES = PLOTLY_COLORSCALES;
 var CHROMA_COLORSCALES = {

package/dist/context/DatasetContext.js

@@ -9,9 +9,12 @@ exports.DatasetProvider = DatasetProvider;
 exports.useDataset = useDataset;
 exports.useDatasetDispatch = useDatasetDispatch;
 var _react = _interopRequireWildcard(require("react"));
+var _lodash = _interopRequireDefault(require("lodash"));
 var _reactQuery = require("@tanstack/react-query");
 var _reactQueryPersistClient = require("@tanstack/react-query-persist-client");
 var _querySyncStoragePersister = require("@tanstack/query-sync-storage-persister");
+var _constants = require("../constants/constants");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -36,10 +39,17 @@ exports.DatasetDispatchContext = DatasetDispatchContext;
 var queryClient = new _reactQuery.QueryClient({
   defaultOptions: {
     queries: {
-      gcTime: 1000 * 60 * 60 * 24
+      gcTime: 1000 * 60 * 60 * 24 * 7 // store for a week
     }
-  }
+  },
+
+  queryCache: new _reactQuery.QueryCache({
+    onError: function onError(error, query) {
+      console.error(error);
+    }
+  })
 });
+// Type of queries to store responses
 var persistKeys = ["obs/cols", "var/names", "obsm/keys"];
 var persistOptions = {
   persister: (0, _querySyncStoragePersister.createSyncStoragePersister)({
@@ -55,38 +65,59 @@ var persistOptions = {
       return false;
     }
   }
+  // @TODO: add maxAge and buster (app and api version numbers as busters)
+};
+
+var initialDataset = {
+  obs: {},
+  selectedObs: null,
+  selectedObsm: null,
+  selectedVar: null,
+  selectedMultiObs: [],
+  selectedMultiVar: [],
+  colorEncoding: null,
+  controls: {
+    colorScale: "Viridis",
+    colorAxis: {
+      dmin: 0,
+      dmax: 1,
+      cmin: 0,
+      cmax: 1
+    },
+    standardScale: null,
+    meanOnlyExpressed: false,
+    expressionCutoff: 0.0
+  },
+  state: {
+    obs: {}
+  }
+};
+var initializer = function initializer(initialState) {
+  var localObj = (JSON.parse(localStorage.getItem(_constants.LOCAL_STORAGE_KEY)) || {})[initialState.url] || {};
+  var keys = _lodash.default.keys(initialState);
+  var localValues = _lodash.default.pick(localObj, keys);
+  return _lodash.default.assign(initialState, localValues);
 };
 function DatasetProvider(_ref2) {
   var dataset_url = _ref2.dataset_url,
     children = _ref2.children;
-  var _useReducer = (0, _react.useReducer)(datasetReducer, {
-      url: dataset_url,
-      obs: {},
-      selectedObs: null,
-      selectedObsm: null,
-      selectedVar: null,
-      selectedMultiObs: [],
-      selectedMultiVar: [],
-      colorEncoding: null,
-      controls: {
-        colorScale: "Viridis",
-        colorAxis: {
-          dmin: 0,
-          dmax: 1,
-          cmin: 0,
-          cmax: 1
-        },
-        standardScale: null,
-        meanOnlyExpressed: false,
-        expressionCutoff: 0.0
-      },
-      state: {
-        obs: {}
-      }
-    }),
+  var _useReducer = (0, _react.useReducer)(datasetReducer, _objectSpread({
+      url: dataset_url
+    }, initialDataset), initializer),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     dataset = _useReducer2[0],
     dispatch = _useReducer2[1];
+  (0, _react.useEffect)(function () {
+    try {
+      localStorage.setItem(_constants.LOCAL_STORAGE_KEY, JSON.stringify(_defineProperty({}, dataset.url, dataset)));
+    } catch (err) {
+      if (err.code === 22 || err.code === 1014 || err.name === "QuotaExceededError" || err.name === "NS_ERROR_DOM_QUOTA_REACHED") {
+        console.log("Browser storage quota exceeded");
+      } else {
+        console.log(err);
+      }
+    }
+  }, [dataset]);
   return /*#__PURE__*/_react.default.createElement(DatasetContext.Provider, {
     value: dataset
   }, /*#__PURE__*/_react.default.createElement(DatasetDispatchContext.Provider, {
@@ -158,6 +189,12 @@ function datasetReducer(dataset, action) {
           colorEncoding: action.value
         });
       }
+    case "multiVarReset":
+      {
+        return _objectSpread(_objectSpread({}, dataset), {}, {
+          selectedMultiVar: []
+        });
+      }
     case "set.controls.colorScale":
       {
         return _objectSpread(_objectSpread({}, dataset), {}, {

package/dist/utils/errors.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.parseError = void 0;
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var parseError = function parseError(err) {
+  if (err === DOMException.TIMEOUT_ERR) {
+    return {
+      message: "Timeout error",
+      name: err
+    };
+  }
+  switch (err === null || err === void 0 ? void 0 : err.name) {
+    case "TypeError":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Failed to fetch data from server"
+      });
+    case "ReadZarrError":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Failed to read AnnData-Zarr"
+      });
+    case "InvalidObs":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Observation not found in dataset"
+      });
+    case "InvalidVar":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Feature not found in dataset"
+      });
+    case "InvalidKey":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Key not found in datset"
+      });
+    case "BadRequest":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Invalid request to server"
+      });
+    case "InternalServerError":
+      return _objectSpread(_objectSpread({}, err), {}, {
+        message: "Server error"
+      });
+    default:
+      return err;
+  }
+};
+exports.parseError = parseError;

package/dist/utils/requests.js

@@ -8,6 +8,7 @@ exports.fetchData = fetchData;
 exports.useFetch = exports.useDebouncedFetch = void 0;
 var _usehooks = require("@uidotdev/usehooks");
 var _reactQuery = require("@tanstack/react-query");
+var _errors = require("./errors");
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -22,15 +23,26 @@ function fetchData(_x, _x2) {
 function _fetchData() {
   _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(endpoint, params) {
     var signal,
+      ms,
       apiUrl,
+      controller,
+      timeout,
       response,
       _args = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           signal = _args.length > 2 && _args[2] !== undefined ? _args[2] : null;
+          ms = _args.length > 3 && _args[3] !== undefined ? _args[3] : 300000;
           apiUrl = process.env.REACT_APP_API_URL;
-          _context.next = 4;
+          controller = new AbortController();
+          timeout = setTimeout(function () {
+            controller.abort(DOMException.TIMEOUT_ERR);
+          }, ms || 300000);
+          if (signal) signal.addEventListener("abort", function () {
+            return controller.abort();
+          });
+          _context.next = 8;
           return fetch(new URL(endpoint, apiUrl), {
             method: "POST",
             mode: "cors",
@@ -39,21 +51,32 @@ function _fetchData() {
               Accept: "application/json"
             },
             body: JSON.stringify(params),
-            signal: signal
+            signal: controller.signal
+          }).catch(function (err) {
+            // Manual check as fetch returns an AbortError regardless of the reason set to the signal
+            if (controller.signal.aborted && controller.signal.reason === DOMException.TIMEOUT_ERR) {
+              throw DOMException.TIMEOUT_ERR;
+            }
+            throw err;
+          }).finally(function () {
+            return clearTimeout(timeout);
           });
-        case 4:
+        case 8:
           response = _context.sent;
           if (response.ok) {
-            _context.next = 7;
+            _context.next = 13;
             break;
           }
-          throw response;
-        case 7:
-          _context.next = 9;
+          _context.next = 12;
+          return response.json();
+        case 12:
+          throw _context.sent;
+        case 13:
+          _context.next = 15;
           return response.json();
-        case 9:
+        case 15:
           return _context.abrupt("return", _context.sent);
-        case 10:
+        case 16:
         case "end":
           return _context.stop();
       }
@@ -76,7 +99,7 @@ var useFetch = function useFetch(endpoint, params) {
   return {
     fetchedData: fetchedData,
     isPending: isPending,
-    serverError: serverError
+    serverError: (0, _errors.parseError)(serverError)
   };
 };
 exports.useFetch = useFetch;
@@ -97,7 +120,7 @@ var useDebouncedFetch = function useDebouncedFetch(endpoint, params) {
   return {
     fetchedData: fetchedData,
     isPending: isPending,
-    serverError: serverError
+    serverError: (0, _errors.parseError)(serverError)
   };
 };
 exports.useDebouncedFetch = useDebouncedFetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haniffalab/cherita-react",
-  "version": "0.1.12-dev.2024-02-12.f6d21b70",
+  "version": "0.1.12-dev.2024-02-12.b016d286",
   "author": "",
   "license": "",
   "main": "dist/index.js",
@@ -78,5 +78,5 @@
     "url": "https://github.com/haniffalab/cherita-react/issues"
   },
   "homepage": "https://github.com/haniffalab/cherita-react#readme",
-  "prereleaseSha": "f6d21b70934071cac3bb5899d8aead080a15b135"
+  "prereleaseSha": "b016d286df62d95c86e969e73dd08d268dc41a7a"
 }