Merge branch 'TMSS-378' into TMSS-402

SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_topbar.scss

@@ -3,7 +3,7 @@
     height: 50px;
     padding: .7em 1.5em 0em 1.5em;
     color: #ffffff;
-    z-index: 999;
+    z-index: 2000;
     right: 0;
     @include clearfix();
     @include linear-gradient-left($topbarLeftBgColor,$topbarRightBgColor);

SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/Stations.js

@@ -38,9 +38,21 @@ export default (props) => {
     useEffect(() => {
         if (props.stationGroup && props.stationGroup.length) {
             getAllStations();
+         } else {
+            reset();
         }
     }, [props.stationGroup]);
 
+    // Restting the stations
+    const reset = () => {
+        setStations([]);
+        setSelectedStations([]);
+        setStationOptions([]);
+        setCustomStations([]);
+        setCustomStationsOptions([]);
+        setmissing_StationFieldsErrors([]);
+    };
+
     /**
      * Fetches all stations
      */

SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js

@@ -384,19 +384,24 @@ export class SchedulingUnitCreate extends Component {
                 name: '',
                 description: '',
                 project: this.props.match.params.project || null,
-                scheduling_constraints_template_id: this.constraintTemplates[0].id
-            },
+                scheduling_constraints_template_id: this.constraintTemplates[0].id,
+             },
             projectDisabled: (this.props.match.params.project? true:false),
             observStrategy: {},
+            selectedStations:{},
             paramsOutput: null,
             validEditor: false,
             validFields: {},
             constraintSchema: null,
-            touched:false
-        }, () => {
+            selectedStations: null,
+            touched:false,
+            stationGroup: []
+           }, () => {
             this.constraintStrategy(this.constraintTemplates[0]);
         });
+       
         this.state.editorFunction();
+      
     }
 
     onUpdateStations = (state, selectedStations, missing_StationFieldsErrors, customSelectedStations) => {
@@ -517,8 +522,8 @@ export class SchedulingUnitCreate extends Component {
                             </div> 
                         </div>
                         <Stations
-                             stationGroup={this.state.stationGroup}
-                             onUpdateStations={this.onUpdateStations.bind(this)}
+                            stationGroup={this.state.stationGroup}
+                            onUpdateStations={this.onUpdateStations.bind(this)}
                         />
                        </div>
                     {this.state.constraintSchema && <div className="p-fluid">