@aics/vole-app 2.13.5 → 2.13.7

package/es/aics-image-viewer/components/App/index.js

@@ -72,7 +72,8 @@ var defaultProps = {
   parentImageDownloadHref: "",
   pixelSize: undefined,
   canvasMargin: "0 0 0 0",
-  view3dRef: undefined
+  view3dRef: undefined,
+  showError: undefined
 };
 var CLIPPING_PANEL_ANIMATION_DURATION_MS = 300;
 var setIndicatorPositions = function setIndicatorPositions(view3d, panelOpen, hasTime, hasScenes, isMode3d) {
@@ -104,7 +105,7 @@ var setIndicatorPositions = function setIndicatorPositions(view3d, panelOpen, ha
   view3d.setScaleBarPosition(scaleBarX, scaleBarY);
 };
 var App = function App(props) {
-  var _getCurrentViewerChan, _scenes$length, _scenes2, _image$imageInfo$volu, _image$imageInfo$subr, _image$imageInfo$time, _props$transform2, _props$transform4;
+  var _props$showError, _getCurrentViewerChan, _scenes$length, _scenes2, _image$imageInfo$volu, _image$imageInfo$subr, _image$imageInfo$time, _props$transform2, _props$transform4;
   props = _objectSpread(_objectSpread({}, defaultProps), props);
 
   // State management /////////////////////////////////////////////////////////
@@ -134,10 +135,14 @@ var App = function App(props) {
   if (props.view3dRef !== undefined) {
     props.view3dRef.current = view3d;
   }
+
+  // Allows AppWrapper to pass in its own `useErrorAlert` callbacks, but still keeps error
+  // messaging when App is used standalone.
   var _useErrorAlert = useErrorAlert(),
     _useErrorAlert2 = _slicedToArray(_useErrorAlert, 2),
     errorAlert = _useErrorAlert2[0],
-    showError = _useErrorAlert2[1];
+    _showError = _useErrorAlert2[1];
+  var showError = (_props$showError = props.showError) !== null && _props$showError !== void 0 ? _props$showError : _showError;
   useEffect(function () {
     // Get notifications of loading errors which occur after the initial load, e.g. on time change or new channel load
     view3d.setLoadErrorHandler(function (_vol, e) {

package/es/aics-image-viewer/components/ErrorAlert/index.js

@@ -37,7 +37,7 @@ var ERROR_TYPE_DESCRIPTIONS = _defineProperty(_defineProperty(_defineProperty(_d
 }, "start a bug report here"), ".")), VolumeLoadErrorType.INVALID_METADATA, /*#__PURE__*/React.createElement(React.Fragment, null, "The viewer was unable to read all necessary information from this volume's metadata. Check that your dataset's metadata is complete and properly formatted. If you believe your data is valid and should be supported by our viewer, let us know by ", /*#__PURE__*/React.createElement(IssueLink, null, "opening a GitHub issue"), ".")), VolumeLoadErrorType.INVALID_MULTI_SOURCE_ZARR, /*#__PURE__*/React.createElement(React.Fragment, null, "The viewer is currently configured to consolidate multiple OME-Zarr datasets into a single volume, but the provided datasets can't all be matched up. Ensure that all dataset URLs are correct and that at least one equivalently-sized scale level exists in all datasets."));
 var getErrorTitle = function getErrorTitle(error) {
   var _error$toString;
-  return error instanceof Error && ((_error$toString = error.toString) === null || _error$toString === void 0 ? void 0 : _error$toString.call(error)) || "Unknown error";
+  return error instanceof Error && ((_error$toString = error.toString) === null || _error$toString === void 0 ? void 0 : _error$toString.call(error)) || typeof error === "string" && error || "Unknown error";
 };
 var getErrorDescription = function getErrorDescription(error) {
   var _ERROR_TYPE_DESCRIPTI2;

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

@@ -77,6 +77,11 @@ function parseLutValue(value, histogram) {
  * ```
  */
 export function parseLutFromSettings(histogram, initSettings) {
+  // TODO: Consider minimizing the types/classes this function is interacting
+  // with, since it is only using `initSettings.lut` and the returned Lut is a
+  // wrapper around the control point array, e.g.
+  // `parseControlPointsFromLutParam(histogram: Histogram, lutParam: [string,
+  // string] | undefined): ControlPoint[] | undefined`
   if (initSettings.lut === undefined || initSettings.lut.length !== 2) {
     return undefined;
   }
@@ -86,7 +91,22 @@ export function parseLutFromSettings(histogram, initSettings) {
   } else {
     lutValues = [parseLutValue(initSettings.lut[0], histogram), parseLutValue(initSettings.lut[1], histogram)];
   }
-  return new Lut().createFromMinMax(Math.min(lutValues[0], lutValues[1]), Math.max(lutValues[0], lutValues[1]));
+  if (!Number.isFinite(lutValues[0]) || !Number.isFinite(lutValues[1])) {
+    return undefined;
+  }
+  var sortedLutValues = [Math.min(lutValues[0], lutValues[1]), Math.max(lutValues[0], lutValues[1])];
+  var controlPoints = [{
+    x: sortedLutValues[0],
+    opacity: 0,
+    color: TFEDITOR_DEFAULT_COLOR
+  }, {
+    x: sortedLutValues[1],
+    opacity: 1,
+    color: TFEDITOR_DEFAULT_COLOR
+  }];
+  // Create directly from control points instead of using
+  // `Lut.createFromMinMax()` because it applies clamping to the [0, 255] range.
+  return new Lut().createFromControlPoints(controlPoints);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aics/vole-app",
-  "version": "2.13.5",
+  "version": "2.13.7",
   "description": "web view of cell volume images",
   "repository": "github:allen-cell-animated/vole-app",
   "main": "es/index.js",

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

@@ -41,5 +41,6 @@ export interface AppProps {
     view3dRef?: MutableRefObject<View3d | null>;
     metadataFormatter?: (metadata: MetadataRecord) => MetadataRecord;
     onControlPanelToggle?: (collapsed: boolean) => void;
+    showError?: (error: any) => void;
 }
 export {};

package/type-declarations/aics-image-viewer/shared/types.d.ts

@@ -13,3 +13,7 @@ export type MetadataEntry = string | number | boolean | MetadataRecord | Metadat
 export type MetadataRecord = {
     [key: string]: MetadataEntry;
 };
+export type ManifestJson = {
+    scenes?: string | (string | string[])[];
+    meta?: MetadataRecord[];
+};