Fix additional fields regression in HiveD config (#4878) (#4882)

Fix additional fields regression issue in HiveD config on webportal submission form.
microsoft · Sep 9, 2020 · bddcd87 · bddcd87
1 parent d65f091
commit bddcd87
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/webportal/src/app/job-submission/models/job-protocol.js b/src/webportal/src/app/job-submission/models/job-protocol.js
@@ -136,7 +136,17 @@ export class JobProtocol {
       jobTaskRoles,
     );
     if (config.launcherScheduler === 'hivedscheduler') {
-      protocolExtras.hivedScheduler = { taskRoles: hivedTaskRoles };
+      const newTaskRoles = get(protocolExtras, 'hivedScheduler.taskRoles', {});
+      for (const name in hivedTaskRoles) {
+        newTaskRoles[name] = {
+          ...newTaskRoles[name],
+          ...hivedTaskRoles[name],
+        };
+      }
+      protocolExtras.hivedScheduler = {
+        ...protocolExtras.hivedScheduler,
+        taskRoles: newTaskRoles,
+      };
     }
     const secrets = removeEmptyProperties(
       jobSecrets.reduce((res, secret) => {