@aics/vole-app 2.15.0 → 3.1.1

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

@@ -1,4 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 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 e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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); }); }; }
@@ -230,7 +231,8 @@ describe("Channel state serialization", function () {
     }],
     ramp: [0, 255],
     plotMin: 0,
-    plotMax: 255
+    plotMax: 255,
+    keepIntensityRange: false
   };
   var DEFAULT_SERIALIZED_CHANNEL_STATE = {
     col: "ff0000",
@@ -241,8 +243,9 @@ describe("Channel state serialization", function () {
     clz: "1",
     cza: "0.5",
     cpe: "0",
-    cps: "0:0.5:1:255:1:1",
-    rmp: "0:255"
+    cpt: "0:0.5:1:255:1:1",
+    ram: "0:255",
+    pin: "0"
   };
 
   // Note that the serialization + deserialization are NOT direct inverses.
@@ -291,13 +294,16 @@ describe("Channel state serialization", function () {
         surfaceOpacity: 0.75,
         colorizeEnabled: true,
         colorizeAlpha: 0.5,
-        lut: ["0", "255"]
+        intensity: {
+          lut: ["0", "255"]
+        }
       });
     });
     it("handles expected lut formatting", function () {
       var luts = [["autoij:0", ["autoij", "0"]], ["0:autoij", ["0", "autoij"]], [":autoij", ["", "autoij"]], ["autoij:", ["autoij", ""]], ["0:255", ["0", "255"]], ["0.5:1.0", ["0.5", "1.0"]], ["0.50:1.00", ["0.50", "1.00"]], ["m99:m100", ["m99", "m100"]], ["p10:p90", ["p10", "p90"]], ["p10: p90", ["p10", "p90"]] // handle spaces
       ];
       for (var _i = 0, _luts = luts; _i < _luts.length; _i++) {
+        var _result$intensity;
         var _luts$_i = _slicedToArray(_luts[_i], 2),
           encodedLut = _luts$_i[0],
           decodedLut = _luts$_i[1];
@@ -305,7 +311,7 @@ describe("Channel state serialization", function () {
           lut: encodedLut
         };
         var result = deserializeViewerChannelSetting(0, data);
-        expect(result.lut).toEqual(decodedLut);
+        expect((_result$intensity = result.intensity) === null || _result$intensity === void 0 ? void 0 : _result$intensity.lut).toEqual(decodedLut);
       }
     });
     it("ignores unexpected lut formats", function () {
@@ -373,7 +379,8 @@ describe("Channel state serialization", function () {
         ramp: [0, 255],
         // TODO: the settings below are not serialized. should they be? (see #384)
         plotMin: 0,
-        plotMax: 255
+        plotMax: 255,
+        keepIntensityRange: false
       };
       var serializedCustomChannelState = {
         col: "03ff9d",
@@ -384,8 +391,9 @@ describe("Channel state serialization", function () {
         clz: "0",
         cza: "1",
         cpe: "0",
-        cps: "",
-        rmp: "0:255"
+        cpt: "",
+        ram: "0:255",
+        pin: "0"
       };
       expect(serializeViewerChannelSetting(customChannelState, false)).toEqual(serializedCustomChannelState);
     });
@@ -616,23 +624,54 @@ describe("Channel state deserialization", function () {
     opacity: 1,
     color: [0, 255, 180]
   }];
+  describe("legacy control points", function () {
+    it("parses comma-separated control points", function () {
+      var result = deserializeViewerChannelSetting(0, {
+        cps: "-10:0:000000,50:0:000000,100:0.3:0010ff,140:0.8:00ffff,260:1:00ffb4"
+      });
+      expect(result.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
+    });
+    it("parses colon-separated control points", function () {
+      var result = deserializeViewerChannelSetting(0, {
+        cps: "-10:0:000000:50:0:000000:100:0.3:0010ff:140:0.8:00ffff:260:1:00ffb4"
+      });
+      expect(result.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
+    });
+    it("replaces '1' color strings with default color #ffffff", function () {
+      var result = deserializeViewerChannelSetting(0, {
+        cps: "0:0:1:50:1:1"
+      });
+      expect(result.controlPoints).toEqual([{
+        x: 0,
+        opacity: 0,
+        color: [255, 255, 255]
+      }, {
+        x: 50,
+        opacity: 1,
+        color: [255, 255, 255]
+      }]);
+    });
+  });
   it("parses comma-separated control points", function () {
+    var _result$intensity2;
     var result = deserializeViewerChannelSetting(0, {
-      cps: "-10:0:000000,50:0:000000,100:0.3:0010ff,140:0.8:00ffff,260:1:00ffb4"
+      cpt: "-10:0:000000,50:0:000000,100:0.3:0010ff,140:0.8:00ffff,260:1:00ffb4"
     });
-    expect(result.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
+    expect((_result$intensity2 = result.intensity) === null || _result$intensity2 === void 0 ? void 0 : _result$intensity2.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
   });
   it("parses colon-separated control points", function () {
+    var _result$intensity3;
     var result = deserializeViewerChannelSetting(0, {
-      cps: "-10:0:000000:50:0:000000:100:0.3:0010ff:140:0.8:00ffff:260:1:00ffb4"
+      cpt: "-10:0:000000:50:0:000000:100:0.3:0010ff:140:0.8:00ffff:260:1:00ffb4"
     });
-    expect(result.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
+    expect((_result$intensity3 = result.intensity) === null || _result$intensity3 === void 0 ? void 0 : _result$intensity3.controlPoints).toEqual(DEFAULT_CONTROL_POINTS);
   });
   it("replaces '1' color strings with default color #ffffff", function () {
+    var _result$intensity4;
     var result = deserializeViewerChannelSetting(0, {
-      cps: "0:0:1:50:1:1"
+      cpt: "0:0:1:50:1:1"
     });
-    expect(result.controlPoints).toEqual([{
+    expect((_result$intensity4 = result.intensity) === null || _result$intensity4 === void 0 ? void 0 : _result$intensity4.controlPoints).toEqual([{
       x: 0,
       opacity: 0,
       color: [255, 255, 255]
@@ -658,7 +697,9 @@ describe("parseViewerUrlParams", function () {
     colorizeEnabled: false,
     colorizeAlpha: 0.9,
     isovalue: 129,
-    lut: ["p50", "p99"]
+    intensity: {
+      lut: ["p50", "p99"]
+    }
   }], ["c1=ven:0,col:ff0000,clz:1,cza:0.5,isa:0.75,lut:0:255,sen:0,isv:0", "c1=ven%3A0%2Ccol%3Aff0000%2Cclz%3A1%2Ccza%3A0.5%2Cisa%3A0.75%2Clut%3A0%3A255%2Csen%3A0%2Cisv%3A0", {
     color: "ff0000",
     name: undefined,
@@ -669,7 +710,9 @@ describe("parseViewerUrlParams", function () {
     surfaceEnabled: false,
     enabled: false,
     isovalue: 0,
-    lut: ["0", "255"]
+    intensity: {
+      lut: ["0", "255"]
+    }
   }], ["c5=ven:0,col:00ff00,clz:0,cza:0,isa:1,lut:autoij:,sen:1,isv:100", "c5=ven%3A0%2Ccol%3A00ff00%2Cclz%3A0%2Ccza%3A0%2Cisa%3A1%2Clut%3Aautoij%3A%2Csen%3A1%2Cisv%3A100", {
     color: "00ff00",
     name: undefined,
@@ -680,111 +723,109 @@ describe("parseViewerUrlParams", function () {
     surfaceEnabled: true,
     enabled: false,
     isovalue: 100,
-    lut: ["autoij", ""]
+    intensity: {
+      lut: ["autoij", ""]
+    }
   }]];
   it("parses unencoded per-channel setting", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _i7, _channelParamToSettin, _args$viewerChannelSe, _channelParamToSettin2, queryString, expected, params, _yield$parseViewerUrl, args, channelSetting;
+    var _i7, _channelParamToSettin, _args$viewerChannelSe, _channelParamToSettin2, queryString, expected, _yield$parseViewerUrl, args, channelSetting;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _i7 = 0, _channelParamToSettin = channelParamToSetting;
         case 1:
           if (!(_i7 < _channelParamToSettin.length)) {
-            _context.next = 13;
+            _context.next = 12;
             break;
           }
           _channelParamToSettin2 = _slicedToArray(_channelParamToSettin[_i7], 3), queryString = _channelParamToSettin2[0], expected = _channelParamToSettin2[2];
-          params = new URLSearchParams(queryString);
-          _context.next = 6;
-          return parseViewerUrlParams(params);
-        case 6:
+          _context.next = 5;
+          return parseViewerUrlParams(queryString);
+        case 5:
           _yield$parseViewerUrl = _context.sent;
           args = _yield$parseViewerUrl.args;
           channelSetting = (_args$viewerChannelSe = args.viewerChannelSettings) === null || _args$viewerChannelSe === void 0 ? void 0 : _args$viewerChannelSe.groups[0].channels[0];
           expect(channelSetting).toEqual(expected);
-        case 10:
+        case 9:
           _i7++;
           _context.next = 1;
           break;
-        case 13:
+        case 12:
         case "end":
           return _context.stop();
       }
     }, _callee);
   })));
   it("parses encoded per-channel settings", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-    var _i8, _channelParamToSettin3, _args$viewerChannelSe2, _channelParamToSettin4, queryString, expected, params, _yield$parseViewerUrl2, args, channelSetting;
+    var _i8, _channelParamToSettin3, _args$viewerChannelSe2, _channelParamToSettin4, queryString, expected, _yield$parseViewerUrl2, args, channelSetting;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _i8 = 0, _channelParamToSettin3 = channelParamToSetting;
         case 1:
           if (!(_i8 < _channelParamToSettin3.length)) {
-            _context2.next = 13;
+            _context2.next = 12;
             break;
           }
           _channelParamToSettin4 = _slicedToArray(_channelParamToSettin3[_i8], 3), queryString = _channelParamToSettin4[1], expected = _channelParamToSettin4[2];
-          params = new URLSearchParams(queryString);
-          _context2.next = 6;
-          return parseViewerUrlParams(params);
-        case 6:
+          _context2.next = 5;
+          return parseViewerUrlParams(queryString);
+        case 5:
           _yield$parseViewerUrl2 = _context2.sent;
           args = _yield$parseViewerUrl2.args;
           channelSetting = (_args$viewerChannelSe2 = args.viewerChannelSettings) === null || _args$viewerChannelSe2 === void 0 ? void 0 : _args$viewerChannelSe2.groups[0].channels[0];
           expect(channelSetting).toEqual(expected);
-        case 10:
+        case 9:
           _i8++;
           _context2.next = 1;
           break;
-        case 13:
+        case 12:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   })));
   it("parses multiple per-channel settings", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-    var i, _args$viewerChannelSe3, queryString, params, _yield$parseViewerUrl3, args, channelSettings;
+    var i, _args$viewerChannelSe3, queryString, _yield$parseViewerUrl3, args, channelSettings;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           i = 0;
         case 1:
           if (!(i < 2)) {
-            _context3.next = 15;
+            _context3.next = 14;
             break;
           }
           queryString = channelParamToSetting[0][i] + "&" + channelParamToSetting[1][i] + "&" + channelParamToSetting[2][i];
-          params = new URLSearchParams(queryString);
-          _context3.next = 6;
-          return parseViewerUrlParams(params);
-        case 6:
+          _context3.next = 5;
+          return parseViewerUrlParams(queryString);
+        case 5:
           _yield$parseViewerUrl3 = _context3.sent;
           args = _yield$parseViewerUrl3.args;
           channelSettings = (_args$viewerChannelSe3 = args.viewerChannelSettings) === null || _args$viewerChannelSe3 === void 0 ? void 0 : _args$viewerChannelSe3.groups[0].channels; // Order is not guaranteed, so check if any of the expected settings are present
           expect(channelSettings).toContainEqual(channelParamToSetting[0][2]);
           expect(channelSettings).toContainEqual(channelParamToSetting[1][2]);
           expect(channelSettings).toContainEqual(channelParamToSetting[2][2]);
-        case 12:
+        case 11:
           i++;
           _context3.next = 1;
           break;
-        case 15:
+        case 14:
         case "end":
           return _context3.stop();
       }
     }, _callee3);
   })));
   it("overrides ch settings when per-channel settings are included", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-    var _args$viewerChannelSe4;
-    var queryString, params, _yield$parseViewerUrl4, args, groups, channelSetting;
+    var _args$viewerChannelSe4, _channelSetting$inten;
+    var queryString, _yield$parseViewerUrl4, args, groups, channelSetting;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           queryString = "?ch=0&lut=1,2&c1=ven:1,lut:4:5";
-          params = new URLSearchParams(queryString);
-          _context4.next = 4;
-          return parseViewerUrlParams(params);
-        case 4:
+          _context4.next = 3;
+          return parseViewerUrlParams(queryString);
+        case 3:
           _yield$parseViewerUrl4 = _context4.sent;
           args = _yield$parseViewerUrl4.args;
           groups = (_args$viewerChannelSe4 = args.viewerChannelSettings) === null || _args$viewerChannelSe4 === void 0 ? void 0 : _args$viewerChannelSe4.groups[0];
@@ -792,24 +833,23 @@ describe("parseViewerUrlParams", function () {
           channelSetting = groups.channels[0];
           expect(channelSetting.match).toEqual(1);
           expect(channelSetting.enabled).toEqual(true);
-          expect(channelSetting.lut).toEqual(["4", "5"]);
-        case 12:
+          expect((_channelSetting$inten = channelSetting.intensity) === null || _channelSetting$inten === void 0 ? void 0 : _channelSetting$inten.lut).toEqual(["4", "5"]);
+        case 11:
         case "end":
           return _context4.stop();
       }
     }, _callee4);
   })));
   it("skips missing channel indices", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-    var _args$viewerChannelSe5;
-    var queryString, params, _yield$parseViewerUrl5, args, groups, channelSetting1, channelSetting2;
+    var _args$viewerChannelSe5, _channelSetting2$inte;
+    var queryString, _yield$parseViewerUrl5, args, groups, channelSetting1, channelSetting2;
     return _regeneratorRuntime().wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           queryString = "?c0=ven:1&c15=ven:1,lut:4:5";
-          params = new URLSearchParams(queryString);
-          _context5.next = 4;
-          return parseViewerUrlParams(params);
-        case 4:
+          _context5.next = 3;
+          return parseViewerUrlParams(queryString);
+        case 3:
           _yield$parseViewerUrl5 = _context5.sent;
           args = _yield$parseViewerUrl5.args;
           groups = (_args$viewerChannelSe5 = args.viewerChannelSettings) === null || _args$viewerChannelSe5 === void 0 ? void 0 : _args$viewerChannelSe5.groups[0];
@@ -820,8 +860,8 @@ describe("parseViewerUrlParams", function () {
           expect(channelSetting1.enabled).toEqual(true);
           expect(channelSetting2.match).toEqual(15);
           expect(channelSetting2.enabled).toEqual(true);
-          expect(channelSetting2.lut).toEqual(["4", "5"]);
-        case 15:
+          expect((_channelSetting2$inte = channelSetting2.intensity) === null || _channelSetting2$inte === void 0 ? void 0 : _channelSetting2$inte.lut).toEqual(["4", "5"]);
+        case 14:
         case "end":
           return _context5.stop();
       }
@@ -829,15 +869,14 @@ describe("parseViewerUrlParams", function () {
   })));
   it("creates empty default data for bad per-channel setting formats", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
     var _args$viewerChannelSe6;
-    var queryString, params, _yield$parseViewerUrl6, args, channelSettings, i, channelSetting;
+    var queryString, _yield$parseViewerUrl6, args, channelSettings, i, channelSetting;
     return _regeneratorRuntime().wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           queryString = "c1=bad&c0=ultrabad:bad&c2=,,,,,,";
-          params = new URLSearchParams(queryString);
-          _context6.next = 4;
-          return parseViewerUrlParams(params);
-        case 4:
+          _context6.next = 3;
+          return parseViewerUrlParams(queryString);
+        case 3:
           _yield$parseViewerUrl6 = _context6.sent;
           args = _yield$parseViewerUrl6.args;
           channelSettings = (_args$viewerChannelSe6 = args.viewerChannelSettings) === null || _args$viewerChannelSe6 === void 0 ? void 0 : _args$viewerChannelSe6.groups[0].channels;
@@ -848,7 +887,7 @@ describe("parseViewerUrlParams", function () {
               match: channelSetting.match
             }));
           }
