Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DRAFT: revert octopus changes and point to simularium-engine, if octopus launch fails #523

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

DRAFT: revert octopus changes and point to simularium-engine, if octopus launch fails #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/components/LoadFileMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
setIsModalVisible(true);
};

const openConversionForm = () => {

Check warning on line 59 in src/components/LoadFileMenu/index.tsx

View workflow job for this annotation

GitHub Actions / Lint 

'openConversionForm' is assigned a value but never used
setConversionStatus({ status: ConversionStatus.NoServer });
};

Expand Down Expand Up @@ -99,17 +99,6 @@
</Button>
),
},
{
key: "file-convert",
label: (
<Link
onClick={openConversionForm}
to={{ pathname: VIEWER_PATHNAME }}
>
Import other file type
</Link>
),
},
];

const isDisabled =
Expand Down
5 changes: 0 additions & 5 deletions src/containers/AppHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import styles from "./style.css";
import ShareTrajectoryButton from "../../components/ShareTrajectoryButton";
import DownloadTrajectoryMenu from "../../components/DownloadTrajectoryMenu";

Check warning on line 31 in src/containers/AppHeader/index.tsx

View workflow job for this annotation

GitHub Actions / Lint 

'DownloadTrajectoryMenu' is defined but never used
import NavButton from "../../components/NavButton";

interface AppHeaderProps {
Expand All @@ -52,7 +52,7 @@
setViewerStatus,
clearSimulariumFile,
setError,
isNetworkedFile,

Check warning on line 55 in src/containers/AppHeader/index.tsx

View workflow job for this annotation

GitHub Actions / Lint 

'isNetworkedFile' is defined but never used
conversionStatus,
setConversionStatus,
}) => {
Expand Down Expand Up @@ -104,11 +104,6 @@
setConversionStatus={setConversionStatus}
/>
<HelpMenu key="help" />
<DownloadTrajectoryMenu
isBuffering={isBuffering}
simulariumFile={simulariumFile}
isNetworkedFile={isNetworkedFile}
/>
<ShareTrajectoryButton
simulariumFile={simulariumFile}
isBuffering={isBuffering}
Expand Down
4 changes: 1 addition & 3 deletions src/state/trajectory/logics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ import {

const netConnectionSettings: NetConnectionParams = {
serverIp: process.env.BACKEND_SERVER_IP,
serverPort: 443,
useOctopus: true,
secureConnection: true,
serverPort: 9002,
};

const resetSimulariumFileState = createLogic({
Expand Down
6 changes: 3 additions & 3 deletions webpack/plugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,18 @@ const BUNDLE_ANALYZER = [
const PLUGINS_BY_ENV = {
[Env.PRODUCTION]: [
new webpack.EnvironmentPlugin({
BACKEND_SERVER_IP: `production-simularium-ecs.allencell.org`,
BACKEND_SERVER_IP: `production-node1-agentviz-backend.cellexplore.net`,
}),
],
[Env.STAGE]: [
new webpack.EnvironmentPlugin({
BACKEND_SERVER_IP: `staging-simularium-ecs.allencell.org`,
BACKEND_SERVER_IP: `staging-node1-agentviz-backend.cellexplore.net`,
}),
],
[Env.DEVELOPMENT]: [
new webpack.EnvironmentPlugin({
// FIXME: make a dev server
BACKEND_SERVER_IP: `staging-simularium-ecs.allencell.org`,
BACKEND_SERVER_IP: `staging-node1-agentviz-backend.cellexplore.net`,
}),
],
};
Expand Down
Loading