trainingjob changes

Changes done to trainingjob create/edit/retrain request.

Issue-id: AIMLFW-76

Change-Id: I743916f588165d048e899743ab0c799661e7b4fd
Signed-off-by: rajdeep11 <rajdeep.sin@samsung.com>

diff --git a/src/components/home/form/CreateOrEditTrainingJobForm.js b/src/components/home/form/CreateOrEditTrainingJobForm.js
index f89553f..d53cf1e 100644 (file)
--- a/src/components/home/form/CreateOrEditTrainingJobForm.js
+++ b/src/components/home/form/CreateOrEditTrainingJobForm.js
@@ -47,9 +47,7 @@ class CreateTrainingJob extends React.Component {
       plVerName: '',
       plVerDescription: '',
       datalakeSourceList: ["Influx DB"],
-      datalakeSourceName: '',
-      _measurement: '',
-      bucket: ''
+      datalakeSourceName: ''
     };
 
     this.regName = new RegExp('\\W+')
@@ -112,9 +110,7 @@ class CreateTrainingJob extends React.Component {
             plVerName: result.data.trainingjob.pipeline_version,
             plVerDescription: '',
             datalakeSourceList: ["Influx DB"],
-            datalakeSourceName: getDatalakeNameWithoutConversion(result.data.trainingjob.datalake_source),
-            _measurement: result.data.trainingjob._measurement,
-            bucket: result.data.trainingjob.bucket
+            datalakeSourceName: getDatalakeNameWithoutConversion(result.data.trainingjob.datalake_source)
           }, () => {
             task()
           });
@@ -340,9 +336,7 @@ class CreateTrainingJob extends React.Component {
       this.state.targetName,
       this.state.ucDescription,
       this.state.plVerName,
-      this.state.datalakeSourceName,
-      this.state._measurement,
-      this.state.bucket
+      this.state.datalakeSourceName
     );
 
     this.invokeAddTrainingJob(event)
@@ -364,9 +358,7 @@ class CreateTrainingJob extends React.Component {
       this.state.targetName,
       this.state.ucDescription,
       this.state.plVerName,
-      this.state.datalakeSourceName,
-      this.state._measurement,
-      this.state.bucket
+      this.state.datalakeSourceName
     );
 
     this.invokePutTrainingJob(event);
@@ -390,9 +382,7 @@ class CreateTrainingJob extends React.Component {
       "enable_versioning": this.state.versioning,
       "description": this.state.ucDescription,
       "pipeline_version": this.state.plVerName,
-      "datalake_source": convertedDatalakeDBName,
-      "_measurement": this.state._measurement,
-      "bucket": this.state.bucket
+      "datalake_source": convertedDatalakeDBName
     }).then(res => {
       this.logger('UC created ', res.data)
       this.invokeStartTrainingForCreate();
@@ -422,9 +412,7 @@ class CreateTrainingJob extends React.Component {
       "enable_versioning": this.state.versioning,
       "description": this.state.ucDescription,
       "pipeline_version": this.state.plVerName,
-      "datalake_source": convertedDatalakeDBName,
-      "_measurement": this.state._measurement,
-      "bucket": this.state.bucket
+      "datalake_source": convertedDatalakeDBName
       //"enable_versioning" : true
     }).then(res => {
       this.logger('UC created ', res.data)
@@ -668,24 +656,6 @@ class CreateTrainingJob extends React.Component {
     })
   }
 
-
-
-
-  handle_measurementChange = (event) => {
-    this.setState({
-      _measurement: event.target.value
-    }, () => {
-      this.logger("after set state, _measurement: ", this.state._measurement);
-    });
-  }
-
-  handleBucketChange = (event) => {
-    this.setState({
-      bucket: event.target.value
-    }, () => {
-      this.logger("after set state, bucket: ", this.state.bucket);
-    });
-  }
   handleModelNameChange = (event) => {
     this.setState({
       modelName: event.target.value
@@ -715,9 +685,7 @@ class CreateTrainingJob extends React.Component {
       datalakeSourceName: '',
       superModel: '',
       superModelVersion: '',
-      superModelVersionsList: [],
-      _measurement: '',
-      bucket: ''
+      superModelVersionsList: []
     })
   }
 
@@ -882,31 +850,6 @@ class CreateTrainingJob extends React.Component {
             </Form.Control>
           </Form.Group>
 
-          {
-            this.state.datalakeSourceName === "Influx DB" &&
-            <div>
-              <Form.Group controlId="_measurement">
-                <Form.Label>_measurement*</Form.Label>
-                <Form.Control type="text"
-                  value={this.state._measurement}
-                  onChange={this.handle_measurementChange}
-                  placeholder=""
-                  required />
-              </Form.Group>
-              <Form.Group controlId="bucket">
-                <Form.Label>bucket*</Form.Label>
-                <Form.Control type="text"
-                  value={this.state.bucket}
-                  onChange={this.handleBucketChange}
-                  placeholder=""
-                  required />
-              </Form.Group>
-            </div>
-
-          }
-
-
-
           <Form.Group controlId="ftFilter">
             <Form.Label>Feature Filter</Form.Label>
             <Form.Control type="text"

diff --git a/src/components/home/status/TrainingJobInfo.js b/src/components/home/status/TrainingJobInfo.js
index 31e6caa..cca9cca 100644 (file)
--- a/src/components/home/status/TrainingJobInfo.js
+++ b/src/components/home/status/TrainingJobInfo.js
@@ -38,8 +38,6 @@ const TrainingJobInfo = (props) => {
     const [pipelineVersion, setPipelineVersion] = useState("");
     const [datalakeSource, setDatalakeSource] = useState("");
     const [modelUrl, setModelUrl] = useState("");
-    const [_measurement, set_measurement] = useState("");
-    const [bucket, setBucket] = useState("");
     const [modelInfo, setModelInfo] = useState("");
 
     useEffect(()=>{
@@ -63,8 +61,6 @@ const TrainingJobInfo = (props) => {
                 setPipelineVersion(response.data.trainingjob.pipeline_version === response.data.trainingjob.pipeline_name ? "1" : response.data.trainingjob.pipeline_version);
                 setDatalakeSource(getDatalakeNameWithoutConversion(response.data.trainingjob.datalake_source));
                 setModelUrl(response.data.trainingjob.model_url);
-                set_measurement(response.data.trainingjob._measurement);
-                setBucket(response.data.trainingjob.bucket);
                 setModelInfo(response.data.trainingjob.model_info);
             })
             .catch(error => {
@@ -147,19 +143,6 @@ const TrainingJobInfo = (props) => {
                     <Form.Label>Datalake Source</Form.Label>
                     <Form.Control type="text" value={datalakeSource} readOnly />
                 </Form.Group>
-                {
-                    datalakeSource === "Influx DB" &&
-                        <>
-                            <Form.Group controlId="_measurement">
-                                <Form.Label>_measurement</Form.Label>
-                                <Form.Control type="text" value={_measurement} readOnly />
-                            </Form.Group>
-                            <Form.Group controlId="bucket">
-                                <Form.Label>bucket</Form.Label>
-                                <Form.Control type="text" value={bucket} readOnly />
-                            </Form.Group>
-                        </>
-                }
                 <Form.Group controlId="modelUrl">
                     <Form.Label>Model URL</Form.Label>
                     <Form.Control type="text" value={modelUrl} readOnly />