Skip to content

Commit 8febe85

Browse files
committed
update: cleanup
1 parent 916c985 commit 8febe85

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

.github/workflows/cicd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Docker build and test
3939
uses: ./.github/workflows/docker-build-test
4040
with:
41-
run-test-environment: ${{ github.ref_name != 'main' && 'USE_JUPYTERLITE_DEV_URL=true NPM_RUN_COMMAND=test:healthcheck' || '' }}
41+
run-test-environment: ${{ github.ref_name != 'main' && 'NPM_RUN_COMMAND=test:healthcheck' || '' }}
4242

4343
- name: Validate app dockerfile
4444
uses: ./actions/docker/validate

dist/components/include/jupyterlite/BaseJupyterLiteComponent.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import JupyterLiteSession from "@exabyte-io/cove.js/dist/other/jupyterlite/Jupyt
44
import { Action } from "@mat3ra/esse/dist/js/types";
55
import React from "react";
66
import { MDMaterial } from "../../../MDMaterial";
7-
import { ORIGIN_URL } from "../../../settings";
7+
import { JUPYTERLITE_ORIGIN_URL } from "../../../settings";
88
class BaseJupyterLiteSessionComponent extends React.Component {
99
constructor() {
1010
super(...arguments);
@@ -72,7 +72,7 @@ class BaseJupyterLiteSessionComponent extends React.Component {
7272
}
7373
}
7474
render() {
75-
return (_jsx(JupyterLiteSession, { originURL: ORIGIN_URL, defaultNotebookPath: this.DEFAULT_NOTEBOOK_PATH, messageHandlerConfigs: this.messageHandlerConfigs, ref: this.jupyterLiteSessionRef }));
75+
return (_jsx(JupyterLiteSession, { originURL: JUPYTERLITE_ORIGIN_URL, defaultNotebookPath: this.DEFAULT_NOTEBOOK_PATH, messageHandlerConfigs: this.messageHandlerConfigs, ref: this.jupyterLiteSessionRef }));
7676
}
7777
}
7878
export default BaseJupyterLiteSessionComponent;

dist/settings.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export const theme: import("@mui/material").Theme;
2-
export const ORIGIN_URL: "https://deploy-preview-56--mat3ra-jupyterlite.netlify.app" | undefined;
2+
export const JUPYTERLITE_ORIGIN_URL: "https://deploy-preview-56--mat3ra-jupyterlite.netlify.app" | undefined;

dist/settings.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { DarkMaterialUITheme } from "@exabyte-io/cove.js/dist/theme";
22
export const theme = DarkMaterialUITheme;
3-
// get from https://github.com/Exabyte-io/jupyterlite/pull/N
3+
// get the number for PR N from https://github.com/Exabyte-io/jupyterlite/pull/N
44
const JUPYTERLITE_DEVELOPMENT_URL = "https://deploy-preview-56--mat3ra-jupyterlite.netlify.app";
5-
export const ORIGIN_URL = import.meta.env.VITE_USE_JUPYTERLITE_DEV_URL
5+
export const JUPYTERLITE_ORIGIN_URL = import.meta.env.VITE_USE_JUPYTERLITE_DEV_URL
66
? JUPYTERLITE_DEVELOPMENT_URL
7-
: undefined;
7+
: undefined; // if not set, will use the default URL

src/components/include/jupyterlite/BaseJupyterLiteComponent.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { Action, MaterialSchema } from "@mat3ra/esse/dist/js/types";
66
import React from "react";
77

88
import { MDMaterial } from "../../../MDMaterial";
9-
import { ORIGIN_URL } from "../../../settings";
9+
import { JUPYTERLITE_ORIGIN_URL } from "../../../settings";
1010

1111
export interface BaseJupyterLiteProps {
1212
// eslint-disable-next-line react/no-unused-prop-types
@@ -98,7 +98,7 @@ class BaseJupyterLiteSessionComponent<P = never, S = never> extends React.Compon
9898
render() {
9999
return (
100100
<JupyterLiteSession
101-
originURL={ORIGIN_URL}
101+
originURL={JUPYTERLITE_ORIGIN_URL}
102102
defaultNotebookPath={this.DEFAULT_NOTEBOOK_PATH}
103103
messageHandlerConfigs={this.messageHandlerConfigs}
104104
ref={this.jupyterLiteSessionRef}

src/settings.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import { DarkMaterialUITheme } from "@exabyte-io/cove.js/dist/theme";
22

33
export const theme = DarkMaterialUITheme;
44

5-
// get from https://github.com/Exabyte-io/jupyterlite/pull/N
5+
// get the number for PR N from https://github.com/Exabyte-io/jupyterlite/pull/N
66
const JUPYTERLITE_DEVELOPMENT_URL = "https://deploy-preview-56--mat3ra-jupyterlite.netlify.app";
7-
8-
export const ORIGIN_URL = import.meta.env.VITE_USE_JUPYTERLITE_DEV_URL
7+
export const JUPYTERLITE_ORIGIN_URL = import.meta.env.VITE_USE_JUPYTERLITE_DEV_URL
98
? JUPYTERLITE_DEVELOPMENT_URL
10-
: undefined;
9+
: undefined; // if not set, will use the default URL

0 commit comments

Comments
 (0)