@haniffalab/cherita-react 0.1.12-dev.2024-02-12.197c465a → 0.1.12-dev.2024-02-12.20ce0bfd

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -14,6 +14,7 @@ var _DatasetContext = require("../../context/DatasetContext");
14
14
  var _constants = require("../../constants/constants");
15
15
  var _requests = require("../../utils/requests");
16
16
  var _reactBootstrap = require("react-bootstrap");
17
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
17
18
  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); }
18
19
  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; }
19
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -267,20 +268,28 @@ function Dotplot() {
267
268
  });
268
269
  });
269
270
  }, [dataset.controls.colorAxis.cmin, dataset.controls.colorAxis.cmax]);
270
- if (hasSelections) {
271
+ if (!serverError) {
272
+ if (hasSelections) {
273
+ return /*#__PURE__*/_react.default.createElement("div", {
274
+ className: "cherita-dotplot position-relative"
275
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
276
+ data: data,
277
+ layout: layout,
278
+ useResizeHandler: true,
279
+ style: {
280
+ maxWidth: "100%",
281
+ maxHeight: "100%"
282
+ }
283
+ }));
284
+ }
271
285
  return /*#__PURE__*/_react.default.createElement("div", {
272
286
  className: "cherita-dotplot"
273
- }, /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
274
- data: data,
275
- layout: layout,
276
- useResizeHandler: true,
277
- style: {
278
- maxWidth: "100%",
279
- maxHeight: "100%"
280
- }
281
- }));
287
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
288
+ variant: "light"
289
+ }, "Select features and a category"));
290
+ } else {
291
+ return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
292
+ variant: "danger"
293
+ }, serverError.message));
282
294
  }
283
- return /*#__PURE__*/_react.default.createElement("div", {
284
- className: "cherita-dotplot"
285
- }, /*#__PURE__*/_react.default.createElement("p", null, "Select OBS and VAR"));
286
295
  }
@@ -7,15 +7,16 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.Heatmap = Heatmap;
8
8
  exports.HeatmapControls = HeatmapControls;
9
9
  require("bootstrap/dist/css/bootstrap.min.css");
10
- var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
10
+ var _reactBootstrap = require("react-bootstrap");
11
11
  var _react = _interopRequireWildcard(require("react"));
12
12
  var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
13
13
  var _DatasetContext = require("../../context/DatasetContext");
14
14
  var _constants = require("../../constants/constants");
15
15
  var _requests = require("../../utils/requests");
16
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
17
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
16
18
  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); }
17
19
  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; }
18
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
20
  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; }
20
21
  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; }
21
22
  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; }
@@ -31,7 +32,7 @@ function HeatmapControls() {
31
32
  var dataset = (0, _DatasetContext.useDataset)();
32
33
  var dispatch = (0, _DatasetContext.useDatasetDispatch)();
33
34
  var colormapList = _constants.PLOTLY_COLORSCALES.map(function (item) {
34
- return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
35
+ return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
35
36
  key: item,
36
37
  active: dataset.controls.colorScale === item,
37
38
  onClick: function onClick() {
@@ -42,10 +43,10 @@ function HeatmapControls() {
42
43
  }
43
44
  }, item);
44
45
  });
45
- return /*#__PURE__*/_react.default.createElement(_Dropdown.default, null, /*#__PURE__*/_react.default.createElement(_Dropdown.default.Toggle, {
46
+ return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Toggle, {
46
47
  id: "dropdownColorscale",
47
48
  variant: "light"
48
- }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, colormapList));
49
+ }, dataset.controls.colorScale), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, colormapList));
49
50
  }
50
51
  function Heatmap() {
51
52
  var ENDPOINT = "heatmap";
@@ -115,20 +116,28 @@ function Heatmap() {
115
116
  colorscale.current = dataset.controls.colorScale;
116
117
  updateColorscale(colorscale.current);
117
118
  }, [dataset.controls.colorScale, updateColorscale]);
