@haniffalab/cherita-react 0.1.12 → 0.2.0-dev.2024-02-12.4d768f57

package/dist/components/dotplot/Dotplot.js

@@ -10,11 +10,11 @@ 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 _lodash = _interopRequireDefault(require("lodash"));
 var _DatasetContext = require("../../context/DatasetContext");
 var _constants = require("../../constants/constants");
 var _requests = require("../../utils/requests");
 var _reactBootstrap = require("react-bootstrap");
+var _LoadingSpinner = require("../../utils/LoadingSpinner");
 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 }; }
@@ -173,6 +173,7 @@ function DotplotControls() {
   }, "Autoscale"))));
 }
 function Dotplot() {
+  var ENDPOINT = "dotplot";
   var dataset = (0, _DatasetContext.useDataset)();
   var dispatch = (0, _DatasetContext.useDatasetDispatch)();
   var colorscale = (0, _react.useRef)(dataset.controls.colorScale);
@@ -188,8 +189,40 @@ function Dotplot() {
     _useState8 = _slicedToArray(_useState7, 2),
     hasSelections = _useState8[0],
     setHasSelections = _useState8[1];
+  var _useState9 = (0, _react.useState)({
+      url: dataset.url,
+      selectedObs: dataset.selectedObs,
+      selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+        return i.name;
+      }),
+      standardScale: dataset.controls.standardScale,
+      meanOnlyExpressed: dataset.controls.meanOnlyExpressed,
+      expressionCutoff: dataset.controls.expressionCutoff
+    }),
+    _useState10 = _slicedToArray(_useState9, 2),
+    params = _useState10[0],
+    setParams = _useState10[1];
   // @TODO: set default scale
 
+  (0, _react.useEffect)(function () {
+    if (dataset.selectedObs && dataset.selectedMultiVar.length) {
+      setHasSelections(true);
+    } else {
+      setHasSelections(false);
+    }
+    setParams(function (p) {
+      return _objectSpread(_objectSpread({}, p), {}, {
+        url: dataset.url,
+        selectedObs: dataset.selectedObs,
+        selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+          return i.name;
+        }),
+        standardScale: dataset.controls.standardScale,
+        meanOnlyExpressed: dataset.controls.meanOnlyExpressed,
+        expressionCutoff: dataset.controls.expressionCutoff
+      });
+    });
+  }, [dataset.url, dataset.selectedObs, dataset.selectedMultiVar, dataset.controls.standardScale, dataset.controls.meanOnlyExpressed, dataset.controls.expressionCutoff]);
   var updateColorscale = (0, _react.useCallback)(function (colorscale) {
     setLayout(function (l) {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -199,56 +232,28 @@ function Dotplot() {
       });
     });
   }, []);
