@haniffalab/cherita-react 1.4.1 → 1.4.2

package/dist/cjs/components/matrixplot/Matrixplot.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Matrixplot = Matrixplot;
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _reactBootstrap = require("react-bootstrap");
 var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
@@ -14,25 +14,28 @@ var _FilterContext = require("../../context/FilterContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _LoadingIndicators = require("../../utils/LoadingIndicators");
 var _requests = require("../../utils/requests");
+var _Resolver = require("../../utils/Resolver");
+var _PlotAlert = require("../full-page/PlotAlert");
 var _Toolbar = require("../toolbar/Toolbar");
+var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 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 Matrixplot(_ref) {
-  var _settings$selectedObs, _settings$selectedObs2, _settings$selectedObs3;
   let {
     showObsBtn = false,
     showVarsBtn = false,
     showCtrlsBtn = false,
     setShowObs,
     setShowVars,
-    setShowControls
+    setShowControls,
+    plotType,
+    setPlotType
   } = _ref;
-  const ENDPOINT = "matrixplot";
+  const ENDPOINT = 'matrixplot';
   const dataset = (0, _DatasetContext.useDataset)();
   const settings = (0, _SettingsContext.useSettings)();
   const {
@@ -43,46 +46,27 @@ function Matrixplot(_ref) {
   const [data, setData] = (0, _react.useState)([]);
   const [layout, setLayout] = (0, _react.useState)({});
   const [hasSelections, setHasSelections] = (0, _react.useState)(false);
-  const [params, setParams] = (0, _react.useState)({
+  const selectedObs = (0, _Resolver.useSelectedObs)();
+  const selectedMultiVar = (0, _Resolver.useSelectedMultiVar)();
+  const params = (0, _react.useMemo)(() => ({
     url: dataset.url,
-    obsCol: settings.selectedObs,
-    obsValues: !((_settings$selectedObs = settings.selectedObs) !== null && _settings$selectedObs !== void 0 && _settings$selectedObs.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-    }),
-    varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
+    obsCol: selectedObs,
+    obsValues: !(selectedObs !== null && selectedObs !== void 0 && selectedObs.omit.length) ? null : _lodash.default.difference(selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.values, selectedObs === null || selectedObs === void 0 ? void 0 : selectedObs.omit),
+    varKeys: selectedMultiVar.map(i => i.isSet ? {
       name: i.name,
       indices: i.vars.map(v => v.index)
     } : i.index),
     obsIndices: isSliced ? [...(obsIndices || [])] : null,
     standardScale: settings.controls.scale.matrixplot,
     varNamesCol: dataset.varNamesCol
-  });
+  }), [dataset.url, dataset.varNamesCol, isSliced, obsIndices, selectedMultiVar, selectedObs, settings.controls.scale.matrixplot]);
   (0, _react.useEffect)(() => {
-    if (settings.selectedObs && settings.selectedMultiVar.length) {
+    if (selectedObs && selectedMultiVar.length) {
       setHasSelections(true);
     } else {
       setHasSelections(false);
     }
-    setParams(p => {
-      var _settings$selectedObs5, _settings$selectedObs6, _settings$selectedObs7;
-      return _objectSpread(_objectSpread({}, p), {}, {
-        url: dataset.url,
-        obsCol: settings.selectedObs,
-        obsValues: !((_settings$selectedObs5 = settings.selectedObs) !== null && _settings$selectedObs5 !== void 0 && _settings$selectedObs5.omit.length) ? null : _lodash.default.difference(_lodash.default.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];
-        }),
-        varKeys: settings.selectedMultiVar.map(i => i.isSet ? {
-          name: i.name,
-          indices: i.vars.map(v => v.index)
-        } : i.index),
-        obsIndices: isSliced ? [...(obsIndices || [])] : null,
-        standardScale: settings.controls.scale.matrixplot,
-        varNamesCol: dataset.varNamesCol
-      });
-    });
-  }, [settings.controls.scale.matrixplot, settings.selectedMultiVar, settings.selectedObs, dataset.url, dataset.varNamesCol, obsIndices, isSliced]);
+  }, [selectedMultiVar.length, selectedObs]);
   const updateColorscale = (0, _react.useCallback)(colorscale => {
     setLayout(l => {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -97,13 +81,16 @@ function Matrixplot(_ref) {
     isPending,
     serverError
   } = (0, _requests.useDebouncedFetch)(ENDPOINT, params, 500, {
-    enabled: !!params.obsCol && !!params.varKeys.length
+    isEnabled: params => !!params.obsCol && !!params.varKeys.length
   });
   (0, _react.useEffect)(() => {
-    if (hasSelections && !isPending && !serverError) {
+    if (hasSelections && !!fetchedData && !isPending && !serverError) {
       setData(fetchedData.data);
       setLayout(fetchedData.layout);
       updateColorscale(colorscale.current);
+    } else {
+      setData([]);
+      setLayout({});
     }
   }, [fetchedData, hasSelections, isPending, serverError, updateColorscale]);
   (0, _react.useEffect)(() => {
@@ -120,38 +107,50 @@ function Matrixplot(_ref) {
   const modeBarButtons = customModeBarButtons.length ? [customModeBarButtons, _constants.PLOTLY_MODEBAR_BUTTONS] : [_constants.PLOTLY_MODEBAR_BUTTONS];
   if (!serverError) {
     if (hasSelections) {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: "cherita-plot cherita-matrixplot position-relative"
-      }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingIndicators.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
-        data: data,
-        layout: layout,
-        useResizeHandler: true,
-        style: {
-          width: "100%",
-          height: "100%"
-        },
-        config: {
-          displaylogo: false,
-          modeBarButtons: modeBarButtons
-        }
-      }));
+      return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "cherita-plot cherita-matrixplot position-relative",
+        children: [isPending && /*#__PURE__*/(0, _jsxRuntime.jsx)(_LoadingIndicators.LoadingSpinner, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactPlotly.default, {
+          data: data,
+          layout: layout,
+          useResizeHandler: true,
+          style: {
+            width: '100%',
+            height: '100%'
+          },
+          config: {
+            displaylogo: false,
+            modeBarButtons: modeBarButtons
+          }
+        })]
+      });
     }
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: "cherita-matrixplot"
-    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
-      variant: "light"
-    }, "Select", " ", showVarsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
-      variant: "link",
-      className: "border-0 p-0 align-baseline",
-      onClick: setShowVars
-    }, "features") : "features", " ", "and a", " ", showObsBtn ? /*#__PURE__*/_react.default.createElement(_reactBootstrap.Button, {
-      variant: "link",
-      className: "border-0 p-0 align-baseline",
-      onClick: setShowObs
-    }, "category") : "category"));
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_PlotAlert.PlotAlert, {
+      variant: "info",
+      heading: "Set up your matrix plot",
+      plotType: plotType,
+      setPlotType: setPlotType,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("p", {
+        className: "p-0 m-0",
+        children: ["Select a", ' ', showObsBtn ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Button, {
+          variant: "link",
+          className: "border-0 p-0 align-baseline",
+          onClick: setShowObs,
+          children: "category"
+        }) : 'category', ' ', "to group observations, then choose one or more", ' ', showVarsBtn ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactBootstrap.Button, {
+          variant: "link",
+          className: "border-0 p-0 align-baseline",
+          onClick: setShowVars,
+          children: "features"
+        }) : 'features', ' ', "to display the matrix plot."]
+      })
+    });
   } else {
-    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
-      variant: "danger"
-    }, serverError.message));
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_PlotAlert.PlotAlert, {
+      variant: "danger",
+      heading: "Error displaying the matrix plot",
+      plotType: plotType,
+      setPlotType: setPlotType,
+      children: serverError.message || 'An unexpected error occurred while generating the plot.'
+    });
   }
 }

package/dist/cjs/components/matrixplot/MatrixplotControls.js

@@ -4,12 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MatrixplotControls = MatrixplotControls;
-var _react = _interopRequireDefault(require("react"));
 var _reactBootstrap = require("react-bootstrap");
 var _Controls = require("../controls/Controls");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _jsxRuntime = require("react/jsx-runtime");
 function MatrixplotControls() {
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Form, null, /*#__PURE__*/_react.default.createElement(_Controls.ColorscaleSelect, null), /*#__PURE__*/_react.default.createElement(_Controls.ScaleSelect, {
-    plot: "matrixplot"
-  })));
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactBootstrap.Form, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Controls.ColorscaleSelect, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Controls.ScaleSelect, {
+        plot: "matrixplot"
+      })]
+    })
+  });
 }