118
- if (hasSelections) {
119
+ if (!serverError) {
120
+ if (hasSelections) {
121
+ return /*#__PURE__*/_react.default.createElement("div", {
122
+ className: "cherita-heatmap position-relative"
123
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
124
+ data: data,
125
+ layout: layout,
126
+ useResizeHandler: true,
127
+ style: {
128
+ maxWidth: "100%",
129
+ maxHeight: "100%"
130
+ }
131
+ }));
132
+ }
119
133
  return /*#__PURE__*/_react.default.createElement("div", {
120
134
  className: "cherita-heatmap"
121
- }, /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
122
- data: data,
123
- layout: layout,
124
- useResizeHandler: true,
125
- style: {
126
- maxWidth: "100%",
127
- maxHeight: "100%"
128
- }
129
- }));
135
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
136
+ variant: "light"
137
+ }, "Select features and a category"));
138
+ } else {
139
+ return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
140
+ variant: "danger"
141
+ }, serverError.message));
130
142
  }
131
- return /*#__PURE__*/_react.default.createElement("div", {
132
- className: "cherita-heatmap"
133
- }, /*#__PURE__*/_react.default.createElement("p", null, "Select OBS and VAR"));
134
143
  }
@@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.Matrixplot = Matrixplot;
8
8
  exports.MatrixplotControls = MatrixplotControls;
9
9
  require("bootstrap/dist/css/bootstrap.min.css");
10
- var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
11
10
  var _react = _interopRequireWildcard(require("react"));
12
11
  var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
13
12
  var _DatasetContext = require("../../context/DatasetContext");
14
13
  var _constants = require("../../constants/constants");
15
14
  var _reactBootstrap = require("react-bootstrap");
16
15
  var _requests = require("../../utils/requests");
16
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
17
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
18
  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); }
18
19
  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; }
19
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
20
20
  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; }
21
21
  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
22
  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 MatrixplotControls() {
32
32
  var dataset = (0, _DatasetContext.useDataset)();
33
33
  var dispatch = (0, _DatasetContext.useDatasetDispatch)();
34
34
  var colorScaleList = _constants.PLOTLY_COLORSCALES.map(function (item) {
35
- return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
35
+ return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
36
36
  key: item,
37
37
  active: dataset.controls.colorScale === item,
38
38
  onClick: function onClick() {
@@ -44,7 +44,7 @@ function MatrixplotControls() {
44
44
  }, item);
45
45
  });
46
46
  var standardScaleList = _constants.MATRIXPLOT_STANDARDSCALES.map(function (item) {
47
- return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
47
+ return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
48
48
  key: item.value,
49
49
  active: dataset.controls.standardScale === item.name,
50
50
  onClick: function onClick() {
@@ -55,13 +55,13 @@ function MatrixplotControls() {
55
55
  }
56
56
  }, item.name);
57
57
  });
58
- 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, {
58
+ 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, {
59
59
  id: "dropdownColorscale",
60
60
  variant: "light"
61
- }, 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, {
61
+ }, 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, {
62
62
  id: "dropdownStandardScale",
63
63
  variant: "light"
64
- }, dataset.controls.standardScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, standardScaleList)))));
64
+ }, dataset.controls.standardScale), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, standardScaleList)))));
65
65
  }
66
66
  function Matrixplot() {
67
67
  var ENDPOINT = "matrixplot";
@@ -133,20 +133,28 @@ function Matrixplot() {
133
133
  colorscale.current = dataset.controls.colorScale;
134
134
  updateColorscale(colorscale.current);
135
135
  }, [dataset.controls.colorScale, updateColorscale]);
