From 1d7cae4c6ccaed4ab151db5191e1574034529a9f Mon Sep 17 00:00:00 2001 From: meganrm Date: Mon, 4 Dec 2023 12:21:35 -0800 Subject: [PATCH 1/2] fix imports to be from the top level --- src/components/DownloadTrajectoryMenu/index.tsx | 2 +- src/containers/ViewerPanel/index.tsx | 4 ++-- src/state/selection/selectors/index.ts | 5 +---- src/state/simularium/actions.ts | 2 +- src/state/simularium/types.ts | 2 +- src/state/trajectory/actions.ts | 3 ++- src/state/trajectory/types.ts | 5 +---- src/state/viewer/logics.ts | 2 +- 8 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/components/DownloadTrajectoryMenu/index.tsx b/src/components/DownloadTrajectoryMenu/index.tsx index 1ff696a02..7c80761a2 100644 --- a/src/components/DownloadTrajectoryMenu/index.tsx +++ b/src/components/DownloadTrajectoryMenu/index.tsx @@ -1,6 +1,6 @@ import React from "react"; import { Button, Tooltip } from "antd"; -import { ISimulariumFile } from "@aics/simularium-viewer/type-declarations"; +import { ISimulariumFile } from "@aics/simularium-viewer"; import { DATA_BUCKET_URL, TOOLTIP_COLOR } from "../../constants"; import { NetworkedSimFile, LocalSimFile } from "../../state/trajectory/types"; diff --git a/src/containers/ViewerPanel/index.tsx b/src/containers/ViewerPanel/index.tsx index 1996855cf..18fd43b39 100644 --- a/src/containers/ViewerPanel/index.tsx +++ b/src/containers/ViewerPanel/index.tsx @@ -6,10 +6,10 @@ import SimulariumViewer, { SelectionStateInfo, compareTimes, ErrorLevel, + TrajectoryFileInfo, + TimeData, } from "@aics/simularium-viewer"; import "@aics/simularium-viewer/style/style.css"; -import { TrajectoryFileInfo } from "@aics/simularium-viewer/type-declarations/simularium"; -import { TimeData } from "@aics/simularium-viewer/type-declarations/viewport"; import { connect } from "react-redux"; import { Modal } from "antd"; import Bowser from "bowser"; diff --git a/src/state/selection/selectors/index.ts b/src/state/selection/selectors/index.ts index e0fb73d15..9986768af 100644 --- a/src/state/selection/selectors/index.ts +++ b/src/state/selection/selectors/index.ts @@ -1,9 +1,6 @@ import { createSelector } from "reselect"; import { reduce } from "lodash"; -import { - SelectionEntry, - UIDisplayData, -} from "@aics/simularium-viewer/type-declarations"; +import { SelectionEntry, UIDisplayData } from "@aics/simularium-viewer"; import { getAgentDisplayNamesAndStates } from "../../trajectory/selectors"; import { VisibilitySelectionMap } from "../types"; diff --git a/src/state/simularium/actions.ts b/src/state/simularium/actions.ts index e8b12a393..4007c71ab 100644 --- a/src/state/simularium/actions.ts +++ b/src/state/simularium/actions.ts @@ -1,4 +1,4 @@ -import { SimulariumController } from "@aics/simularium-viewer/type-declarations"; +import { SimulariumController } from "@aics/simularium-viewer"; import { SET_SIMULARIUM_CONTROLLER } from "./constants"; import { SetSimulariumControllerAction } from "./types"; diff --git a/src/state/simularium/types.ts b/src/state/simularium/types.ts index f769e1249..f82550ec1 100644 --- a/src/state/simularium/types.ts +++ b/src/state/simularium/types.ts @@ -1,4 +1,4 @@ -import { SimulariumController } from "@aics/simularium-viewer/type-declarations"; +import { SimulariumController } from "@aics/simularium-viewer"; export interface SimulariumStateBranch { [key: string]: any; diff --git a/src/state/trajectory/actions.ts b/src/state/trajectory/actions.ts index 08ae2ede3..e25883c00 100644 --- a/src/state/trajectory/actions.ts +++ b/src/state/trajectory/actions.ts @@ -1,3 +1,5 @@ +import { SimulariumController } from "@aics/simularium-viewer"; + import { RECEIVE_TRAJECTORY, REQUEST_TRAJECTORY, @@ -24,7 +26,6 @@ import { LoadViaUrlAction, SetUrlParamsAction, } from "./types"; -import { SimulariumController } from "@aics/simularium-viewer/type-declarations"; export function receiveTrajectory( payload: TrajectoryStateBranch diff --git a/src/state/trajectory/types.ts b/src/state/trajectory/types.ts index f0238d050..0d7d76232 100644 --- a/src/state/trajectory/types.ts +++ b/src/state/trajectory/types.ts @@ -1,7 +1,4 @@ -import { - ISimulariumFile, - SimulariumController, -} from "@aics/simularium-viewer/type-declarations"; +import { ISimulariumFile, SimulariumController } from "@aics/simularium-viewer"; export interface TrajectoryStateBranch { [key: string]: any; diff --git a/src/state/viewer/logics.ts b/src/state/viewer/logics.ts index 1f0355920..fe454e8d7 100644 --- a/src/state/viewer/logics.ts +++ b/src/state/viewer/logics.ts @@ -1,4 +1,4 @@ -import { SimulariumController } from "@aics/simularium-viewer/type-declarations"; +import { SimulariumController } from "@aics/simularium-viewer"; import { createLogic } from "redux-logic"; import { getSimulariumController } from "../simularium/selectors"; From a25a80a8d4c6ab321fe43ad9537c2acea31c60eb Mon Sep 17 00:00:00 2001 From: meganrm Date: Fri, 8 Dec 2023 16:26:00 -0800 Subject: [PATCH 2/2] update viewer --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index d16ac3eca..501245932 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.10.0", "license": "ISC", "dependencies": { - "@aics/simularium-viewer": "^3.6.3", + "@aics/simularium-viewer": "^3.6.4", "@ant-design/css-animation": "^1.7.3", "@ant-design/icons": "^4.0.6", "antd": "^4.23.6", @@ -113,9 +113,9 @@ "dev": true }, "node_modules/@aics/simularium-viewer": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/@aics/simularium-viewer/-/simularium-viewer-3.6.3.tgz", - "integrity": "sha512-8g/DQqEip5MatFJE65jx+hQuKuesrKkpGu112ioEwPDn5TaqxbkGu2w1mhLNIquXUP7B72+UoEozAzcUmSFncA==", + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/@aics/simularium-viewer/-/simularium-viewer-3.6.4.tgz", + "integrity": "sha512-9M05LbYBqkiSZCn+0TWuUYwnAbkglfWKmRWcq2JE+c2gN9vBbaeBvLoJJSCHZKtQMgxr05CtjoIngGihL6zolg==", "dependencies": { "@fortawesome/fontawesome-free": "^5.15.2", "@fortawesome/fontawesome-svg-core": "~1.2.34", diff --git a/package.json b/package.json index f2de7aeea..dc8ec6a37 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "webpack-dev-server": "^4.10.1" }, "dependencies": { - "@aics/simularium-viewer": "^3.6.3", + "@aics/simularium-viewer": "^3.6.4", "@ant-design/css-animation": "^1.7.3", "@ant-design/icons": "^4.0.6", "antd": "^4.23.6",