-        case 9:
+        case 8:
         case "end":
           return _context6.stop();
       }
@@ -856,15 +895,14 @@ describe("parseViewerUrlParams", function () {
   })));
   it("enables first three channels by default if no channel settings are provided", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
     var _args$viewerChannelSe7;
-    var queryString, params, _yield$parseViewerUrl7, args, channelSettingsGroups, channelSettings;
+    var queryString, _yield$parseViewerUrl7, args, channelSettingsGroups, channelSettings;
     return _regeneratorRuntime().wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
           queryString = "url=https://example.com/image.tiff";
-          params = new URLSearchParams(queryString);
-          _context7.next = 4;
-          return parseViewerUrlParams(params);
-        case 4:
+          _context7.next = 3;
+          return parseViewerUrlParams(queryString);
+        case 3:
           _yield$parseViewerUrl7 = _context7.sent;
           args = _yield$parseViewerUrl7.args;
           // Should have one group
@@ -879,23 +917,22 @@ describe("parseViewerUrlParams", function () {
             match: "(.+)",
             enabled: false
           });
-        case 11:
+        case 10:
         case "end":
           return _context7.stop();
       }
     }, _callee7);
   })));
   it("parses default nucmorph settings", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-    var _args$viewerChannelSe8;
-    var queryString, params, _yield$parseViewerUrl8, args, viewerSettings, channelSettings;
+    var _args$viewerChannelSe8, _channelSettings$chan;
+    var queryString, _yield$parseViewerUrl8, args, viewerSettings, channelSettings;
     return _regeneratorRuntime().wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
           queryString = "url=https://example.com/image1.ome.zarr,https://example.com/image2.ome.zarr&c0=ven:0&c1=ven:1,lut:autoij:&c2=ven:1,clz:1&view=Z";
-          params = new URLSearchParams(queryString);
-          _context8.next = 4;
-          return parseViewerUrlParams(params);
-        case 4:
+          _context8.next = 3;
+          return parseViewerUrlParams(queryString);
+        case 3:
           _yield$parseViewerUrl8 = _context8.sent;
           args = _yield$parseViewerUrl8.args;
           viewerSettings = _yield$parseViewerUrl8.viewerSettings;
@@ -914,58 +951,149 @@ describe("parseViewerUrlParams", function () {
           expect(channelSettings.channels[0].enabled).toEqual(false);
           expect(channelSettings.channels[1].match).toEqual(1);
           expect(channelSettings.channels[1].enabled).toEqual(true);
-          expect(channelSettings.channels[1].lut).toEqual(["autoij", ""]);
+          expect((_channelSettings$chan = channelSettings.channels[1].intensity) === null || _channelSettings$chan === void 0 ? void 0 : _channelSettings$chan.lut).toEqual(["autoij", ""]);
           expect(channelSettings.channels[2].match).toEqual(2);
           expect(channelSettings.channels[2].enabled).toEqual(true);
           expect(channelSettings.channels[2].colorizeEnabled).toEqual(true);
-        case 21:
+        case 20:
         case "end":
           return _context8.stop();
       }
     }, _callee8);
   })));
