From 8dbb6187a29a517c4162d74c4f3d4b5b0b2d2bec Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Fri, 5 Jul 2024 13:10:36 +0200 Subject: [PATCH 1/3] rename api_server_url to run_url --- datalayer/handlers.py | 2 +- datalayer/serverapplication.py | 6 +++--- package.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/datalayer/handlers.py b/datalayer/handlers.py index b72c9f4..6227d4f 100644 --- a/datalayer/handlers.py +++ b/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, diff --git a/datalayer/serverapplication.py b/datalayer/serverapplication.py index 67aec0b..89086f2 100644 --- a/datalayer/serverapplication.py +++ b/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="""IRM 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, diff --git a/package.json b/package.json index f71b600..cdc538a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@datalayer/core", - "version": "1.0.4", + "version": "1.0.5", "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", From 6456623723d61cc5438df2809349d42380c5cb67 Mon Sep 17 00:00:00 2001 From: Eric Charles Date: Sat, 6 Jul 2024 08:40:25 +0200 Subject: [PATCH 2/3] fix: typo --- datalayer/serverapplication.py | 2 +- datalayer/templates/index.html | 5 ++--- public/index.html | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/datalayer/serverapplication.py b/datalayer/serverapplication.py index 89086f2..05ab69d 100644 --- a/datalayer/serverapplication.py +++ b/datalayer/serverapplication.py @@ -34,7 +34,7 @@ class DatalayerExtensionApp(ExtensionAppJinjaMixin, ExtensionApp): run_url = Unicode( "https://oss.datalayer.run", config=True, - help="""IRM to connect to the Datalayer RUN APIs.""", + help="""URL to connect to the Datalayer RUN APIs.""", ) white_label = Bool(False, config=True, help="""Display white label content.""") diff --git a/datalayer/templates/index.html b/datalayer/templates/index.html index 4b589f8..6f6120a 100644 --- a/datalayer/templates/index.html +++ b/datalayer/templates/index.html @@ -5,9 +5,8 @@ Ξ Datalayer