-  var update = (0, _react.useMemo)(function () {
-    var func = function func(abortController) {
-      if (dataset.selectedObs && dataset.selectedMultiVar.length) {
-        setHasSelections(true);
-        (0, _requests.fetchData)("dotplot", {
-          url: dataset.url,
-          selectedObs: dataset.selectedObs,
-          selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
-            return i.name;
-          }),
-          standardScale: dataset.controls.standardScale,
-          meanOnlyExpressed: dataset.controls.meanOnlyExpressed,
-          expressionCutoff: dataset.controls.expressionCutoff
-        }, abortController.signal).then(function (data) {
-          setData(data.data);
-          setLayout(data.layout);
-          dispatch({
-            type: "set.controls.colorAxis",
-            colorAxis: {
-              dmin: data.range.min.toFixed(1),
-              dmax: data.range.max.toFixed(1),
-              cmin: data.range.min.toFixed(1),
-              cmax: data.range.max.toFixed(1)
-            }
-          });
-          updateColorscale(colorscale.current);
-        }).catch(function (response) {
-          if (response.name !== "AbortError") {
-            response.json().then(function (json) {
-              console.log(json.message);
-            });
-          }
-        });
-      } else {
-        setHasSelections(false);
-      }
-    };
-    // delay invoking the fetch function to avoid firing requests
-    // while dependencies might still be getting updated by the user
-    return _lodash.default.debounce(func, 500);
-  }, [dataset.url, dataset.selectedObs, dataset.selectedMultiVar, dataset.controls.standardScale, dataset.controls.meanOnlyExpressed, dataset.controls.expressionCutoff, updateColorscale, dispatch]);
+  var _useDebouncedFetch = (0, _requests.useDebouncedFetch)(ENDPOINT, params, 500, {
+      enabled: !!params.selectedObs && !!params.selectedMultiVar.length
+    }),
+    fetchedData = _useDebouncedFetch.fetchedData,
+    isPending = _useDebouncedFetch.isPending,
+    serverError = _useDebouncedFetch.serverError;
   (0, _react.useEffect)(function () {
-    // create an abort controller to pass into each fetch function
-    // to abort previous incompleted requests when a new request is fired
-    var abortController = new AbortController();
-    update(abortController);
-    return function () {
-      abortController.abort();
-    };
-  }, [update]);
+    if (hasSelections && !isPending && !serverError) {
+      setData(fetchedData.data);
+      setLayout(fetchedData.layout);
+      dispatch({
+        type: "set.controls.colorAxis",
+        colorAxis: {
+          dmin: fetchedData.range.min.toFixed(1),
+          dmax: fetchedData.range.max.toFixed(1),
+          cmin: fetchedData.range.min.toFixed(1),
+          cmax: fetchedData.range.max.toFixed(1)
+        }
+      });
+      updateColorscale(colorscale.current);
+    }
+  }, [fetchedData, isPending, serverError, hasSelections, dispatch, updateColorscale]);
   (0, _react.useEffect)(function () {
     colorscale.current = dataset.controls.colorScale;
     updateColorscale(colorscale.current);
@@ -263,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"
-    }, /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
-      data: data,
-      layout: layout,
-      useResizeHandler: true,
-      style: {
-        maxWidth: "100%",
-        maxHeight: "100%"
-      }
-    }));
+    }, /*#__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 _lodash = _interopRequireDefault(require("lodash"));
 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,12 +43,13 @@ 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";
   var dataset = (0, _DatasetContext.useDataset)();
   var colorscale = (0, _react.useRef)(dataset.controls.colorScale);
   var _useState = (0, _react.useState)([]),
@@ -63,6 +64,32 @@ function Heatmap() {
     _useState6 = _slicedToArray(_useState5, 2),
     hasSelections = _useState6[0],
     setHasSelections = _useState6[1];
+  var _useState7 = (0, _react.useState)({
+      url: dataset.url,
+      selectedObs: dataset.selectedObs,
+      selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+        return i.name;
+      })
+    }),
+    _useState8 = _slicedToArray(_useState7, 2),
+    params = _useState8[0],
+    setParams = _useState8[1];
+  (0, _react.useEffect)(function () {
+    if (dataset.selectedObs && dataset.selectedMultiVar.length) {
+      setHasSelections(true);
+    } else {
+      setHasSelections(false);
+    }
+    setParams(function (p) {
+      return _objectSpread(_objectSpread({}, p), {}, {
+        url: dataset.url,
+        selectedObs: dataset.selectedObs,
+        selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+          return i.name;
+        })
+      });
+    });
+  }, [dataset.selectedMultiVar, dataset.selectedObs, dataset.url]);
   var updateColorscale = (0, _react.useCallback)(function (colorscale) {
     setLayout(function (l) {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -72,62 +99,45 @@ function Heatmap() {
       });
     });
   }, []);
-  var update = (0, _react.useMemo)(function () {
-    var func = function func(abortController) {
-      if (dataset.selectedObs && dataset.selectedMultiVar.length) {
-        setHasSelections(true);
-        (0, _requests.fetchData)("heatmap", {
-          url: dataset.url,
-          selectedObs: dataset.selectedObs,
-          selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
-            return i.name;
-          })
-        }, abortController.signal).then(function (data) {
-          setData(data.data);
-          setLayout(data.layout);
-          updateColorscale(colorscale.current);
-        }).catch(function (response) {
-          if (response.name !== "AbortError") {
-            response.json().then(function (json) {
-              console.log(json.message);
-            });
-          }
-        });
-      } else {
-        setHasSelections(false);
-      }
-    };
-    // delay invoking the fetch function to avoid firing requests
-    // while dependencies might still be getting updated by the user
-    return _lodash.default.debounce(func, 500);
-  }, [dataset.selectedMultiVar, dataset.selectedObs, dataset.url, updateColorscale]);
+  var _useDebouncedFetch = (0, _requests.useDebouncedFetch)(ENDPOINT, params, 500, {
+      enabled: !!params.selectedObs && !!params.selectedMultiVar.length
+    }),
+    fetchedData = _useDebouncedFetch.fetchedData,
+    isPending = _useDebouncedFetch.isPending,
+    serverError = _useDebouncedFetch.serverError;
   (0, _react.useEffect)(function () {
-    // create an abort controller to pass into each fetch function
-    // to abort previous incompleted requests when a new request is fired
-    var abortController = new AbortController();
-    update(abortController);
-    return function () {
-      abortController.abort();
-    };
-  }, [update]);
+    if (hasSelections && !isPending && !serverError) {
+      setData(fetchedData.data);
+      setLayout(fetchedData.layout);
+      updateColorscale(colorscale.current);
+    }
+  }, [fetchedData, hasSelections, isPending, serverError, updateColorscale]);
   (0, _react.useEffect)(function () {
     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"
-    }, /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
-      data: data,
-      layout: layout,
-      useResizeHandler: true,
-      style: {
-        maxWidth: "100%",
-        maxHeight: "100%"
-      }
-    }));
+    }, /*#__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,17 +7,16 @@ 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 _lodash = _interopRequireDefault(require("lodash"));
 var _DatasetContext = require("../../context/DatasetContext");
 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,15 +55,16 @@ 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";
   var dataset = (0, _DatasetContext.useDataset)();
   var colorscale = (0, _react.useRef)(dataset.controls.colorScale);
   var _useState = (0, _react.useState)([]),
@@ -79,6 +79,34 @@ function Matrixplot() {
     _useState6 = _slicedToArray(_useState5, 2),
     hasSelections = _useState6[0],
     setHasSelections = _useState6[1];
+  var _useState7 = (0, _react.useState)({
+      url: dataset.url,
+      selectedObs: dataset.selectedObs,
+      selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+        return i.name;
+      }),
+      standardScale: dataset.controls.standardScale
+    }),
+    _useState8 = _slicedToArray(_useState7, 2),
+    params = _useState8[0],
+    setParams = _useState8[1];
+  (0, _react.useEffect)(function () {
+    if (dataset.selectedObs && dataset.selectedMultiVar.length) {
+      setHasSelections(true);
+    } else {
+      setHasSelections(false);
+    }
+    setParams(function (p) {
+      return _objectSpread(_objectSpread({}, p), {}, {
+        url: dataset.url,
+        selectedObs: dataset.selectedObs,
+        selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
+          return i.name;
+        }),
+        standardScale: dataset.controls.standardScale
+      });
+    });
+  }, [dataset.controls.standardScale, dataset.selectedMultiVar, dataset.selectedObs, dataset.url]);
   var updateColorscale = (0, _react.useCallback)(function (colorscale) {
     setLayout(function (l) {
       return _objectSpread(_objectSpread({}, l), {}, {
@@ -88,63 +116,45 @@ function Matrixplot() {
       });
     });
   }, []);
-  var update = (0, _react.useMemo)(function () {
-    var func = function func(abortController) {
-      if (dataset.selectedObs && dataset.selectedMultiVar.length) {
-        setHasSelections(true);
-        (0, _requests.fetchData)("matrixplot", {
-          url: dataset.url,
-          selectedObs: dataset.selectedObs,
-          selectedMultiVar: dataset.selectedMultiVar.map(function (i) {
-            return i.name;
-          }),
-          standardScale: dataset.controls.standardScale
-        }, abortController.signal).then(function (data) {
-          setData(data.data);
-          setLayout(data.layout);
-          updateColorscale(colorscale.current);
-        }).catch(function (response) {
-          if (response.name !== "AbortError") {
-            response.json().then(function (json) {
-              console.log(json.message);
-            });
-          }
-        });
-      } else {
-        setHasSelections(false);
-      }
-    };
-    // delay invoking the fetch function to avoid firing requests
-    // while dependencies might still be getting updated by the user
-    return _lodash.default.debounce(func, 500);
-  }, [dataset.url, dataset.selectedObs, dataset.selectedMultiVar, dataset.controls.standardScale, updateColorscale]);
+  var _useDebouncedFetch = (0, _requests.useDebouncedFetch)(ENDPOINT, params, 500, {
+      enabled: !!params.selectedObs && !!params.selectedMultiVar.length
+    }),
+    fetchedData = _useDebouncedFetch.fetchedData,
+    isPending = _useDebouncedFetch.isPending,
+    serverError = _useDebouncedFetch.serverError;
   (0, _react.useEffect)(function () {
-    // create an abort controller to pass into each fetch function
-    // to abort previous incompleted requests when a new request is fired
-    var abortController = new AbortController();
-    update(abortController);
-    return function () {
-      abortController.abort();
-    };
-  }, [update]);
+    if (hasSelections && !isPending && !serverError) {
+      setData(fetchedData.data);
+      setLayout(fetchedData.layout);
+      updateColorscale(colorscale.current);
+    }
+  }, [fetchedData, hasSelections, isPending, serverError, updateColorscale]);
   (0, _react.useEffect)(function () {
     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"
-    }, /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
-      data: data,
-      layout: layout,
-      useResizeHandler: true,
-      style: {
-        maxWidth: "100%",
-        maxHeight: "100%"
-      }
-    }));
+    }, /*#__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"));
 }