@aics/vole-app 3.5.0 → 3.6.0

package/es/aics-image-viewer/shared/utils/parseUrl.js

@@ -33,7 +33,6 @@ import { parseKeyValueList, stringSnapshotToViewerChannelSetting, stringSnapshot
 import { channelStateToStringSnapshot, objectToKeyValueList, viewerStateToStringSnapshot } from "../../state/serialize";
 import { ViewerStateSnapshotKeys } from "../../state/types";
 import { removeUndefinedProperties } from "./datatypes";
-import FirebaseRequest from "./firebase";
 import { readStoredMetadata, readStoredScenes } from "./storage";
 var CHANNEL_STATE_KEY_REGEX = /^c[0-9]+$/;
 
@@ -65,10 +64,6 @@ var DataParams = /*#__PURE__*/_createClass(function DataParams() {
    * See `ManifestJson` for the type definition.
    */
   _defineProperty(this, "manifest", undefined);
-  /** The name of a dataset in the Cell Feature Explorer database. Used with `id`. */
-  _defineProperty(this, "dataset", undefined);
-  /** The ID of a cell within the loaded dataset. Used with `dataset`. */
-  _defineProperty(this, "id", undefined);
   /** The key of a collection of scenes stored in local storage. Overrides `url`. */
   _defineProperty(this, "collectionid", undefined);
   /**
@@ -264,86 +259,7 @@ function parseChannelSettings(params) {
 }
 
 //// FULL URL PARSING //////////////////////
-function loadDataset(_x, _x2, _x3) {
-  return _loadDataset.apply(this, arguments);
-}
-function _loadDataset() {
-  _loadDataset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(firestore, dataset, id) {
-    var db, args, datasets, datasetMeta, _iterator2, _step2, d, innerDatasets, names, matchingName, datasetData, baseUrl, fileInfo;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          db = new FirebaseRequest(firestore);
-          args = {};
-          _context.next = 4;
-          return db.getAvailableDatasets();
-        case 4:
-          datasets = _context.sent;
-          datasetMeta = undefined;
-          _iterator2 = _createForOfIteratorHelper(datasets);
-          _context.prev = 7;
-          _iterator2.s();
-        case 9:
-          if ((_step2 = _iterator2.n()).done) {
-            _context.next = 19;
-            break;
-          }
-          d = _step2.value;
-          innerDatasets = d.datasets;
-          names = Object.keys(innerDatasets);
-          matchingName = names.find(function (name) {
-            return name === dataset;
-          });
-          if (!matchingName) {
-            _context.next = 17;
-            break;
-          }
-          datasetMeta = innerDatasets[matchingName];
-          return _context.abrupt("break", 19);
-        case 17:
-          _context.next = 9;
-          break;
-        case 19:
-          _context.next = 24;
-          break;
-        case 21:
-          _context.prev = 21;
-          _context.t0 = _context["catch"](7);
-          _iterator2.e(_context.t0);
-        case 24:
-          _context.prev = 24;
-          _iterator2.f();
-          return _context.finish(24);
-        case 27:
-          if (!(datasetMeta === undefined)) {
-            _context.next = 30;
-            break;
-          }
-          console.error("No matching dataset: ".concat(dataset));
-          return _context.abrupt("return", {});
-        case 30:
-          _context.next = 32;
-          return db.selectDataset(datasetMeta.manifest);
-        case 32:
-          datasetData = _context.sent;
-          baseUrl = datasetData.volumeViewerDataRoot + "/";
-          args.imageDownloadHref = datasetData.downloadRoot + "/" + id;
-          // args.fovDownloadHref = datasetData.downloadRoot + "/" + id;
-          _context.next = 37;
-          return db.getFileInfoByCellId(id);
-        case 37:
-          fileInfo = _context.sent;
-          args.imageUrl = baseUrl + fileInfo.volumeviewerPath;
-          args.parentImageUrl = baseUrl + fileInfo.fovVolumeviewerPath;
-          return _context.abrupt("return", args);
-        case 41:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[7, 21, 24, 27]]);
-  }));
-  return _loadDataset.apply(this, arguments);
-}
+
 function isStringArray(arr) {
   return Array.isArray(arr) && arr.every(function (item) {
     return typeof item === "string";
@@ -354,15 +270,13 @@ function isValidScenesArray(arr) {
     return typeof item === "string" || isStringArray(item);
   });
 }
-export function loadFromManifest(_x4) {
+export function loadFromManifest(_x) {
   return _loadFromManifest.apply(this, arguments);
 }
 
 /**
  * Parses a set of URL search parameters into props for the viewer.
  * @param search The query string to parse, which must be valid in the `URLSearchParams constructor
- * @param firestore Optional Firestore instance. If provided, the function can load data from a
- * Firestore dataset if the `dataset` and `id` parameters are provided.
  * @returns An object containing:
  * - `args`: Partial AppProps object.
  * - `viewerSettings`: Partial ViewerState object.
@@ -370,46 +284,46 @@ export function loadFromManifest(_x4) {
  * `args` can be passed as props to the `ImageViewerApp`, and `viewerSettings` can be passed to `ViewerStateProvider`.
  */
 function _loadFromManifest() {
-  _loadFromManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(manifestUrl) {
+  _loadFromManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(manifestUrl) {
     var response, manifestJson, scenes, metadata;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context2.prev = 0;
-          _context2.next = 3;
+          _context.prev = 0;
+          _context.next = 3;
           return fetch(manifestUrl);
         case 3:
-          response = _context2.sent;
-          _context2.next = 10;
+          response = _context.sent;
+          _context.next = 10;
           break;
         case 6:
-          _context2.prev = 6;
-          _context2.t0 = _context2["catch"](0);
-          console.error(_context2.t0);
-          throw new Error("JSON manifest could not be fetched from URL '".concat(manifestUrl, "': ").concat(_context2.t0));
+          _context.prev = 6;
+          _context.t0 = _context["catch"](0);
+          console.error(_context.t0);
+          throw new Error("JSON manifest could not be fetched from URL '".concat(manifestUrl, "': ").concat(_context.t0));
         case 10:
           if (response.ok) {
-            _context2.next = 12;
+            _context.next = 12;
             break;
           }
           throw new Error("JSON manifest could not be fetched from URL '".concat(manifestUrl, "': Received ").concat(response.status, " ").concat(response.statusText));
         case 12:
-          _context2.prev = 12;
-          _context2.next = 15;
+          _context.prev = 12;
+          _context.next = 15;
           return response.json();
         case 15:
-          manifestJson = _context2.sent;
-          _context2.next = 21;
+          manifestJson = _context.sent;
+          _context.next = 21;
           break;
         case 18:
-          _context2.prev = 18;
-          _context2.t1 = _context2["catch"](12);
-          throw new Error("Could not parse JSON manifest from URL '".concat(manifestUrl, "': ").concat(_context2.t1));
+          _context.prev = 18;
+          _context.t1 = _context["catch"](12);
+          throw new Error("Could not parse JSON manifest from URL '".concat(manifestUrl, "': ").concat(_context.t1));
         case 21:
           // Parse scenes
           scenes = manifestJson.scenes;
           if (!(scenes === undefined)) {
-            _context2.next = 24;
+            _context.next = 24;
             break;
           }
           throw new Error("No 'scenes' property was found in JSON manifest from URL '".concat(manifestUrl, "'"));
@@ -418,7 +332,7 @@ function _loadFromManifest() {
             scenes = [scenes];
           }
           if (!(!Array.isArray(scenes) || scenes.length === 0 || !isValidScenesArray(scenes))) {
-            _context2.next = 27;
+            _context.next = 27;
             break;
           }
           throw new Error("Invalid 'scenes' property found in JSON manifest from URL '".concat(manifestUrl, "'. 'scenes' must be a non-empty array of strings or string arrays."));
@@ -428,19 +342,19 @@ function _loadFromManifest() {
           if (manifestJson.meta !== undefined && Array.isArray(manifestJson.meta)) {
             metadata = manifestJson.meta;
           }
-          return _context2.abrupt("return", {
+          return _context.abrupt("return", {
             scenes: scenes,
             metadata: metadata
           });
         case 30:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2, null, [[0, 6], [12, 18]]);
+    }, _callee, null, [[0, 6], [12, 18]]);
   }));
   return _loadFromManifest.apply(this, arguments);
 }
-export function parseViewerUrlParams(_x5, _x6) {
+export function parseViewerUrlParams(_x2) {
   return _parseViewerUrlParams.apply(this, arguments);
 }
 
@@ -451,10 +365,10 @@ export function parseViewerUrlParams(_x5, _x6) {
  * This includes the output of GET_DEFAULT_VIEWER_STATE and GET_DEFAULT_CHANNEL_STATE.
  */
 function _parseViewerUrlParams() {
-  _parseViewerUrlParams = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(search, firestore) {
-    var searchParams, params, args, viewerSettings, deprecatedChannelSettings, channelSettings, scenes, _yield$loadFromManife, manifestScenes, manifestMetadata, collectionid, msgorigin, getFromStorage, urlParamFromStorage, urlParam, firstScene, firstUrl, imageUrls, datasetArgs;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  _parseViewerUrlParams = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(search) {
+    var searchParams, params, args, viewerSettings, deprecatedChannelSettings, channelSettings, scenes, _yield$loadFromManife, manifestScenes, manifestMetadata, collectionid, msgorigin, getFromStorage, urlParamFromStorage, urlParam, firstScene, firstUrl, imageUrls;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
           searchParams = new URLSearchParams(search);
           params = getAllowedParams(searchParams);
@@ -467,22 +381,22 @@ function _parseViewerUrlParams() {
 
           // Parse data sources (URL or dataset/id pair)
           if (!(params.manifest !== undefined || params.url !== undefined || params.collectionid !== undefined)) {
-            _context3.next = 35;
+            _context2.next = 33;
             break;
           }
           if (!params.manifest) {
-            _context3.next = 18;
+            _context2.next = 18;
             break;
           }
-          _context3.next = 11;
+          _context2.next = 11;
           return loadFromManifest(params.manifest);
         case 11:
-          _yield$loadFromManife = _context3.sent;
+          _yield$loadFromManife = _context2.sent;
           manifestScenes = _yield$loadFromManife.scenes;
           manifestMetadata = _yield$loadFromManife.metadata;
           scenes = manifestScenes;
           args.metadata = manifestMetadata !== null && manifestMetadata !== void 0 ? manifestMetadata : undefined;
-          _context3.next = 24;
+          _context2.next = 24;
           break;
         case 18:
           // Load from URL or storage
@@ -523,28 +437,16 @@ function _parseViewerUrlParams() {
               }]
             };
           }
-          _context3.next = 40;
-          break;
-        case 35:
-          if (!(params.dataset && params.id && firestore)) {
-            _context3.next = 40;
-            break;
-          }
-          _context3.next = 38;
-          return loadDataset(firestore, params.dataset, params.id);
-        case 38:
-          datasetArgs = _context3.sent;
-          args = _objectSpread(_objectSpread({}, args), datasetArgs);
-        case 40:
-          return _context3.abrupt("return", {
+        case 33:
+          return _context2.abrupt("return", {
             args: removeUndefinedProperties(args),
             viewerSettings: removeUndefinedProperties(viewerSettings)
           });
-        case 41:
+        case 34:
         case "end":
-          return _context3.stop();
+          return _context2.stop();
       }
-    }, _callee3);
+    }, _callee2);
   }));
   return _parseViewerUrlParams.apply(this, arguments);
 }