136
- if (hasSelections) {
136
+ if (!serverError) {
137
+ if (hasSelections) {
138
+ return /*#__PURE__*/_react.default.createElement("div", {
139
+ className: "cherita-matrixplot position-relative"
140
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
141
+ data: data,
142
+ layout: layout,
143
+ useResizeHandler: true,
144
+ style: {
145
+ maxWidth: "100%",
146
+ maxHeight: "100%"
147
+ }
148
+ }));
149
+ }
137
150
  return /*#__PURE__*/_react.default.createElement("div", {
138
151
  className: "cherita-matrixplot"
139
- }, /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
140
- data: data,
141
- layout: layout,
142
- useResizeHandler: true,
143
- style: {
144
- maxWidth: "100%",
145
- maxHeight: "100%"
146
- }
147
- }));
152
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
153
+ variant: "light"
154
+ }, "Select features and a category"));
155
+ } else {
156
+ return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
157
+ variant: "danger"
158
+ }, serverError.message));
148
159
  }
149
- return /*#__PURE__*/_react.default.createElement("div", {
150
- className: "cherita-matrixplot"
151
- }, /*#__PURE__*/_react.default.createElement("p", null, "Select OBS and VAR"));
152
160
  }
@@ -10,9 +10,10 @@ var _lodash = _interopRequireDefault(require("lodash"));
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
  var _DatasetContext = require("../../context/DatasetContext");
12
12
  var _requests = require("../../utils/requests");
13
- var _reactBootstrap = require("react-bootstrap");
14
13
  var _chromaJs = _interopRequireDefault(require("chroma-js"));
15
14
  var _color = require("../../helpers/color");
15
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
16
+ var _reactBootstrap = require("react-bootstrap");
16
17
  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); }
17
18
  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; }
18
19
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -92,18 +93,20 @@ function ObsColsList() {
92
93
  setObs(fetchedData.reduce(function (result, key) {
93
94
  var colors = _chromaJs.default.scale("Accent").colors(key.n_values, "rgb");
94
95
  result[key.name] = {
95
- is_truncated: key.is_truncated,
96
- n_values: key.n_values,
97
- type: key.type,
98
- values: key.values,
99
- state: key.values.map(function (value, index) {
96
+ type: key.type
97
+ };
98
+ if (key.type === "categorical") {
99
+ result[key.name]["is_truncated"] = key.is_truncated;
100
+ result[key.name]["n_values"] = key.n_values;
101
+ result[key.name]["values"] = key.values;
102
+ result[key.name]["state"] = key.values.map(function (value, index) {
100
103
  return {
101
104
  value: value,
102
105
  color: (0, _chromaJs.default)(colors[index]).rgb(),
103
106
  checked: true
104
107
  };
105
- })
106
- };
108
+ });
109
+ }
107
110
  return result;
108
111
  }, {}));
109
112
  setObsColsList(fetchedData.map(function (d) {
@@ -133,7 +136,9 @@ function ObsColsList() {
133
136
  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Item, {
134
137
  key: item.name,
135
138
  eventKey: item.name
136
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Header, null, item.name), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Body, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup, null, item.values.map(function (value, index) {
139
+ }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Header, null, item.name), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion.Body, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup, {
140
+ variant: "flush"
141
+ }, item.values.map(function (value, index) {
137
142
  return /*#__PURE__*/_react.default.createElement(_reactBootstrap.ListGroup.Item, {
138
143
  key: index
139
144
  }, value, /*#__PURE__*/_react.default.createElement("span", {
@@ -167,19 +172,28 @@ function ObsColsList() {
167
172
  }
168
173
  });
169
174
  }, [obsColsList]);
170
- return /*#__PURE__*/_react.default.createElement("div", {
171
- className: ""
172
- }, /*#__PURE__*/_react.default.createElement("div", {
173
- className: "list-group overflow-auto"
174
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, {
175
- activeKey: active,
176
- onSelect: function onSelect(key) {
177
- dispatch({
178
- type: "obsSelected",
179
- obs: obsColsList.find(function (obs) {
180
- return obs.name === key;
181
- })
182
- });
183
- }
184
- }, obsList)));
175
+ if (!serverError) {
176
+ return /*#__PURE__*/_react.default.createElement("div", {
177
+ className: "position-relative"
178
+ }, /*#__PURE__*/_react.default.createElement("div", {
179
+ className: "list-group overflow-auto"
180
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Accordion, {
181
+ flush: true,
182
+ activeKey: active,
183
+ onSelect: function onSelect(key) {
184
+ if (key != null) {
185
+ dispatch({
186
+ type: "obsSelected",
187
+ obs: obsColsList.find(function (obs) {
188
+ return obs.name === key;
189
+ })
190
+ });
191
+ }
192
+ }
193
+ }, obsList)));
194
+ } else {
195
+ return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
196
+ variant: "danger"
197
+ }, serverError.message));
198
+ }
185
199
  }
@@ -9,6 +9,8 @@ require("bootstrap/dist/css/bootstrap.min.css");
9
9
  var _react = _interopRequireWildcard(require("react"));
10
10
  var _requests = require("../../utils/requests");
11
11
  var _DatasetContext = require("../../context/DatasetContext");
12
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
13
+ var _reactBootstrap = require("react-bootstrap");
12
14
  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); }
