From 99f036a6e0f85ecb6f831069ae1c97804329be23 Mon Sep 17 00:00:00 2001 From: Oleksii Kurinnyi Date: Fri, 10 Nov 2023 11:15:47 +0200 Subject: [PATCH] fix: preserve dwoc Signed-off-by: Oleksii Kurinnyi --- .../devworkspace/devWorkspaceClient.ts | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/devWorkspaceClient.ts b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/devWorkspaceClient.ts index aaa1f63ab..db406f50e 100644 --- a/packages/dashboard-frontend/src/services/workspace-client/devworkspace/devWorkspaceClient.ts +++ b/packages/dashboard-frontend/src/services/workspace-client/devworkspace/devWorkspaceClient.ts @@ -458,23 +458,15 @@ export class DevWorkspaceClient { const cheNamespace = config.cheNamespace; let attributes = workspace.spec.template.attributes; if (cheNamespace) { - const devworkspaceConfig = { name: 'devworkspace-config', namespace: cheNamespace }; - const devworkspaceConfigPath = `/spec/template/attributes/${this.escape( - DEVWORKSPACE_CONFIG_ATTR, - )}`; - if (attributes) { - if (attributes[DEVWORKSPACE_CONFIG_ATTR]) { - if (attributes[DEVWORKSPACE_CONFIG_ATTR] !== devworkspaceConfig) { - patch.push({ op: 'replace', path: devworkspaceConfigPath, value: devworkspaceConfig }); - } - } else { - patch.push({ op: 'add', path: devworkspaceConfigPath, value: devworkspaceConfig }); - } - } else { + if (attributes?.[DEVWORKSPACE_CONFIG_ATTR] === undefined) { + const devworkspaceConfig = { name: 'devworkspace-config', namespace: cheNamespace }; + const devworkspaceConfigPath = `/spec/template/attributes/${this.escape( + DEVWORKSPACE_CONFIG_ATTR, + )}`; patch.push({ op: 'add', - path: '/spec/template/attributes', - value: { [DEVWORKSPACE_CONFIG_ATTR]: devworkspaceConfig }, + path: devworkspaceConfigPath, + value: devworkspaceConfig, }); attributes = {}; }