package/es/aics-image-viewer/shared/utils/test/camera.test.js

@@ -4,8 +4,8 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-import { describe, expect, it } from "@jest/globals";
 import { mat3 } from "gl-matrix";
+import { describe, expect, it } from "vitest";
 import { applyMatrix, defaultOrientedCamera, getRotationAngles, rotationMatrix } from "../camera";
 var expectCameraStateToBe = function expectCameraStateToBe(actual, expected, precision) {
   var _actual$position = _slicedToArray(actual.position, 3),

package/es/aics-image-viewer/shared/utils/test/parseUrl.test.js

@@ -22,7 +22,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-import { describe, expect, it } from "@jest/globals";
+import { describe, expect, it } from "vitest";
 import { parseKeyValueList } from "../../../state/deserialize";
 import { DEFAULT_TEST_VIEWER_CHANNEL_SETTING } from "../../../state/test/test_data";
 import { ViewMode } from "../../../state/types";
@@ -399,46 +399,46 @@ describe("parseViewerUrlParams", function () {
       }
     }, _callee9, null, [[4, 17, 20, 23]]);
   })));
-  it("parses viewer settings", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-    var queryString, _yield$parseViewerUrl10, viewerSettings;
-    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
+  it("parses viewer settings", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0() {
+    var queryString, _yield$parseViewerUrl0, viewerSettings;
+    return _regeneratorRuntime().wrap(function _callee0$(_context0) {
+      while (1) switch (_context0.prev = _context0.next) {
         case 0:
           queryString = "mask=30&view=X";
-          _context10.next = 3;
+          _context0.next = 3;
           return parseViewerUrlParams(queryString);
         case 3:
-          _yield$parseViewerUrl10 = _context10.sent;
-          viewerSettings = _yield$parseViewerUrl10.viewerSettings;
+          _yield$parseViewerUrl0 = _context0.sent;
+          viewerSettings = _yield$parseViewerUrl0.viewerSettings;
           expect(viewerSettings.viewMode).toEqual(ViewMode.yz);
           expect(viewerSettings.maskAlpha).toEqual(30);
         case 7:
         case "end":
-          return _context10.stop();
+          return _context0.stop();
       }
-    }, _callee10);
+    }, _callee0);
   })));