13
15
  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; }
14
16
  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() {
76
78
  }
77
79
  }, item);
78
80
  });
79
- return /*#__PURE__*/_react.default.createElement("div", {
80
- className: ""
81
- }, /*#__PURE__*/_react.default.createElement("div", {
82
- className: "list-group overflow-auto mh-100"
83
- }, obsmList));
81
+ if (!serverError) {
82
+ return /*#__PURE__*/_react.default.createElement("div", {
83
+ className: ""
84
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement("div", {
85
+ className: "list-group overflow-auto mh-100"
86
+ }, obsmList));
87
+ } else {
88
+ return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
89
+ variant: "danger"
90
+ }, serverError.message));
91
+ }
84
92
  }
@@ -13,6 +13,7 @@ var _requests = require("../../utils/requests");
13
13
  var _DatasetContext = require("../../context/DatasetContext");
14
14
  var _constants = require("../../constants/constants");
15
15
  var _reactBootstrap = require("react-bootstrap");
16
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
16
17
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
18
  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); }
18
19
  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; }
@@ -218,12 +219,18 @@ function VarNamesList(_ref2) {
218
219
  }
219
220
  });
220
221
  }, [active, dispatch, mode, varButtons]);
221
- return /*#__PURE__*/_react.default.createElement("div", {
222
- className: ""
223
- }, /*#__PURE__*/_react.default.createElement("h4", null, mode), /*#__PURE__*/_react.default.createElement(VarSearchBar, {
224
- varNames: varNames,
225
- onSelect: selectVar
226
- }), /*#__PURE__*/_react.default.createElement("div", {
227
- className: "overflow-auto mt-2"
228
- }, varList));
222
+ if (!serverError) {
223
+ return /*#__PURE__*/_react.default.createElement("div", {
224
+ className: "position-relative"
225
+ }, /*#__PURE__*/_react.default.createElement("h4", null, mode), isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement(VarSearchBar, {
226
+ varNames: varNames,
227
+ onSelect: selectVar
228
+ }), /*#__PURE__*/_react.default.createElement("div", {
229
+ className: "overflow-auto mt-2"
230
+ }, varList));
231
+ } else {
232
+ return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
233
+ variant: "danger"
234
+ }, serverError.message));
235
+ }
229
236
  }
@@ -7,16 +7,16 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.Violin = Violin;
8
8
  exports.ViolinControls = ViolinControls;
9
9
  require("bootstrap/dist/css/bootstrap.min.css");
10
- var _Dropdown = _interopRequireDefault(require("react-bootstrap/Dropdown"));
11
10
  var _react = _interopRequireWildcard(require("react"));
12
11
  var _reactPlotly = _interopRequireDefault(require("react-plotly.js"));
13
12
  var _DatasetContext = require("../../context/DatasetContext");
14
13
  var _constants = require("../../constants/constants");
