Skip to content

Commit 53f2cd6

Browse files
echarlesecharles
authored
Breaking change: context props renaming fixes #260 (#261)
* breaking change: context props renaming fixes #260 * fix: jupyterServerToken * lint
1 parent 9d9c45f commit 53f2cd6

File tree

48 files changed

+154
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+154
-238
lines changed

‎attic/prosemirror/public/index.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
<title>Jupyter ProseMirror</title>
1111
<script id="datalayer-config-data" type="application/json">
1212
{
13-
"jupyterServerHttpUrl": "https://oss.datalayer.run/api/jupyter-server",
14-
"jupyterServerWsUrl": "wss://oss.datalayer.run/api/jupyter-server",
15-
"jupyterToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
13+
"jupyterServerUrl": "https://oss.datalayer.run/api/jupyter-server",
14+
"jupyterServerToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
1615
}
1716
</script>
1817
<link rel="shortcut icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAC7SURBVFiF7ZU9CgIxEIXfTHbPopfYc+pJ9AALtmJnZSOIoJWFoCTzLHazxh/Ebpt5EPIxM8XXTCKTxYyMCYwJFhOYCo4JFiMuu317PZwaqEBUIar4YMmskL73DytGjgu4gAt4PDJdzkkzMBloBhqBgcu69XW+1I+rNSQESNDuaMEhdP/Fj/7oW+ACLuACHk/3F5BAfuMLBjm8/ZnxNvNtHmY4b7Ztut0bqStoVSHfWj9Z6mr8LXABF3CBB3nvkDfEVN6PAAAAAElFTkSuQmCC" type="image/x-icon" />

