From 27cce0c8478183cb05a9520ca880cba757c2c0ea Mon Sep 17 00:00:00 2001 From: Benjamin Wilhelm Date: Fri, 19 Dec 2025 10:22:42 +0100 Subject: [PATCH 1/2] AP-25234, AP-24593: Update @knime/scripting-editor to 0.0.119 AP-24593 (Show K-AI disclaimer in Scripting Editor only once) AP-25234 (Allow usage of JSONForms dialogs generated from NodeParameters in Scripting Editors) --- .../js-src/package-lock.json | 8 ++++---- org.knime.python3.scripting.nodes/js-src/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.knime.python3.scripting.nodes/js-src/package-lock.json b/org.knime.python3.scripting.nodes/js-src/package-lock.json index 3ca7e54f8..9df23bf4a 100644 --- a/org.knime.python3.scripting.nodes/js-src/package-lock.json +++ b/org.knime.python3.scripting.nodes/js-src/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "dependencies": { "@knime/components": "1.43.0", - "@knime/scripting-editor": "0.0.118", + "@knime/scripting-editor": "0.0.119", "@knime/styles": "1.8.0", "@knime/ui-extension-service": "2.6.0", "@vueuse/core": "13.8.0", @@ -3036,9 +3036,9 @@ } }, "node_modules/@knime/scripting-editor": { - "version": "0.0.118", - "resolved": "https://registry.npmjs.org/@knime/scripting-editor/-/scripting-editor-0.0.118.tgz", - "integrity": "sha512-wOI+QEYB3hn+zA0D32UT+7obO/OzIlnUfizSw5qE5Y7q3+GZm6is9qzRW0ooJvroUhy6v+GNFaArtKdFY7Z3fw==", + "version": "0.0.119", + "resolved": "https://registry.npmjs.org/@knime/scripting-editor/-/scripting-editor-0.0.119.tgz", + "integrity": "sha512-qn3FC6IoBdWKOd7szRes8ZcGTDU2QJBLuKuVXE24ChETdCtprhqhV1Rvo40E9wbjV9UaUkp8N3MW9p49pEM9Rw==", "hasInstallScript": true, "license": "See the file license.txt", "dependencies": { diff --git a/org.knime.python3.scripting.nodes/js-src/package.json b/org.knime.python3.scripting.nodes/js-src/package.json index 9c241b778..d918f2a15 100644 --- a/org.knime.python3.scripting.nodes/js-src/package.json +++ b/org.knime.python3.scripting.nodes/js-src/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "@knime/components": "1.43.0", - "@knime/scripting-editor": "0.0.118", + "@knime/scripting-editor": "0.0.119", "@knime/styles": "1.8.0", "@knime/ui-extension-service": "2.6.0", "@vueuse/core": "13.8.0", From 434bd61e746190c5f5bbe5affe3e9ba7f6da7e00 Mon Sep 17 00:00:00 2001 From: Benjamin Wilhelm Date: Fri, 19 Dec 2025 10:26:08 +0100 Subject: [PATCH 2/2] AP-25234: Adapt to settings API changes AP-25234 (Allow usage of JSONForms dialogs generated from NodeParameters in Scripting Editors) --- .../js-src/src/__mocks__/browser-mock-services.ts | 4 +++- .../js-src/src/__mocks__/mock-data.ts | 3 ++- .../js-src/src/components/EnvironmentSettings.vue | 2 +- .../js-src/src/python-scripting-service.ts | 2 +- .../js-src/src/test-setup/setup.ts | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/org.knime.python3.scripting.nodes/js-src/src/__mocks__/browser-mock-services.ts b/org.knime.python3.scripting.nodes/js-src/src/__mocks__/browser-mock-services.ts index d7ac4b666..d847fbfad 100644 --- a/org.knime.python3.scripting.nodes/js-src/src/__mocks__/browser-mock-services.ts +++ b/org.knime.python3.scripting.nodes/js-src/src/__mocks__/browser-mock-services.ts @@ -10,7 +10,9 @@ export default { getLanguageServerConfig: () => Promise.resolve(JSON.stringify({})), }, }), - settingsService: createSettingsServiceMock(DEFAULT_INITIAL_SETTINGS), + settingsService: createSettingsServiceMock({ + settings: DEFAULT_INITIAL_SETTINGS, + }), initialData: DEFAULT_INITIAL_DATA, displayMode: "large", } satisfies InitMockData; diff --git a/org.knime.python3.scripting.nodes/js-src/src/__mocks__/mock-data.ts b/org.knime.python3.scripting.nodes/js-src/src/__mocks__/mock-data.ts index 58565087d..58901ccbe 100644 --- a/org.knime.python3.scripting.nodes/js-src/src/__mocks__/mock-data.ts +++ b/org.knime.python3.scripting.nodes/js-src/src/__mocks__/mock-data.ts @@ -122,4 +122,5 @@ export const DEFAULT_INITIAL_DATA: PythonInitialData = { export const createPythonSettingsServiceMock = ( settings?: PythonScriptingNodeSettings, -) => createSettingsServiceMock(settings ?? DEFAULT_INITIAL_SETTINGS); +) => + createSettingsServiceMock({ settings: settings ?? DEFAULT_INITIAL_SETTINGS }); diff --git a/org.knime.python3.scripting.nodes/js-src/src/components/EnvironmentSettings.vue b/org.knime.python3.scripting.nodes/js-src/src/components/EnvironmentSettings.vue index cfa290586..ff6bc25c5 100644 --- a/org.knime.python3.scripting.nodes/js-src/src/components/EnvironmentSettings.vue +++ b/org.knime.python3.scripting.nodes/js-src/src/components/EnvironmentSettings.vue @@ -63,7 +63,7 @@ onMounted(() => { const executableSettingState = useExecutableSettingStore(); if (executableSettingState.value === null) { const register = getSettingsService().registerSettings("model"); - const environmentSettingState = register(""); + const environmentSettingState = register({ initialValue: "" }); if (executableSelection.id === "") { executableSettingState.value = environmentSettingState.addControllingFlowVariable(null); diff --git a/org.knime.python3.scripting.nodes/js-src/src/python-scripting-service.ts b/org.knime.python3.scripting.nodes/js-src/src/python-scripting-service.ts index fb744e1d1..ceb77b06a 100644 --- a/org.knime.python3.scripting.nodes/js-src/src/python-scripting-service.ts +++ b/org.knime.python3.scripting.nodes/js-src/src/python-scripting-service.ts @@ -36,7 +36,7 @@ export const pythonScriptingService = { initExecutableSelection: (): void => { const settings = getSettingsService().getSettings(); - setSelectedExecutable({ id: settings.executableSelection ?? "" }); + setSelectedExecutable({ id: settings?.executableSelection ?? "" }); pythonScriptingService.updateExecutableSelection(executableSelection.id); const executableInfo = getPythonInitialData().executableOptionsList.find( ({ id }) => id === executableSelection.id, diff --git a/org.knime.python3.scripting.nodes/js-src/src/test-setup/setup.ts b/org.knime.python3.scripting.nodes/js-src/src/test-setup/setup.ts index ae0fba79a..f2ded5da6 100644 --- a/org.knime.python3.scripting.nodes/js-src/src/test-setup/setup.ts +++ b/org.knime.python3.scripting.nodes/js-src/src/test-setup/setup.ts @@ -23,6 +23,7 @@ vi.mock("@knime/ui-extension-service", () => ({})); initMocked({ scriptingService: { sendToService: vi.fn(), + callRpcMethod: vi.fn(), getOutputPreviewTableInitialData: vi.fn(() => Promise.resolve(undefined)), registerEventHandler: vi.fn(), // @ts-expect-error Mock doesn't fully implement MonacoLSPConnection interface @@ -37,6 +38,7 @@ initMocked({ }, settingsService: { getSettings: vi.fn(() => Promise.resolve(DEFAULT_INITIAL_SETTINGS)), + getSettingsInitialData: vi.fn(), registerSettingsGetterForApply: vi.fn(), // @ts-expect-error Mock doesn't fully implement SettingState interface registerSettings: vi.fn(() =>