15
14
  var _reactBootstrap = require("react-bootstrap");
16
15
  var _requests = require("../../utils/requests");
16
+ var _LoadingSpinner = require("../../utils/LoadingSpinner");
17
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
17
18
  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); }
18
19
  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; }
19
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
20
20
  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; }
21
21
  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
22
  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; }
@@ -43,7 +43,7 @@ function ViolinControls() {
43
43
  }
44
44
  }, [dataset.controls.standardScale]);
45
45
  var standardScaleList = _constants.VIOLINPLOT_STANDARDSCALES.map(function (item) {
46
- return /*#__PURE__*/_react.default.createElement(_Dropdown.default.Item, {
46
+ return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
47
47
  key: item.value,
48
48
  active: activeStandardScale === item.value,
49
49
  onClick: function onClick() {
@@ -54,10 +54,10 @@ function ViolinControls() {
54
54
  }
55
55
  }, item.name);
56
56
  });
57
- 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, {
57
+ 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, {
58
58
  id: "dropdownStandardScale",
59
59
  variant: "light"
60
- }, activeStandardScale), /*#__PURE__*/_react.default.createElement(_Dropdown.default.Menu, null, standardScaleList)))));
60
+ }, activeStandardScale), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Menu, null, standardScaleList)))));
61
61
  }
62
62
  function Violin(_ref) {
63
63
  var _ref$mode = _ref.mode,
@@ -130,20 +130,30 @@ function Violin(_ref) {
130
130
  setLayout(fetchedData.layout);
131
131
  }
132
132
  }, [fetchedData, hasSelections, isPending, serverError]);
133
- if (hasSelections) {
133
+ if (!serverError) {
134
+ if (hasSelections) {
135
+ return /*#__PURE__*/_react.default.createElement("div", {
136
+ className: "cherita-violin position-relative"
137
+ }, isPending && /*#__PURE__*/_react.default.createElement(_LoadingSpinner.LoadingSpinner, null), /*#__PURE__*/_react.default.createElement("h5", null, mode), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
138
+ data: data,
139
+ layout: layout,
140
+ useResizeHandler: true,
141
+ style: {
142
+ maxWidth: "100%",
143
+ maxHeight: "100%"
144
+ }
145
+ }));
146
+ }
134
147
  return /*#__PURE__*/_react.default.createElement("div", {
135
148
  className: "cherita-violin"
136
- }, /*#__PURE__*/_react.default.createElement("h5", null, mode), /*#__PURE__*/_react.default.createElement(_reactPlotly.default, {
137
- data: data,
138
- layout: layout,
139
- useResizeHandler: true,
140
- style: {
141
- maxWidth: "100%",
142
- maxHeight: "100%"
143
- }
144
- }));
149
+ }, mode === _constants.VIOLIN_MODES.MULTIKEY && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
150
+ variant: "light"
151
+ }, "Select features"), mode === _constants.VIOLIN_MODES.GROUPBY && /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
152
+ variant: "light"
153
+ }, "Select categories and a feature"));
154
+ } else {
155
+ return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Alert, {
156
+ variant: "danger"
157
+ }, serverError.message));
145
158
  }
146
- return /*#__PURE__*/_react.default.createElement("div", {
147
- className: "cherita-violin"
148
- }, /*#__PURE__*/_react.default.createElement("p", null, "Select variables to plot"));
149
159
  }
@@ -38,7 +38,12 @@ var queryClient = new _reactQuery.QueryClient({
38
38
  queries: {
39
39
  gcTime: 1000 * 60 * 60 * 24
40
40
  }
41
- }
41
+ },
42
+ queryCache: new _reactQuery.QueryCache({
43
+ onError: function onError(error, query) {
44
+ console.error(error);
45
+ }
46
+ })
42
47
  });
43
48
  var persistKeys = ["obs/cols", "var/names", "obsm/keys"];
