Skip to content

Commit d63ae4b

Browse files
HedgehogCodechaubold
authored andcommitted
AP-25234: Adapt to settings API changes
AP-25234 (Allow usage of JSONForms dialogs generated from NodeParameters in Scripting Editors)
1 parent c9827e7 commit d63ae4b

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

org.knime.python3.scripting.nodes/js-src/src/__mocks__/browser-mock-services.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ export default {
1010
getLanguageServerConfig: () => Promise.resolve(JSON.stringify({})),
1111
},
1212
}),
13-
settingsService: createSettingsServiceMock(DEFAULT_INITIAL_SETTINGS),
13+
settingsService: createSettingsServiceMock({
14+
settings: DEFAULT_INITIAL_SETTINGS,
15+
}),
1416
initialData: DEFAULT_INITIAL_DATA,
1517
displayMode: "large",
1618
} satisfies InitMockData;

org.knime.python3.scripting.nodes/js-src/src/__mocks__/mock-data.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,5 @@ export const DEFAULT_INITIAL_DATA: PythonInitialData = {
122122

123123
export const createPythonSettingsServiceMock = (
124124
settings?: PythonScriptingNodeSettings,
125-
) => createSettingsServiceMock(settings ?? DEFAULT_INITIAL_SETTINGS);
125+
) =>
126+
createSettingsServiceMock({ settings: settings ?? DEFAULT_INITIAL_SETTINGS });

org.knime.python3.scripting.nodes/js-src/src/components/EnvironmentSettings.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ onMounted(() => {
6363
const executableSettingState = useExecutableSettingStore();
6464
if (executableSettingState.value === null) {
6565
const register = getSettingsService().registerSettings("model");
66-
const environmentSettingState = register("");
66+
const environmentSettingState = register({ initialValue: "" });
6767
if (executableSelection.id === "") {
6868
executableSettingState.value =
6969
environmentSettingState.addControllingFlowVariable(null);

org.knime.python3.scripting.nodes/js-src/src/python-scripting-service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const pythonScriptingService = {
3636
initExecutableSelection: (): void => {
3737
const settings = getSettingsService().getSettings();
3838

39-
setSelectedExecutable({ id: settings.executableSelection ?? "" });
39+
setSelectedExecutable({ id: settings?.executableSelection ?? "" });
4040
pythonScriptingService.updateExecutableSelection(executableSelection.id);
4141
const executableInfo = getPythonInitialData().executableOptionsList.find(
4242
({ id }) => id === executableSelection.id,

org.knime.python3.scripting.nodes/js-src/src/test-setup/setup.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ vi.mock("@knime/ui-extension-service", () => ({}));
2323
initMocked({
2424
scriptingService: {
2525
sendToService: vi.fn(),
26+
callRpcMethod: vi.fn(),
2627
getOutputPreviewTableInitialData: vi.fn(() => Promise.resolve(undefined)),
2728
registerEventHandler: vi.fn(),
2829
// @ts-expect-error Mock doesn't fully implement MonacoLSPConnection interface
@@ -37,6 +38,7 @@ initMocked({
3738
},
3839
settingsService: {
3940
getSettings: vi.fn(() => Promise.resolve(DEFAULT_INITIAL_SETTINGS)),
41+
getSettingsInitialData: vi.fn(),
4042
registerSettingsGetterForApply: vi.fn(),
4143
// @ts-expect-error Mock doesn't fully implement SettingState interface
4244
registerSettings: vi.fn(() =>

0 commit comments

Comments
 (0)