Merge pull request #15 from datalayer/config/run

Rename api_server_url to run_url

datalayer/handlers.py

@@ -41,7 +41,7 @@ def get(self):
                 "extension": "datalayer",
                 "version": __version__,
                 "settings": dict(
-                    api_server_url=settings.api_server_url,
+                    run_url=settings.run_url,
                     launcher={
                         "category": settings.launcher.category,
                         "name": settings.launcher.name,

datalayer/serverapplication.py

@@ -31,10 +31,10 @@ class DatalayerExtensionApp(ExtensionAppJinjaMixin, ExtensionApp):
     static_paths = [DEFAULT_STATIC_FILES_PATH]
     template_paths = [DEFAULT_TEMPLATE_FILES_PATH]
 
-    api_server_url = Unicode(
+    run_url = Unicode(
         "https://oss.datalayer.run",
         config=True,
-        help="""Hostname to connect to the Datalayer APIs.""",
+        help="""URL to connect to the Datalayer RUN APIs.""",
     )
 
     white_label = Bool(False, config=True, help="""Display white label content.""")
@@ -75,7 +75,7 @@ def _default_launcher(self):
 
     def initialize_settings(self):
         settings = dict(
-            api_server_url=self.api_server_url,
+            run_url=self.run_url,
             launcher={
                 "category": self.launcher.category,
                 "name": self.launcher.name,

datalayer/templates/index.html

@@ -5,9 +5,8 @@
     <title>Ξ Datalayer</title>
     <script id="datalayer-config-data" type="application/json">
       {
-        "jupyterServerHttpUrl": "",
-        "jupyterServerWsUrl": "",
-        "jupyterToken": "{{ token }}"
+        "jupyterServerUrl": "",
+        "jupyterServerToken": "{{ token }}"
       }
     </script>
     <script id="jupyter-config-data" type="application/json">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalayer/core",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Ξ Datalayer Core.",
   "keywords": [
     "datalayer",
@@ -65,7 +65,7 @@
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@datalayer/run": "^0.1.1"
+    "@datalayer/run": "^0.1.2"
   },
   "devDependencies": {
     "@babel/core": "^7.21.0",

public/index.html

@@ -5,9 +5,8 @@
     <title>Ξ Datalayer</title>
     <script id="datalayer-config-data" type="application/json">
       {
-        "jupyterServerHttpUrl": "http://localhost:8888",
-        "jupyterServerWsUrl": "ws://localhost:8888",
-        "jupyterToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
+        "jupyterServerUrl": "http://localhost:8888",
+        "jupyterServerToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
       }
     </script>
     <script id="jupyter-config-data" type="application/json">