44
49
  var persistOptions = {
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.LoadingSpinner = LoadingSpinner;
7
+ require("bootstrap/dist/css/bootstrap.min.css");
8
+ var _reactBootstrap = require("react-bootstrap");
9
+ function LoadingSpinner(_ref) {
10
+ var _ref$type = _ref.type,
11
+ type = _ref$type === void 0 ? "icon" : _ref$type,
12
+ _ref$text = _ref.text,
13
+ text = _ref$text === void 0 ? "Loading..." : _ref$text;
14
+ if (type === "message") {
15
+ return /*#__PURE__*/React.createElement("div", {
16
+ className: " h-100 w-100 d-flex z-1 bg-light opacity-75 position-absolute justify-content-center align-items-center "
17
+ }, /*#__PURE__*/React.createElement(_reactBootstrap.Button, {
18
+ variant: "primary",
19
+ disabled: true
20
+ }, /*#__PURE__*/React.createElement(_reactBootstrap.Spinner, {
21
+ as: "span",
22
+ animation: "border",
23
+ size: "sm",
24
+ role: "status",
25
+ "aria-hidden": "true"
26
+ }), text));
27
+ } else {
28
+ return /*#__PURE__*/React.createElement("div", {
29
+ className: " h-100 w-100 d-flex z-1 bg-light opacity-75 position-absolute justify-content-center align-items-center "
30
+ }, /*#__PURE__*/React.createElement(_reactBootstrap.Spinner, {
31
+ animation: "border",
32
+ variant: "primary",
33
+ role: "status"
34
+ }, /*#__PURE__*/React.createElement("span", {
35
+ className: "visually-hidden"
36
+ }, text)));
37
+ }
38
+ }
@@ -0,0 +1,53 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.parseError = void 0;
7
+ 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); }
8
+ 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; }
9
+ 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; }
10
+ 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; }
11
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
12
+ 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); }
13
+ var parseError = function parseError(err) {
14
+ if (err === DOMException.TIMEOUT_ERR) {
15
+ return {
16
+ message: "Timeout error",
17
+ name: err
18
+ };
19
+ }
20
+ switch (err === null || err === void 0 ? void 0 : err.name) {
21
+ case "TypeError":
22
+ return _objectSpread(_objectSpread({}, err), {}, {
23
+ message: "Failed to fetch data from server"
24
+ });
25
+ case "ReadZarrError":
26
+ return _objectSpread(_objectSpread({}, err), {}, {
27
+ message: "Failed to read AnnData-Zarr"
28
+ });
29
+ case "InvalidObs":
30
+ return _objectSpread(_objectSpread({}, err), {}, {
31
+ message: "Observation not found in dataset"
32
+ });
33
+ case "InvalidVar":
34
+ return _objectSpread(_objectSpread({}, err), {}, {
35
+ message: "Feature not found in dataset"
36
+ });
37
+ case "InvalidKey":
38
+ return _objectSpread(_objectSpread({}, err), {}, {
39
+ message: "Key not found in datset"
40
+ });
41
+ case "BadRequest":
42
+ return _objectSpread(_objectSpread({}, err), {}, {
43
+ message: "Invalid request to server"
44
+ });
45
+ case "InternalServerError":
46
+ return _objectSpread(_objectSpread({}, err), {}, {
47
+ message: "Server error"
48
+ });
49
+ default:
50
+ return err;
51
+ }
52
+ };
53
+ exports.parseError = parseError;
@@ -8,6 +8,7 @@ exports.fetchData = fetchData;
8
8
  exports.useFetch = exports.useDebouncedFetch = void 0;
9
9
  var _usehooks = require("@uidotdev/usehooks");
10
10
  var _reactQuery = require("@tanstack/react-query");
11
+ var _errors = require("./errors");
11
12
  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; }
12
13
  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; }