-  it("returns an empty object when no params are passed in", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-    var queryString, _yield$parseViewerUrl11, args, viewerSettings;
-    return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-      while (1) switch (_context11.prev = _context11.next) {
+  it("returns an empty object when no params are passed in", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee1() {
+    var queryString, _yield$parseViewerUrl1, args, viewerSettings;
+    return _regeneratorRuntime().wrap(function _callee1$(_context1) {
+      while (1) switch (_context1.prev = _context1.next) {
         case 0:
           queryString = "";
-          _context11.next = 3;
+          _context1.next = 3;
           return parseViewerUrlParams(queryString);
         case 3:
-          _yield$parseViewerUrl11 = _context11.sent;
-          args = _yield$parseViewerUrl11.args;
-          viewerSettings = _yield$parseViewerUrl11.viewerSettings;
+          _yield$parseViewerUrl1 = _context1.sent;
+          args = _yield$parseViewerUrl1.args;
+          viewerSettings = _yield$parseViewerUrl1.viewerSettings;
           expect(Object.keys(args).length === 0);
           expect(args).toEqual({});
           expect(Object.keys(viewerSettings).length === 0);
           expect(viewerSettings).toEqual({});
         case 10:
         case "end":
-          return _context11.stop();
+          return _context1.stop();
       }
-    }, _callee11);
+    }, _callee1);
   })));
 });
 describe("serializeViewerUrlParams", function () {

package/es/aics-image-viewer/shared/utils/test/storage.test.js

@@ -1,6 +1,6 @@
-import { describe, expect, it } from "@jest/globals";
+import { describe, expect, it } from "vitest";
 import { readStoredMetadata, readStoredScenes, writeMetadata, writeScenes } from "../storage";
-var LONG_STRING = "This is a very long string, long enough that it dwarfs the size of other example data used in this test. Its purpose is to test how the functions in the \"storage\" module evict data from local storage when the quota for local storage size is exceeded. The local storage quota is set to five thousand in this test environment, which is much smaller than most browsers will provide. At one thousand two hundred and thirty-four characters, this string represents a little less than a quarter of the total size of local storage in this test environment. Therefore, the tests below can reliably predict that up to three objects containing this string in one of its properties will fit in local storage, and that inserting a fourth one will trigger an eviction. They can also predict that a single object containing four or more copies of this string will not be allowed in local storage at all. This is slightly imprecise because adding items to local storage using the functions tested in this module incurs some additional storage penalties for the storage key, the stringified JSON surrounding the value, and the key and value of the least-recently-used queue. The size of local storage in this test environment is set in jest.config.js.";
+var LONG_STRING = "This is a very long string, long enough that it dwarfs the size of other example data used in this test. Its purpose is to test how the functions in the \"storage\" module evict data from local storage when the quota for local storage size is exceeded. The local storage quota is set to five thousand in this test environment, which is much smaller than most browsers will provide. At one thousand two hundred and thirty-four characters, this string represents a little less than a quarter of the total size of local storage in this test environment. Therefore, the tests below can reliably predict that up to three objects containing this string in one of its properties will fit in local storage, and that inserting a fourth one will trigger an eviction. They can also predict that a single object containing four or more copies of this string will not be allowed in local storage at all. This is slightly imprecise because adding items to local storage using the functions tested in this module incurs some additional storage penalties for the storage key, the stringified JSON surrounding the value, and the key and value of the least-recently-used queue. The size of local storage in this test environment is set in vitest.config.ts.";
 var LARGE_ENTRY = {
   data: LONG_STRING
 };

package/es/aics-image-viewer/shared/utils/test/viewerChannelSettings.test.js

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "@jest/globals";
+import { describe, expect, it } from "vitest";
 import { makeChannelIndexGrouping, matchChannel } from "../viewerChannelSettings";
 describe("viewer settings", function () {
   describe("matching names", function () {

package/es/aics-image-viewer/state/test/deserialize.test.js

@@ -10,7 +10,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { describe, expect, it } from "@jest/globals";
+import { describe, expect, it } from "vitest";
 import { CONTROL_POINTS_REGEX, enumParser, LEGACY_CONTROL_POINTS_REGEX, parseHexColorAsColorArray, parseKeyValueList, stringSnapshotToChannelState, stringSnapshotToViewerChannelSetting, stringSnapshotToViewerState, validateInt, validateNumber } from "../deserialize";
 import { viewerStateToStringSnapshot } from "../serialize";
 import { RenderMode, ViewMode } from "../types";

package/es/aics-image-viewer/state/test/reset.test.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { describe, expect, it } from "@jest/globals";
+import { describe, expect, it } from "vitest";
 import { getDefaultCameraState, getDefaultChannelState, getDefaultViewerState } from "../../shared/constants";
 import { useViewerState } from "../store";
 import { ImageType, RenderMode, ViewMode } from "../types";

package/es/aics-image-viewer/state/test/serialize.test.js

@@ -4,6 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { describe, expect, it } from "vitest";
 import { getDefaultCameraState } from "../../shared/constants";
 import { cameraStateToSnapshot, channelStateToSnapshot, channelStateToStringSnapshot, objectToKeyValueList, stringifyCameraStateSnapshot, viewerStateToSnapshot, viewerStateToStringSnapshot } from "../serialize";
 import { CUSTOM_TEST_CHANNEL_STATE, CUSTOM_TEST_VIEWER_STATE, DEFAULT_TEST_CHANNEL_STATE, DEFAULT_TEST_VIEWER_STATE, SERIALIZED_CUSTOM_TEST_CHANNEL_STATE, SERIALIZED_CUSTOM_TEST_VIEWER_STATE, SERIALIZED_DEFAULT_TEST_CHANNEL_STATE, SERIALIZED_DEFAULT_TEST_VIEWER_STATE, STRINGIFIED_CUSTOM_TEST_CHANNEL_STATE, STRINGIFIED_CUSTOM_TEST_VIEWER_STATE, STRINGIFIED_DEFAULT_TEST_CHANNEL_STATE, STRINGIFIED_DEFAULT_TEST_VIEWER_STATE } from "./test_data";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aics/vole-app",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "description": "web view of cell volume images",
   "main": "es/index.js",
   "module": "es/index.js",
@@ -21,32 +21,30 @@
     "url": "git+https://github.com/allen-cell-animated/vole-app.git"
   },
   "scripts": {
-    "start": "webpack serve --config webpack.dev.js  --env env=dev",
-    "gh-build-nightly": "webpack --config webpack.dev.js --env env=production basename=/vole-app/",
-    "gh-build-release": "webpack --config webpack.dev.js --env env=production basename=/website-3d-cell-viewer-release/",
-    "s3-build": "webpack --config webpack.dev.js --env env=production",
-    "release-build": "webpack --config webpack.dev.js --env env=production",
-    "docker-build": "webpack --config webpack.common.js --env env=production",
-    "dev": "webpack --config webpack.dev.js --env env=dev",
+    "start": "vite dev",
+    "gh-build-nightly": "vite build --base=/vole-app/",
+    "s3-build": "vite build",
+    "release-build": "vite build",
+    "docker-build": "vite build",
+    "dev": "vite dev",
     "lint": "eslint --config ./.eslintrc --ignore-path ./.eslintignore --ext .jsx --ext .js --ext .ts --ext .tsx ./",
-    "test": "jest --coverage --passWithNoTests",
-    "test:github-action": "jest --silent --passWithNoTests --ci --coverage --coverageReporters=\"text\" --coverageReporters=\"text-summary\" --outputFile=\"report.json\"",
+    "test": "vitest run --passWithNoTests",
     "typeCheck": "tsc -p tsconfig.json --noEmit",
     "generateTypes": "tsc -p tsconfig.base.json --emitDeclarationOnly",
-    "transpileES": "cross-env TS_NODE_PROJECT=tsconfig.es.json BABEL_ENV=es babel src --out-dir es --extensions \".js,.jsx,.ts,.tsx,.svg\" --ignore src/**/*.test.*",
+    "transpileES": "cross-env TS_NODE_PROJECT=tsconfig.es.json BABEL_ENV=es VOLEAPP_VERSION=$npm_package_version babel src --out-dir es --extensions \".js,.jsx,.ts,.tsx,.svg\" --ignore src/**/*.test.*",
     "build": "npm-run-all generateTypes postcss transpileES",
     "postcss": "postcss src/**/*.css --base src --dir es",
     "publish-patch": "npm version patch | xargs -I {} sh -c 'git push origin {}'",
     "postpublish-patch": "git push origin main",
     "prepare": "cross-env DEPLOYMENT_ENV=production npm run build",
-    "predeploy": "cross-env DEPLOYMENT_ENV=production npm run dev",
+    "predeploy": "cross-env DEPLOYMENT_ENV=production npm run release-build",
     "deploy": "gh-pages -d imageviewer -t true",
     "checks": "npm run lint && npm run typeCheck && npm run test"
   },
   "author": "Allen Institute, Cell Science",
   "license": "BSD-3-Clause",
   "dependencies": {
-    "@aics/vole-core": "^4.9.2",
+    "@aics/vole-core": "^4.10.1",
     "@ant-design/icons": "^5.2.5",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
@@ -81,60 +79,44 @@
     "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/color-string": "^1.5.2",
     "@types/d3": "^7.4.3",
-    "@types/jest": "^29.5.14",
     "@types/lodash": "^4.14.185",
+    "@types/node": "^26.5.0",
     "@types/react": "^18.x",
     "@types/react-color": "^3.0.12",
     "@types/react-dom": "^18.x",
     "@types/three": "0.184.0",
-    "@typescript-eslint/eslint-plugin": "^8.46.2",
-    "@typescript-eslint/parser": "^8.46.2",
+    "@typescript-eslint/eslint-plugin": "^8.70.0",
+    "@typescript-eslint/parser": "^8.70.0",
+    "@vitejs/plugin-react": "^6.1.1",
     "antd": "^5.16.2",
-    "axios": "^0.21.1",
-    "babel-loader": "^8.2.2",
     "babel-plugin-replace-import-extension": "^1.1.3",
-    "clean-webpack-plugin": "^4.0.0-alpha.0",
-    "command-line-args": "^5.1.1",
-    "copy-webpack-plugin": "^11.0.0",
+    "babel-plugin-transform-inline-environment-variables": "^0.4.4",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.2.0",
-    "esbuild": "^0.14.50",
-    "esbuild-jest": "^0.5.0",
+    "esbuild": "^0.28.2",
     "eslint": "^8.20.0",
+    "eslint-import-resolver-typescript": "^4.4.5",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
-    "file-loader": "^6.2.0",
-    "firebase": "^7.x",
     "gh-pages": "^4.0.0",
-    "html-webpack-plugin": "^5.3.2",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^30.2.0",
-    "mini-css-extract-plugin": "^2.9.1",
-    "morgan": "^1.9.1",
+    "jsdom": "^30.0.1",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.47",
+    "postcss": "^8.5.26",
     "postcss-cli": "^11.0.0",
     "postcss-discard-comments": "^7.0.3",
     "postcss-extend-rule": "^4.0.0",
     "postcss-import": "^16.1.0",
-    "postcss-loader": "^8.1.1",
-    "postcss-mixins": "^11.0.3",
+    "postcss-mixins": "^12.1.2",
     "postcss-nested": "^6.2.0",
     "postcss-simple-vars": "^7.0.1",
     "postcss-url": "^10.1.3",
     "prettier": "^3.3.3",
-    "prop-types": "^15.5.10",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "resolve-url-loader": "^5.0.0",
-    "style-loader": "^4.0.0",
-    "ts-jest": "^29.4.6",
     "typescript": "^5.9.3",
-    "url-loader": "^4.1.1",
-    "webpack": "^5.89.0",
-    "webpack-cli": "^4.7.2",
-    "webpack-dev-server": "^4.9.3",
-    "webpack-merge": "^5.8.0",
-    "webpack-shell-plugin": "^0.5.0"
+    "vite": "^8.2.2",
+    "vite-plugin-glsl": "^1.6.1",
+    "vite-plugin-svgr": "^5.2.0",
+    "vitest": "^4.1.11"
   }
 }

package/type-declarations/aics-image-viewer/components/ChannelsWidget.d.ts

@@ -7,6 +7,9 @@ export type ChannelsWidgetProps = {
     channelDataChannels: Channel[] | undefined;
     channelGroupedByType: ChannelGrouping;
     viewerChannelSettings?: ViewerChannelSettings;
+    scrollContainer?: HTMLElement | null;
+    getDropdownContainer?: () => HTMLElement;
+    controlPanelCollapsed?: boolean;
     saveIsosurface: (channelIndex: number, type: IsosurfaceFormat) => void;
     onApplyColorPresets: (presets: ColorArray[]) => void;
     filterFunc?: (key: string) => boolean;

package/type-declarations/aics-image-viewer/components/ChannelsWidgetRow.d.ts

@@ -8,6 +8,9 @@ interface ChannelsWidgetRowProps {
     channelDataForChannel: Channel;
     saveIsosurface: (channelIndex: number, type: IsosurfaceFormat) => void;
     onColorChangeComplete?: (newRGB: ColorObject, oldRGB?: ColorObject, index?: number) => void;
+    getDropdownContainer?: () => HTMLElement;
+    scrollContainer?: HTMLElement | null;
+    controlPanelCollapsed?: boolean;
 }
 declare const ChannelsWidgetRow: React.FC<ChannelsWidgetRowProps>;
 export default ChannelsWidgetRow;

package/type-declarations/aics-image-viewer/components/ControlPanel/CopySettingsButton.d.ts

@@ -4,6 +4,8 @@ export type CopySettingsButtonProps = {
     scrollContainer?: HTMLElement | null;
     hide?: boolean;
     getDropdownContainer?: () => HTMLElement;
+    hideImportExport?: boolean;
+    channelIndex?: number;
 };
 declare const CopySettingsButton: React.FC<CopySettingsButtonProps>;
 export default CopySettingsButton;

package/type-declarations/aics-image-viewer/components/ViewerCanvasWrapper/index.d.ts

@@ -12,6 +12,7 @@ type ViewerWrapperProps = {
     numSlicesLoaded: XYZ<number>;
     playControls: PlayControls;
     playingAxis: AxisName | "t" | null;
+    setScrubbingAxis: (axis: AxisName | "t" | null) => void;
     numTimesteps: number;
     numScenes: number;
     visibleControls: {

package/type-declarations/aics-image-viewer/components/dimension_sliders/AxisClipSliders.d.ts

@@ -18,6 +18,7 @@ type AxisClipSlidersProps = {
     scene: number;
     playingAxis: AxisName | "t" | null;
     playControls: PlayControls;
+    setScrubbingAxis: (axis: AxisName | "t" | null) => void;
 };
 export declare const AxisClipSliders: React.FC<AxisClipSlidersProps>;
 export {};

package/type-declarations/aics-image-viewer/components/dimension_sliders/SliderRows.d.ts

@@ -17,9 +17,8 @@ type DimensionSliderRowProps = SharedSliderRowProps<number[]> & {
     unitSymbol?: string;
 };
 type IndexSliderRowProps = Omit<SharedSliderRowProps, "min">;
-type PlaySliderRowProps = Omit<SharedSliderRowProps, "valReadout" | "min" | "onSlide"> & {
+type PlaySliderRowProps = Omit<SharedSliderRowProps, "valReadout" | "min"> & {
     playing: boolean;
-    updateWhileSliding?: boolean;
     onTogglePlayback: (play: boolean) => void;
 };
 /** A single slider row, with a slider, one or two spinbox inputs, and a max value. */

package/type-declarations/aics-image-viewer/components/shared/ControlPanelRow/index.d.ts

@@ -6,6 +6,7 @@ export type ControlPanelRowProps = React.PropsWithChildren<ColorPickerPropPassth
     verticalMargin?: number;
     showColorPicker?: boolean;
     title?: React.ReactNode;
+    icon?: React.ReactNode;
     onClick?: React.MouseEventHandler;
     className?: string;
     highlight?: boolean;