-  it("parses viewer settings", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-    var queryString, params, _yield$parseViewerUrl9, viewerSettings;
+  it("can handle arbitrary levels of URL encoding", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+    var scenes, _allEncodingCombinations, encodings, _iterator3, _step3, encoding, _yield$parseViewerUrl9, args;
     return _regeneratorRuntime().wrap(function _callee9$(_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
-          queryString = "mask=30&view=X";
-          params = new URLSearchParams(queryString);
-          _context9.next = 4;
-          return parseViewerUrlParams(params);
-        case 4:
+          // GOAL: no matter how, where, or how many times URL encoding is applied when concatenating
+          // these scene URLs into one param, they should decode back to the same URLs.
+          scenes = [["https://example.com/image1.ome.zarr"], ["https://example.com/image2.ome.zarr", "https://example.com/image3.ome.zarr?foo=1%2C2%2C3"]]; // Recursively generate combinations of encoded and unencoded URLs
+          _allEncodingCombinations = function allEncodingCombinations(urls, delims) {
+            // BASE CASE: generate an unencoded and encoded variant of a single URL
+            if (typeof urls === "string") {
+              return [urls, encodeURIComponent(urls)];
+            }
+
+            // Recursively generate combinations for all array elements
+            var nextDelims = delims.slice(1);
+            var encoded = urls.map(function (url) {
+              return _allEncodingCombinations(url, nextDelims);
+            });
+
+            // Concatenate those together in all possible combinations
+            var combined = encoded.reduce(function (accum, next) {
+              var result = [];
+              var _iterator = _createForOfIteratorHelper(accum),
+                _step;
+              try {
+                for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                  var a = _step.value;
+                  var _iterator2 = _createForOfIteratorHelper(next),
+                    _step2;
+                  try {
+                    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                      var n = _step2.value;
+                      result.push(a + delims[0] + n);
+                    }
+                  } catch (err) {
+                    _iterator2.e(err);
+                  } finally {
+                    _iterator2.f();
+                  }
+                }
+              } catch (err) {
+                _iterator.e(err);
+              } finally {
+                _iterator.f();
+              }
+              return result;
+            });
+
+            // Generate unencoded, encoded, and double-encoded variants of all those concatenated strings
+            return combined.flatMap(function (url) {
+              var encodedOnce = encodeURIComponent(url);
+              return [url, encodedOnce, encodeURIComponent(encodedOnce)];
+            });
+          };
+          encodings = _allEncodingCombinations(scenes, ["+", ","]);
+          _iterator3 = _createForOfIteratorHelper(encodings);
+          _context9.prev = 4;
+          _iterator3.s();
+        case 6:
+          if ((_step3 = _iterator3.n()).done) {
+            _context9.next = 15;
+            break;
+          }
+          encoding = _step3.value;
+          _context9.next = 10;
+          return parseViewerUrlParams("url=".concat(encoding));
+        case 10:
           _yield$parseViewerUrl9 = _context9.sent;
-          viewerSettings = _yield$parseViewerUrl9.viewerSettings;
-          expect(viewerSettings.viewMode).toEqual(ViewMode.yz);
-          expect(viewerSettings.maskAlpha).toEqual(30);
-        case 8:
+          args = _yield$parseViewerUrl9.args;
+          expect(args.imageUrl).toEqual({
+            scenes: scenes
+          });
+        case 13:
+          _context9.next = 6;
+          break;
+        case 15:
+          _context9.next = 20;
+          break;
+        case 17:
+          _context9.prev = 17;
+          _context9.t0 = _context9["catch"](4);
+          _iterator3.e(_context9.t0);
+        case 20:
+          _context9.prev = 20;
+          _iterator3.f();
+          return _context9.finish(20);
+        case 23:
         case "end":
           return _context9.stop();
       }
-    }, _callee9);
+    }, _callee9, null, [[4, 17, 20, 23]]);
   })));