‎attic/prosemirror/src/raw/nodes/cell/CellView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class CellView implements NodeView {
2525
startDefaultKernel: true,
2626
defaultKernelName: "python",
2727
});
28-
const serverSettings = createServerSettings(config.jupyterServerHttpUrl, config.jupyterServerWsUrl);
28+
const serverSettings = createServerSettings(config.jupyterServerUrl);
2929
const widget = new CellAdapter({
3030
source: "print('hello')",
3131
serverSettings,

‎attic/prosemirror/src/raw/nodes/output/OutputView.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ class OutputView implements NodeView {
2727
defaultKernelName: "python",
2828
});
2929
const serverSettings = createServerSettings(
30-
config.jupyterServerHttpUrl,
31-
config.jupyterServerWsUrl,
30+
config.jupyterServerUrl,
3231
);
3332
const kernelManager = new KernelManager({
3433
serverSettings,

‎docs/docs/components/cell/index.mdx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ This component displays a Jupyter Cell.
1616

1717
```jsx
1818
<Jupyter
19-
jupyterServerHttpUrl="https://oss.datalayer.run/api/jupyter-server"
20-
jupyterServerWsUrl="wss://oss.datalayer.run/api/jupyter-server"
21-
jupyterToken="60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
19+
jupyterServerUrl="https://oss.datalayer.run/api/jupyter-server"
20+
jupyterServerToken="60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
2221
>
2322
<Cell />
2423
</Jupyter>

‎docs/docs/components/console/index.mdx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,16 @@ This component displays a Jupyter Console.
1616

1717
```jsx
1818
<Jupyter
19-
jupyterServerHttpUrl="https://oss.datalayer.run/api/jupyter-server"
20-
jupyterServerWsUrl="wss://oss.datalayer.run/api/jupyter-server"
21-
jupyterToken="60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
19+
jupyterServerUrl="https://oss.datalayer.run/api/jupyter-server"
20+
jupyterServerToken="60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
2221
>
2322
<Console />
2423
</Jupyter>
2524
```
2625

2726
You can set the following props to connect it to a running Jupyter Server:
28-
- `jupyterServerHttpUrl`: The server URL
29-
- `jupyterServerWsUrl`: The server websocket URL
30-
- `jupyterToken`: The server authentication token
27+
- `jupyterServerUrl`: The server URL
28+
- `jupyterServerToken`: The server authentication token
3129

3230
> Your server will likely need to accept connection from external client.
3331

‎docs/docs/components/context/index.mdx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,8 @@ The Jupyter Context has the following properties.
3131
- `collaborative`
3232
- `defaultKernelName`
3333
- `injectableStore`: Read more about the [State](/docs/state)
34-
- `jupyterServerHttpUrl` - Read also [Deployment](/docs/deployments/jupyter-server)
35-
- `jupyterServerWsUrl` - Read also [Deployment](/docs/deployments/jupyter-server)
36-
- `jupyterToken` - Read also [Deployment](/docs/deployments/jupyter-server)
34+
- `jupyterServerUrl` - Read also [Deployment](/docs/deployments/jupyter-server)
35+
- `jupyterServerToken` - Read also [Deployment](/docs/deployments/jupyter-server)
3736
- `lite`
3837
- `loadJupyterCss`
3938
- `startDefaultKernel`

‎docs/docs/components/notebook/index.mdx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,16 @@ The available properties for the Notebook component are available on this [TypeD
5151

5252
```jsx
5353
<Jupyter
54-
jupyterServerHttpUrl="https://oss.datalayer.run/api/jupyter-server"
55-
jupyterServerWsUrl="wss://oss.datalayer.run/api/jupyter-server"
56-
jupyterToken="60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
54+
jupyterServerUrl="https://oss.datalayer.run/api/jupyter-server"
55+
jupyterServerToken="60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
5756
>
5857
<Notebook />
5958
</Jupyter>
6059
```
6160

6261
You can set the following props to connect it to a running Jupyter Server:
63-
- `jupyterServerHttpUrl`: The server URL
64-
- `jupyterServerWsUrl`: The server websocket URL
65-
- `jupyterToken`: The server authentication token
62+
- `jupyterServerUrl`: The server URL
63+
- `jupyterServerToken`: The server authentication token
6664

6765
> Your server will likely need to accept connection from external client.
6866

‎docs/docs/demos/cell/index.mdx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ Type your code in the below cell and hit `SHIFT+ENTER` to execute your code.
1515
:::
1616

1717
<JupyterCell
18-
serverHttpUrl='https://oss.datalayer.run/api/jupyter-server'
19-
serverWsUrl='wss://oss.datalayer.run/api/jupyter-server'
20-
token='60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6'
18+
jupyterServerUrl='https://oss.datalayer.run/api/jupyter-server'
19+
jupyterServerToken='60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6'
2120
source= {`import numpy as np
2221
import matplotlib.pyplot as plt
2322
x1 = np.linspace(0.0, 5.0)

‎docs/docs/deployments/jupyter-server/index.mdx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ Those properties can be provided in the [Jupyter Context](/docs/components/conte
1010
<head>
1111
<script id="datalayer-config-data" type="application/json">
1212
{
13-
"jupyterServerHttpUrl": "http://localhost:8686/api/jupyter-server",
14-
"jupyterServerWsUrl": "ws://localhost:8686/api/jupyter-server",
15-
"jupyterToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
13+
"jupyterServerUrl": "http://localhost:8686/api/jupyter-server",
14+
"jupyterServerToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
1615
}
1716
</script>
1817
</head>
@@ -23,9 +22,8 @@ The values defined in the host HTML are taking precedence on the values set in t
2322

2423
```ts
2524
<Jupyter
26-
"jupyterServerHttpUrl": "http://localhost:8686/api/jupyter-server"
27-
"jupyterServerWsUrl": "ws://localhost:8686/api/jupyter-server"
28-
"jupyterToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
25+
"jupyterServerUrl": "http://localhost:8686/api/jupyter-server"
26+
"jupyterServerToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
2927
>
3028
<Notebook/>
3129
</Jupyter>

‎docs/docs/develop/develop/index.mdx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ Additionally, you can to define in the head section your host index HTML page in
6464
```html
6565
<script id="datalayer-config-data" type="application/json">
6666
{
67-
"jupyterServerHttpUrl": "https://oss.datalayer.run/api/jupyter-server",
68-
"jupyterServerWsUrl": "wss://oss.datalayer.run/api/jupyter-server",
69-
"jupyterToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
67+
"jupyterServerUrl": "https://oss.datalayer.run/api/jupyter-server",
68+
"jupyterServerToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
7069
}
7170
</script>
7271
```

0 commit comments

Comments
 (0)