@haniffalab/cherita-react 1.4.4 → 1.4.5

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

@@ -14,11 +14,6 @@ var _requests = require("../../utils/requests");
 var _Skeleton = require("../../utils/Skeleton");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function ObsmKeysList(_ref) {
   let {
     setHasObsm
@@ -29,16 +24,9 @@ function ObsmKeysList(_ref) {
   const dispatch = (0, _SettingsContext.useSettingsDispatch)();
   const [obsmKeysList, setObsmKeysList] = (0, _react.useState)([]);
   const [active, setActive] = (0, _react.useState)(null);
-  const [params, setParams] = (0, _react.useState)({
+  const params = (0, _react.useMemo)(() => ({
     url: dataset.url
-  });
-  (0, _react.useEffect)(() => {
-    setParams(p => {
-      return _objectSpread(_objectSpread({}, p), {}, {
-        url: dataset.url
-      });
-    });
-  }, [dataset.url]);
+  }), [dataset.url]);
   const {
     fetchedData,
     isPending,
@@ -47,15 +35,31 @@ function ObsmKeysList(_ref) {
     refetchOnMount: false
   });
   (0, _react.useEffect)(() => {
-    if (!isPending && !serverError) {
-      if (!fetchedData || !fetchedData.length) {
+    if (!isPending) {
+      if (serverError || !fetchedData || !fetchedData.length) {
         setHasObsm(false);
+        setObsmKeysList([]);
+        if (settings.selectedObsm) {
+          dispatch({
+            type: 'select.obsm',
+            obsm: null
+          });
+        }
       } else {
         setHasObsm(true);
         setObsmKeysList(fetchedData);
-
-        // Set default obsm if in keys list and not selected
-        if (!settings.selectedObsm) {
+        if (settings.selectedObsm) {
+          // If selected obsm is not in keys list, reset to null
+          if (!_lodash.default.includes(fetchedData, settings.selectedObsm)) {
+            dispatch({
+              type: 'select.obsm',
+              obsm: null
+            });
+          } else {
+            setActive(settings.selectedObsm);
+          }
+        } else {
+          // Set default obsm if in keys list and not selected
           // Follow DEFAULT_OBSM_KEYS order
           _lodash.default.each(_constants.DEFAULT_OBSM_KEYS, k => {
             const defaultObsm = _lodash.default.find(fetchedData, item => item.toLowerCase() === k);
@@ -69,17 +73,6 @@ function ObsmKeysList(_ref) {
           });
         }
       }
-      if (settings.selectedObsm) {
-        // If selected obsm is not in keys list, reset to null
-        if (!_lodash.default.includes(fetchedData || [], settings.selectedObsm)) {
-          dispatch({
-            type: 'select.obsm',
-            obsm: null
-          });
-        } else {
-          setActive(settings.selectedObsm);
-        }
-      }
     }
   }, [dispatch, fetchedData, isPending, serverError, setHasObsm, settings.selectedObsm]);
   const obsmList = obsmKeysList.map(item => {

package/dist/cjs/components/var-list/VarItem.js

@@ -165,13 +165,11 @@ function SelectionItem(_ref3) {
               selectVar();
             },
             disabled: isNotInData,
-            title: isNotInData ? 'Not present in data' : 'Set as color encoding',
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
+            title: isNotInData ? 'Not present in data' : isMultiple ? isActive ? 'Remove from plot' : 'Add to plot' : 'Set as color encoding',
+            children: [!isMultiple && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
               icon: _freeSolidSvgIcons.faDroplet
             }), isMultiple && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
-              icon: _freeSolidSvgIcons.faPlus,
-              size: "xs",
-              className: "ps-xs-1"
+              icon: _freeSolidSvgIcons.faCheck
             })]
           }, item.matrix_index), showRemove && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Button, {
             type: "button",

package/dist/cjs/components/var-list/VarSet.js

@@ -9,10 +9,10 @@ var _freeSolidSvgIcons = require("@fortawesome/free-solid-svg-icons");
 var _reactFontawesome = require("@fortawesome/react-fontawesome");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _reactBootstrap = require("react-bootstrap");
-var _VarItem = require("./VarItem");
 var _constants = require("../../constants/constants");
 var _SettingsContext = require("../../context/SettingsContext");
 var _SearchBar = require("../search-bar/SearchBar");
+var _VarItem = require("./VarItem");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // @TODO: add button to score genes and plot
@@ -101,13 +101,11 @@ function SelectionSet(_ref) {
               selectSet();
             },
             disabled: !set.vars.length,
-            title: "Set as color encoding",
-            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
+            title: !set.vars.length ? 'No variables in set' : isMultiple ? isActive ? 'Remove from plot' : 'Add to plot' : 'Set as color encoding',
+            children: [!isMultiple && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
               icon: _freeSolidSvgIcons.faDroplet
             }), isMultiple && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFontawesome.FontAwesomeIcon, {
-              icon: _freeSolidSvgIcons.faPlus,
-              size: "xs",
-              className: "ps-xs-1"
+              icon: _freeSolidSvgIcons.faCheck
             })]
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Button, {
             type: "button",

package/dist/cjs/context/DatasetContext.js

@@ -60,7 +60,7 @@ const persistOptions = {
       return false;
     }
   },
-  buster: "1.4.4" || '0.0.0'
+  buster: "1.4.5" || '0.0.0'
   // @TODO: add maxAge and api version numbers as buster
 };
 const initialDataset = {

package/dist/cjs/context/SettingsContext.js

@@ -173,7 +173,7 @@ function SettingsProvider(_ref2) {
 
   // If the buster is not set or does not match the current package version,
   // reset localSettings to avoid stale data
-  if (!buster || buster !== "1.4.4") {
+  if (!buster || buster !== "1.4.5") {
     localSettings = {};
   }
   const initSettings = (0, _react.useRef)(initializer({
@@ -198,7 +198,7 @@ function SettingsProvider(_ref2) {
     if (canOverrideSettings && settings) {
       try {
         localStorage.setItem(DATASET_STORAGE_KEY, JSON.stringify(_objectSpread({
-          buster: "1.4.4" || '0.0.0',
+          buster: "1.4.5" || '0.0.0',
           timestamp: Date.now()
         }, _lodash.default.omit(settings, 'data'))));
       } catch (err) {

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

@@ -1,9 +1,4 @@
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useMemo } from 'react';
 import _ from 'lodash';
 import { Button, ButtonGroup, Dropdown, DropdownButton, OverlayTrigger, Tooltip } from 'react-bootstrap';
 import { DEFAULT_OBSM_KEYS } from '../../constants/constants';
@@ -22,16 +17,9 @@ export function ObsmKeysList(_ref) {
   const dispatch = useSettingsDispatch();
   const [obsmKeysList, setObsmKeysList] = useState([]);
   const [active, setActive] = useState(null);
-  const [params, setParams] = useState({
+  const params = useMemo(() => ({
     url: dataset.url
-  });
-  useEffect(() => {
-    setParams(p => {
-      return _objectSpread(_objectSpread({}, p), {}, {
-        url: dataset.url
-      });
-    });
-  }, [dataset.url]);
+  }), [dataset.url]);
   const {
     fetchedData,
     isPending,
@@ -40,15 +28,31 @@ export function ObsmKeysList(_ref) {
     refetchOnMount: false
   });
   useEffect(() => {
-    if (!isPending && !serverError) {
-      if (!fetchedData || !fetchedData.length) {
+    if (!isPending) {
+      if (serverError || !fetchedData || !fetchedData.length) {
         setHasObsm(false);
+        setObsmKeysList([]);
+        if (settings.selectedObsm) {
+          dispatch({
+            type: 'select.obsm',
+            obsm: null
+          });
+        }
       } else {
         setHasObsm(true);
         setObsmKeysList(fetchedData);
-
-        // Set default obsm if in keys list and not selected
-        if (!settings.selectedObsm) {
+        if (settings.selectedObsm) {
+          // If selected obsm is not in keys list, reset to null
+          if (!_.includes(fetchedData, settings.selectedObsm)) {
+            dispatch({
+              type: 'select.obsm',
+              obsm: null
+            });
+          } else {
+            setActive(settings.selectedObsm);
+          }
+        } else {
+          // Set default obsm if in keys list and not selected
           // Follow DEFAULT_OBSM_KEYS order
           _.each(DEFAULT_OBSM_KEYS, k => {
             const defaultObsm = _.find(fetchedData, item => item.toLowerCase() === k);
@@ -62,17 +66,6 @@ export function ObsmKeysList(_ref) {
           });
         }
       }
-      if (settings.selectedObsm) {
-        // If selected obsm is not in keys list, reset to null
-        if (!_.includes(fetchedData || [], settings.selectedObsm)) {
-          dispatch({
-            type: 'select.obsm',
-            obsm: null
-          });
-        } else {
-          setActive(settings.selectedObsm);
-        }
-      }
     }
   }, [dispatch, fetchedData, isPending, serverError, setHasObsm, settings.selectedObsm]);
   const obsmList = obsmKeysList.map(item => {

package/dist/esm/components/var-list/VarItem.js

@@ -4,7 +4,7 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { useEffect, useState } from 'react';
-import { faDroplet, faPlus, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { faCheck, faDroplet, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { MoreVert } from '@mui/icons-material';
 import _ from 'lodash';
@@ -156,13 +156,11 @@ export function SelectionItem(_ref3) {
               selectVar();
             },
             disabled: isNotInData,
-            title: isNotInData ? 'Not present in data' : 'Set as color encoding',
-            children: [/*#__PURE__*/_jsx(FontAwesomeIcon, {
+            title: isNotInData ? 'Not present in data' : isMultiple ? isActive ? 'Remove from plot' : 'Add to plot' : 'Set as color encoding',
+            children: [!isMultiple && /*#__PURE__*/_jsx(FontAwesomeIcon, {
               icon: faDroplet
             }), isMultiple && /*#__PURE__*/_jsx(FontAwesomeIcon, {
-              icon: faPlus,
-              size: "xs",
-              className: "ps-xs-1"
+              icon: faCheck
             })]
           }, item.matrix_index), showRemove && /*#__PURE__*/_jsx(Button, {
             type: "button",

package/dist/esm/components/var-list/VarSet.js

@@ -1,12 +1,12 @@
 import { useState } from 'react';
-import { faChevronDown, faChevronUp, faCircleInfo, faDroplet, faPlus, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { faCheck, faChevronDown, faChevronUp, faCircleInfo, faDroplet, faPlus, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import _ from 'lodash';
 import { Button, Collapse, ListGroup, OverlayTrigger, Tooltip } from 'react-bootstrap';
-import { SelectionItem } from './VarItem';
 import { COLOR_ENCODINGS, SELECTION_MODES } from '../../constants/constants';
 import { useSettings, useSettingsDispatch } from '../../context/SettingsContext';
 import { SearchModal } from '../search-bar/SearchBar';
+import { SelectionItem } from './VarItem';
 
 // @TODO: add button to score genes and plot
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -95,13 +95,11 @@ function SelectionSet(_ref) {
               selectSet();
             },
             disabled: !set.vars.length,
-            title: "Set as color encoding",
-            children: [/*#__PURE__*/_jsx(FontAwesomeIcon, {
+            title: !set.vars.length ? 'No variables in set' : isMultiple ? isActive ? 'Remove from plot' : 'Add to plot' : 'Set as color encoding',
+            children: [!isMultiple && /*#__PURE__*/_jsx(FontAwesomeIcon, {
               icon: faDroplet
             }), isMultiple && /*#__PURE__*/_jsx(FontAwesomeIcon, {
-              icon: faPlus,
-              size: "xs",
-              className: "ps-xs-1"
+              icon: faCheck
             })]
           }), /*#__PURE__*/_jsx(Button, {
             type: "button",

package/dist/esm/context/DatasetContext.js

@@ -51,7 +51,7 @@ const persistOptions = {
       return false;
     }
   },
-  buster: "1.4.4" || '0.0.0'
+  buster: "1.4.5" || '0.0.0'
   // @TODO: add maxAge and api version numbers as buster
 };
 const initialDataset = {

package/dist/esm/context/SettingsContext.js

@@ -163,7 +163,7 @@ export function SettingsProvider(_ref2) {
 
   // If the buster is not set or does not match the current package version,
   // reset localSettings to avoid stale data
-  if (!buster || buster !== "1.4.4") {
+  if (!buster || buster !== "1.4.5") {
     localSettings = {};
   }
   const initSettings = useRef(initializer({
@@ -188,7 +188,7 @@ export function SettingsProvider(_ref2) {
     if (canOverrideSettings && settings) {
       try {
         localStorage.setItem(DATASET_STORAGE_KEY, JSON.stringify(_objectSpread({
-          buster: "1.4.4" || '0.0.0',
+          buster: "1.4.5" || '0.0.0',
           timestamp: Date.now()
         }, _.omit(settings, 'data'))));
       } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haniffalab/cherita-react",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "author": "Haniffa Lab",
   "license": "MIT",
   "keywords": [