Merge pull request 'fix: viya deploy makedata missing params' (#176) from viya-deploy-params into main

Reviewed-on: #176

.gitea/workflows/build.yaml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.14.0
+          node-version: 20.15.1
 
       - name: Install Google Chrome
         run: |
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.14.0
+          node-version: 20.15.1
 
       - name: Write .npmrc file
         run: |

client/src/app/deploy/sections/automatic/automatic.component.ts

@@ -167,8 +167,7 @@ export class AutomaticComponent implements OnInit {
   public async getAdminGroups() {
     return new Promise<void>((resolve, reject) => {
       this.adminGroupsLoading = true
-
-      this.sasViyaService
+      ;(this.sasViyaService
         .getAdminGroups()
         .subscribe((res: ViyaApiIdentities) => {
           this.adminGroupsLoading = false
@@ -188,7 +187,7 @@ export class AutomaticComponent implements OnInit {
           this.eventService.showAbortModal('admin groups', err)
 
           reject(err)
-        }
+        })
     })
   }
 
@@ -308,7 +307,11 @@ export class AutomaticComponent implements OnInit {
     }
 
     if (this.deployInNewWindow) {
-      this.runMakedataInNewWindow(selectedComputeContextName)
+      this.runMakedataInNewWindow({
+        contextName: selectedComputeContextName,
+        admin: this.selectedAdminGroup,
+        dcPath: this.dcPath
+      })
     } else {
       this.sasJs
         .request(`services/admin/makedata`, data, overrideConfig, () => {
@@ -358,11 +361,17 @@ export class AutomaticComponent implements OnInit {
     }
   }
 
-  public runMakedataInNewWindow(contextName: string) {
+  public runMakedataInNewWindow(params: {
+    contextName: string
+    admin: string
+    dcPath: string
+  }) {
     let serverUrl = this.sasjsConfig.serverUrl
     let appLoc = this.sasjsConfig.appLoc
     const execPath = this.sasService.getExecutionPath()
-    let contextname = `&_contextname=${contextName}`
+    let contextname = `&_contextname=${params.contextName}`
+    let admin = `&admin=${params.admin}`
+    let dcPath = `&dcpath=${params.dcPath}`
     let debug = `&_debug=131`
 
     let programUrl =
@@ -372,6 +381,8 @@ export class AutomaticComponent implements OnInit {
       appLoc +
       '/services/admin/makedata' +
       contextname +
+      admin +
+      dcPath +
       debug
 
     window.open(programUrl)