-  it("returns an empty object when no params are passed in", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-    var queryString, params, _yield$parseViewerUrl10, args, viewerSettings;
+  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) {
         case 0:
-          queryString = "";
-          params = new URLSearchParams(queryString);
-          _context10.next = 4;
-          return parseViewerUrlParams(params);
-        case 4:
+          queryString = "mask=30&view=X";
+          _context10.next = 3;
+          return parseViewerUrlParams(queryString);
+        case 3:
           _yield$parseViewerUrl10 = _context10.sent;
-          args = _yield$parseViewerUrl10.args;
           viewerSettings = _yield$parseViewerUrl10.viewerSettings;
+          expect(viewerSettings.viewMode).toEqual(ViewMode.yz);
+          expect(viewerSettings.maskAlpha).toEqual(30);
+        case 7:
+        case "end":
+          return _context10.stop();
+      }
+    }, _callee10);
+  })));
+  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) {
+        case 0:
+          queryString = "";
+          _context11.next = 3;
+          return parseViewerUrlParams(queryString);
+        case 3:
+          _yield$parseViewerUrl11 = _context11.sent;
+          args = _yield$parseViewerUrl11.args;
+          viewerSettings = _yield$parseViewerUrl11.viewerSettings;
           expect(Object.keys(args).length === 0);
           expect(args).toEqual({});
           expect(Object.keys(viewerSettings).length === 0);
           expect(viewerSettings).toEqual({});
-        case 11:
+        case 10:
         case "end":
-          return _context10.stop();
+          return _context11.stop();
       }