13
14
  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) {
22
23
  function _fetchData() {
23
24
  _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(endpoint, params) {
24
25
  var signal,
26
+ ms,
25
27
  apiUrl,
28
+ controller,
29
+ timeout,
26
30
  response,
27
31
  _args = arguments;
28
32
  return _regeneratorRuntime().wrap(function _callee$(_context) {
29
33
  while (1) switch (_context.prev = _context.next) {
30
34
  case 0:
31
35
  signal = _args.length > 2 && _args[2] !== undefined ? _args[2] : null;
36
+ ms = _args.length > 3 && _args[3] !== undefined ? _args[3] : 300000;
32
37
  apiUrl = process.env.REACT_APP_API_URL;
33
- _context.next = 4;
38
+ controller = new AbortController();
39
+ timeout = setTimeout(function () {
40
+ controller.abort(DOMException.TIMEOUT_ERR);
41
+ }, ms || 300000);
42
+ if (signal) signal.addEventListener("abort", function () {
43
+ return controller.abort();
44
+ });
45
+ _context.next = 8;
34
46
  return fetch(new URL(endpoint, apiUrl), {
35
47
  method: "POST",
36
48
  mode: "cors",
@@ -39,21 +51,32 @@ function _fetchData() {
39
51
  Accept: "application/json"
40
52
  },
41
53
  body: JSON.stringify(params),
42
- signal: signal
54
+ signal: controller.signal
55
+ }).catch(function (err) {
56
+ // Manual check as fetch returns an AbortError regardless of the reason set to the signal
57
+ if (controller.signal.aborted && controller.signal.reason === DOMException.TIMEOUT_ERR) {
58
+ throw DOMException.TIMEOUT_ERR;
59
+ }
60
+ throw err;
61
+ }).finally(function () {
62
+ return clearTimeout(timeout);
43
63
  });
44
- case 4:
64
+ case 8:
45
65
  response = _context.sent;
46
66
  if (response.ok) {
47
- _context.next = 7;
67
+ _context.next = 13;
48
68
  break;
49
69
  }
50
- throw response;
51
- case 7:
52
- _context.next = 9;
70
+ _context.next = 12;
71
+ return response.json();
72
+ case 12:
73
+ throw _context.sent;
74
+ case 13:
75
+ _context.next = 15;
53
76
  return response.json();
54
- case 9:
77
+ case 15:
55
78
  return _context.abrupt("return", _context.sent);
56
- case 10:
79
+ case 16:
57
80
  case "end":
58
81
  return _context.stop();
59
82
  }
@@ -76,7 +99,7 @@ var useFetch = function useFetch(endpoint, params) {
76
99
  return {
77
100
  fetchedData: fetchedData,
78
101
  isPending: isPending,
79
- serverError: serverError
102
+ serverError: (0, _errors.parseError)(serverError)
80
103
  };
81
104
  };
82
105
  exports.useFetch = useFetch;
@@ -97,7 +120,7 @@ var useDebouncedFetch = function useDebouncedFetch(endpoint, params) {
97
120
  return {
98
121
  fetchedData: fetchedData,
99
122
  isPending: isPending,
100
- serverError: serverError
123
+ serverError: (0, _errors.parseError)(serverError)
101
124
  };
102
125
  };
103
126
  exports.useDebouncedFetch = useDebouncedFetch;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haniffalab/cherita-react",
3
- "version": "0.1.12-dev.2024-02-12.197c465a",
3
+ "version": "0.1.12-dev.2024-02-12.20ce0bfd",
4
4
  "author": "",
5
5
  "license": "",
6
6
  "main": "dist/index.js",
@@ -78,5 +78,5 @@
78
78
  "url": "https://github.com/haniffalab/cherita-react/issues"
79
79
  },
80
80
  "homepage": "https://github.com/haniffalab/cherita-react#readme",
81
- "prereleaseSha": "197c465a7ab68f15b9b2c3032d372302ac6dee77"
81
+ "prereleaseSha": "20ce0bfd7d3b61f7825d8028031f9c8cb9db1b32"
82
82
  }