From 669cee980bc3875cb6b94b02fdbe2a21c8894ec3 Mon Sep 17 00:00:00 2001
From: Robert Patrick <robert.patrick@oracle.com>
Date: Sun, 26 Mar 2023 19:35:12 -0500
Subject: [PATCH] fixing aux image-related paths on Windows

---
 electron/app/js/ipcRendererPreload.js                  | 1 +
 webui/src/js/utils/k8s-domain-v8-resource-generator.js | 6 +++---
 webui/src/js/utils/k8s-domain-v9-resource-generator.js | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/electron/app/js/ipcRendererPreload.js b/electron/app/js/ipcRendererPreload.js
index 6243dce2f..3064e8284 100644
--- a/electron/app/js/ipcRendererPreload.js
+++ b/electron/app/js/ipcRendererPreload.js
@@ -262,6 +262,7 @@ contextBridge.exposeInMainWorld(
       extname: (filePath) => path.extname(filePath),
       isAbsolute: (filePath) => path.isAbsolute(filePath),
       join: (...paths) => path.join(...paths),
+      joinAndConvertToUnixPath: (...paths) => path.join(...paths).replaceAll('\\', '/'),
       delimiter: path.delimiter,
       isValidFileName: (fileName) => fsUtils.isValidFileName(fileName)
     },
diff --git a/webui/src/js/utils/k8s-domain-v8-resource-generator.js b/webui/src/js/utils/k8s-domain-v8-resource-generator.js
index 4bddb6da6..2f65c397b 100644
--- a/webui/src/js/utils/k8s-domain-v8-resource-generator.js
+++ b/webui/src/js/utils/k8s-domain-v8-resource-generator.js
@@ -133,9 +133,9 @@ function(project, K8sDomainConfigMapGenerator, jsYaml, i18n) {
           const mountPoint = domainResource.spec.auxiliaryImageVolumes[0].mountPath;
           // Always set these since WKO aux image support makes these required
           domainResource.spec.configuration.model.wdtInstallHome =
-            window.api.path.join(mountPoint, wdtRelatedPaths.targetWdtHomeDirName);
+            window.api.path.joinAndConvertToUnixPath(mountPoint, wdtRelatedPaths.targetWdtHomeDirName);
           domainResource.spec.configuration.model.modelHome =
-            window.api.path.join(mountPoint, wdtRelatedPaths.targetModelHomeDirName);
+            window.api.path.joinAndConvertToUnixPath(mountPoint, wdtRelatedPaths.targetModelHomeDirName);
         } else {
           // Only set these if they are specified; otherwise, rely on the default values
           if (wdtRelatedPaths.wdtHome) {
@@ -230,7 +230,7 @@ function(project, K8sDomainConfigMapGenerator, jsYaml, i18n) {
             }
           }
           result.targetWdtHomeDirName = 'weblogic-deploy';
-          result.sourceWdtHome = window.api.path.join(wdtHome, result.targetWdtHomeDirName);
+          result.sourceWdtHome = window.api.path.joinAndConvertToUnixPath(wdtHome, result.targetWdtHomeDirName);
           result.sourceModelHome = modelHome;
           result.targetModelHomeDirName = window.api.path.basename(modelHome);
         } else {
diff --git a/webui/src/js/utils/k8s-domain-v9-resource-generator.js b/webui/src/js/utils/k8s-domain-v9-resource-generator.js
index 8b87619df..dc92d6573 100644
--- a/webui/src/js/utils/k8s-domain-v9-resource-generator.js
+++ b/webui/src/js/utils/k8s-domain-v9-resource-generator.js
@@ -243,7 +243,7 @@ define(['models/wkt-project', 'utils/k8s-domain-configmap-generator', 'js-yaml',
           //
           let wdtInstallHome = this.project.image.wdtHomePath.value;
           if (!wdtInstallHome.endsWith(WDT_DIR_NAME)) {
-            wdtInstallHome = window.api.path.join(wdtInstallHome, WDT_DIR_NAME);
+            wdtInstallHome = window.api.path.joinAndConvertToUnixPath(wdtInstallHome, WDT_DIR_NAME);
           }
           if (usingAuxImage()) {
             if (usingExistingAuxImage()) {