fix export yaml bug (#3047)

microsoft · Jul 2, 2019 · f3b95be · f3b95be
1 parent 62eb465
commit f3b95be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/webportal/src/app/job-submission/components/submission-section.jsx b/src/webportal/src/app/job-submission/components/submission-section.jsx
@@ -43,15 +43,15 @@ import {submitJob} from '../utils/conn';
 import MonacoPanel from '../../components/monaco-panel';
 import Card from '../../components/card';
 import {
-  getJobComponentsFormConfig,
+  getJobComponentsFromConfig,
   pruneComponents,
   populateProtocolWithDataCli,
   removePreCommandsFromProtocolTaskRoles,
 } from '../utils/utils';
 import Context from './context';
 
 import PropTypes from 'prop-types';
-import {isNil, debounce, isEqual, isEmpty} from 'lodash';
+import {isNil, debounce, isEqual, isEmpty, cloneDeep} from 'lodash';
 
 const JOB_PROTOCOL_SCHEMA_URL =
   'https://github.com/microsoft/pai/blob/master/docs/pai-job-protocol.yaml';
@@ -160,7 +160,7 @@ export const SubmissionSection = (props) => {
       updatedTaskRoles,
       updatedParameters,
       updatedSecrets,
-    ] = getJobComponentsFormConfig(updatedJob);
+    ] = getJobComponentsFromConfig(updatedJob);
 
     pruneComponents(updatedJobInformation, updatedSecrets, {vcNames});
     onChange(
@@ -181,12 +181,12 @@ export const SubmissionSection = (props) => {
 
   const _exportYaml = async (event) => {
     event.preventDefault();
-    const protocol = new JobProtocol(jobProtocol);
+    const protocol = cloneDeep(jobProtocol);
     try {
       await populateProtocolWithDataCli(user, protocol, jobData);
       _exportFile(
-        jobProtocol.toYaml(),
-        (jobInformation.name || 'job') + '.yaml',
+        protocol.toYaml(),
+        (protocol.name || 'job') + '.yaml',
         'text/yaml',
       );
     } catch (err) {
@@ -219,12 +219,12 @@ export const SubmissionSection = (props) => {
 
   const _submitJob = async (event) => {
     event.preventDefault();
-    const protocol = new JobProtocol(jobProtocol);
+    const protocol = cloneDeep(jobProtocol);
     try {
       await populateProtocolWithDataCli(user, protocol, jobData);
       await submitJob(protocol.toYaml());
       window.location.href = `/job-detail.html?username=${user}&jobName=${
-        jobProtocol.name
+        protocol.name
       }`;
     } catch (err) {
       alert(err);

diff --git a/src/webportal/src/app/job-submission/job-submission.jsx b/src/webportal/src/app/job-submission/job-submission.jsx
@@ -43,7 +43,7 @@ import {SubmissionSection} from './components/submission-section';
 import {TaskRoles} from './components/task-roles';
 import Context from './components/context';
 import {fetchJobConfig, listVirtualClusters} from './utils/conn';
-import {getJobComponentsFormConfig} from './utils/utils';
+import {getJobComponentsFromConfig} from './utils/utils';
 import {TaskRolesManager} from './utils/task-roles-manager';
 import {initTheme} from '../components/theme';
 import {SpinnerLoading} from '../components/loading';
@@ -213,7 +213,7 @@ const JobSubmission = () => {
       if (user && jobName) {
         fetchJobConfig(user, jobName)
           .then((jobConfig) => {
-            const [jobInfo, taskRoles, parameters] = getJobComponentsFormConfig(
+            const [jobInfo, taskRoles, parameters] = getJobComponentsFromConfig(
               jobConfig,
             );
             setJobTaskRoles(taskRoles);

diff --git a/src/webportal/src/app/job-submission/utils/utils.js b/src/webportal/src/app/job-submission/utils/utils.js
@@ -86,7 +86,7 @@ export function pruneComponents(jobInformation, secrets, context) {
   }
 }
 
-export function getJobComponentsFormConfig(jobConfig) {
+export function getJobComponentsFromConfig(jobConfig) {
   if (isNil(jobConfig)) {
     return;
   }
-Original file line number
+Diff line change
@@ Expand Up @@
       }
     }
-    export function getJobComponentsFormConfig(jobConfig) {
+    export function getJobComponentsFromConfig(jobConfig) {
       if (isNil(jobConfig)) {
         return;
       }
@@ Expand Down @@