@haniffalab/cherita-react 1.2.0 → 1.3.0-dev.2025-05-29.ee7e9b72

package/dist/esm/components/violin/Violin.js

@@ -1,3 +1,8 @@
+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 React, { useEffect, useState } from "react";
 import { faCircleInfo } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -7,14 +12,17 @@ import Plot from "react-plotly.js";
 import { VIOLIN_MODES } from "../../constants/constants";
 import { useDataset } from "../../context/DatasetContext";
 import { useFilteredData } from "../../context/FilterContext";
+import { useSettings } from "../../context/SettingsContext";
 import { LoadingSpinner } from "../../utils/LoadingIndicators";
 import { useDebouncedFetch } from "../../utils/requests";
 export function Violin(_ref) {
+  var _settings$selectedVar, _settings$selectedVar2, _settings$selectedVar3, _settings$selectedVar4, _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     mode = VIOLIN_MODES.MULTIKEY
   } = _ref;
   const ENDPOINT = "violin";
   const dataset = useDataset();
+  const settings = useSettings();
   const {
     obsIndices,
     isSliced
@@ -22,76 +30,80 @@ export function Violin(_ref) {
   const [data, setData] = useState([]);
   const [layout, setLayout] = useState({});
   const [hasSelections, setHasSelections] = useState(false);
-  const [params, setParams] = useState({
+  const [params, setParams] = useState(_objectSpread({
     url: dataset.url,
     mode: mode,
-    scale: dataset.controls.scale.violinplot.value,
-    varNamesCol: dataset.varNamesCol,
-    ...{
-      [VIOLIN_MODES.MULTIKEY]: {
-        varKeys: dataset.selectedMultiVar.map(i => i.isSet ? {
-          name: i.name,
-          indices: i.vars.map(v => v.index)
-        } : i.index),
-        obsKeys: [] // @TODO: implement
-      },
-      [VIOLIN_MODES.GROUPBY]: {
-        varKey: dataset.selectedVar?.isSet ? {
-          name: dataset.selectedVar?.name,
-          indices: dataset.selectedVar?.vars.map(v => v.index)
-        } : dataset.selectedVar?.index,
-        obsCol: dataset.selectedObs,
-        obsValues: !dataset.selectedObs?.omit.length ? null : _.difference(_.values(dataset.selectedObs?.codes), dataset.selectedObs?.omit).map(c => dataset.selectedObs?.codesMap[c]),
-        obsIndices: isSliced ? [...(obsIndices || [])] : null
-      }
-    }[mode]
-  });
+    scale: settings.controls.scale.violinplot,
+    varNamesCol: dataset.varNamesCol
+  }, {
+    [VIOLIN_MODES.MULTIKEY]: {
+      varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+        name: i.name,
+        indices: i.vars.map(v => v.index)
+      } : i.index),
+      obsKeys: [] // @TODO: implement
+    },
+    [VIOLIN_MODES.GROUPBY]: {
+      varKey: (_settings$selectedVar = settings.selectedVar) !== null && _settings$selectedVar !== void 0 && _settings$selectedVar.isSet ? {
+        name: (_settings$selectedVar2 = settings.selectedVar) === null || _settings$selectedVar2 === void 0 ? void 0 : _settings$selectedVar2.name,
+        indices: (_settings$selectedVar3 = settings.selectedVar) === null || _settings$selectedVar3 === void 0 ? void 0 : _settings$selectedVar3.vars.map(v => v.index)
+      } : (_settings$selectedVar4 = settings.selectedVar) === null || _settings$selectedVar4 === void 0 ? void 0 : _settings$selectedVar4.index,
+      obsCol: settings.selectedObs,
+      obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _.difference(_.values((_settings$selectedObs2 = settings.selectedObs) === null || _settings$selectedObs2 === void 0 ? void 0 : _settings$selectedObs2.codes), (_settings$selectedObs3 = settings.selectedObs) === null || _settings$selectedObs3 === void 0 ? void 0 : _settings$selectedObs3.omit).map(c => {
+        var _settings$selectedObs4;
+        return (_settings$selectedObs4 = settings.selectedObs) === null || _settings$selectedObs4 === void 0 ? void 0 : _settings$selectedObs4.codesMap[c];
+      }),
+      obsIndices: isSliced ? [...(obsIndices || [])] : null
+    }
+  }[mode]));
   // @TODO: set default scale
 
   useEffect(() => {
     if (mode === VIOLIN_MODES.MULTIKEY) {
-      if (dataset.selectedMultiVar.length) {
+      if (settings.selectedMultiVar.length) {
         setHasSelections(true);
       } else {
         setHasSelections(false);
       }
       setParams(p => {
-        return {
-          ...p,
+        return _objectSpread(_objectSpread({}, p), {}, {
           url: dataset.url,
           mode: mode,
-          varKeys: dataset.selectedMultiVar.map(i => i.isSet ? {
+          varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
             name: i.name,
             indices: i.vars.map(v => v.index)
           } : i.index),
-          scale: dataset.controls.scale.violinplot.value,
+          scale: settings.controls.scale.violinplot,
           varNamesCol: dataset.varNamesCol
-        };
+        });
       });
     } else if (mode === VIOLIN_MODES.GROUPBY) {
-      if (dataset.selectedObs && dataset.selectedVar) {
+      if (settings.selectedObs && settings.selectedVar) {
         setHasSelections(true);
       } else {
         setHasSelections(false);
       }
       setParams(p => {
-        return {
-          ...p,
+        var _settings$selectedVar5, _settings$selectedVar6, _settings$selectedVar7, _settings$selectedVar8, _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
+        return _objectSpread(_objectSpread({}, p), {}, {
           url: dataset.url,
           mode: mode,
-          varKey: dataset.selectedVar?.isSet ? {
-            name: dataset.selectedVar?.name,
-            indices: dataset.selectedVar?.vars.map(v => v.index)
-          } : dataset.selectedVar?.index,
-          obsCol: dataset.selectedObs,
-          obsValues: !dataset.selectedObs?.omit.length ? null : _.difference(_.values(dataset.selectedObs?.codes), dataset.selectedObs?.omit).map(c => dataset.selectedObs?.codesMap[c]),
+          varKey: (_settings$selectedVar5 = settings.selectedVar) !== null && _settings$selectedVar5 !== void 0 && _settings$selectedVar5.isSet ? {
+            name: (_settings$selectedVar6 = settings.selectedVar) === null || _settings$selectedVar6 === void 0 ? void 0 : _settings$selectedVar6.name,
+            indices: (_settings$selectedVar7 = settings.selectedVar) === null || _settings$selectedVar7 === void 0 ? void 0 : _settings$selectedVar7.vars.map(v => v.index)
+          } : (_settings$selectedVar8 = settings.selectedVar) === null || _settings$selectedVar8 === void 0 ? void 0 : _settings$selectedVar8.index,
+          obsCol: settings.selectedObs,
+          obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _.difference(_.values((_settings$selectedObs6 = settings.selectedObs) === null || _settings$selectedObs6 === void 0 ? void 0 : _settings$selectedObs6.codes), (_settings$selectedObs7 = settings.selectedObs) === null || _settings$selectedObs7 === void 0 ? void 0 : _settings$selectedObs7.omit).map(c => {
+            var _settings$selectedObs8;
+            return (_settings$selectedObs8 = settings.selectedObs) === null || _settings$selectedObs8 === void 0 ? void 0 : _settings$selectedObs8.codesMap[c];
+          }),
           obsIndices: isSliced ? [...(obsIndices || [])] : null,
-          scale: dataset.controls.scale.violinplot.value,
+          scale: settings.controls.scale.violinplot,
           varNamesCol: dataset.varNamesCol
-        };
+        });
       });
     }
-  }, [dataset.controls.scale.violinplot.value, dataset.selectedMultiVar, dataset.selectedObs, dataset.selectedVar, dataset.url, dataset.varNamesCol, obsIndices, isSliced, mode]);
+  }, [settings.controls.scale.violinplot, settings.selectedMultiVar, settings.selectedObs, settings.selectedVar, dataset.url, dataset.varNamesCol, obsIndices, isSliced, mode]);
   const {
     fetchedData,
     isPending,
@@ -117,7 +129,7 @@ export function Violin(_ref) {
           maxWidth: "100%",
           maxHeight: "100%"
         }
-      }), fetchedData?.resampled && /*#__PURE__*/React.createElement(Alert, {
+      }), (fetchedData === null || fetchedData === void 0 ? void 0 : fetchedData.resampled) && /*#__PURE__*/React.createElement(Alert, {
         variant: "warning"
       }, /*#__PURE__*/React.createElement("b", null, "Warning:"), " For performance reasons this plot was generated with resampled data. It will not be exactly the same as one produced with the entire dataset. \xA0", /*#__PURE__*/React.createElement(OverlayTrigger, {
         placement: "top",

package/dist/esm/components/violin/ViolinControls.js

@@ -1,24 +1,8 @@
 import React from "react";
-import _ from "lodash";
-import { Dropdown, ButtonGroup, ButtonToolbar, InputGroup } from "react-bootstrap";
-import { VIOLINPLOT_SCALES } from "../../constants/constants";
-import { useDataset, useDatasetDispatch } from "../../context/DatasetContext";
+import { Form } from "react-bootstrap";
+import { ScaleSelect } from "../controls/Controls";
 export function ViolinControls() {
-  const dataset = useDataset();
-  const dispatch = useDatasetDispatch();
-  const scaleList = _.values(VIOLINPLOT_SCALES).map(scale => /*#__PURE__*/React.createElement(Dropdown.Item, {
-    key: scale.value,
-    active: dataset.controls.scale.violinplot === scale,
-    onClick: () => {
-      dispatch({
-        type: "set.controls.scale",
-        plot: "violinplot",
-        scale: scale
-      });
-    }
-  }, scale.name));
-  return /*#__PURE__*/React.createElement(ButtonToolbar, null, /*#__PURE__*/React.createElement(ButtonGroup, null, /*#__PURE__*/React.createElement(InputGroup, null, /*#__PURE__*/React.createElement(InputGroup.Text, null, "Scale"), /*#__PURE__*/React.createElement(Dropdown, null, /*#__PURE__*/React.createElement(Dropdown.Toggle, {
-    id: "dropdownStandardScale",
-    variant: "light"
-  }, dataset.controls.scale.violinplot.name), /*#__PURE__*/React.createElement(Dropdown.Menu, null, scaleList)))));
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, null, /*#__PURE__*/React.createElement(ScaleSelect, {
+    plot: "violinplot"
+  })));
 }