-    }, _callee10);
+    }, _callee11);
   })));
 });
 describe("serializeViewerUrlParams", function () {
@@ -992,7 +1120,8 @@ describe("serializeViewerUrlParams", function () {
       }],
       ramp: [-10, 260.1],
       plotMin: 0,
-      plotMax: 255
+      plotMax: 255,
+      keepIntensityRange: true
     }, {
       name: "channel1",
       displayName: "channel1",
@@ -1027,7 +1156,8 @@ describe("serializeViewerUrlParams", function () {
       }],
       ramp: [50, 140],
       plotMin: 0,
-      plotMax: 255
+      plotMax: 255,
+      keepIntensityRange: false
     }];
     var serialized = serializeViewerUrlParams({
       channelSettings: channelStates
@@ -1043,9 +1173,10 @@ describe("serializeViewerUrlParams", function () {
       isa: "0.75",
       sen: "1",
       isv: "128",
-      rmp: "-10:260.1",
-      cps: "0:0:808080:1:1:ff0000",
-      cpe: "0"
+      ram: "-10:260.1",
+      cpt: "0:0:808080:1:1:ff0000",
+      cpe: "0",
+      pin: "1"
     };
     var expectedChannel1 = {
       ven: "0",
@@ -1055,9 +1186,10 @@ describe("serializeViewerUrlParams", function () {
       isa: "0",
       sen: "0",
       isv: "57",
-      rmp: "50:140",
-      cps: "-10:0:000000:50:0:000000:100:0.3:0010ff:140:0.8:00ffff:260:1:00ffb4",
-      cpe: "1"
+      ram: "50:140",
+      cpt: "-10:0:000000:50:0:000000:100:0.3:0010ff:140:0.8:00ffff:260:1:00ffb4",
+      cpe: "1",
+      pin: "0"
     };
     expect(serialized["c0"]).toBeDefined();
     expect(parseKeyValueList(serialized["c0"])).toEqual(expectedChannel0);