From 2d166d4f11384ec32e35ba8258c13dd5830286ed Mon Sep 17 00:00:00 2001
From: Muthukrishnanmatriot
<76949556+muthukrishnanmatriot@users.noreply.github.com>
Date: Wed, 12 Oct 2022 14:11:36 +0530
Subject: [PATCH] TMSS-1927 - review comments updated
---
SAS/TMSS/frontend/tmss_webapp/src/App.js | 18 ++--------------
.../{FooterComponent.js => FormActionbar.js} | 12 +++++------
.../src/layout/sass/_actionbar.scss | 6 ++----
.../tmss_webapp/src/routes/Cycle/create.js | 7 +++----
.../tmss_webapp/src/routes/Cycle/edit.js | 5 ++---
.../tmss_webapp/src/routes/Project/create.js | 8 +++----
.../tmss_webapp/src/routes/Project/edit.js | 5 ++---
.../routes/Reservation/reservation.create.js | 9 +++-----
.../routes/Reservation/reservation.edit.js | 6 ++----
.../src/routes/Scheduling/create.js | 11 +++++-----
.../tmss_webapp/src/routes/Scheduling/edit.js | 8 +++----
.../routes/SystemEvent/system.event.create.js | 8 +++----
.../routes/SystemEvent/system.event.edit.js | 6 +++---
.../tmss_webapp/src/routes/Task/edit.js | 21 +++++--------------
14 files changed, 45 insertions(+), 85 deletions(-)
rename SAS/TMSS/frontend/tmss_webapp/src/components/{FooterComponent.js => FormActionbar.js} (84%)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/App.js b/SAS/TMSS/frontend/tmss_webapp/src/App.js
index 768d10df45f..ff0d6eb3099 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/App.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/App.js
@@ -59,7 +59,6 @@ class App extends Component {
this.validateAndLogout = this.validateAndLogout.bind(this);
this.setSearchField = this.setSearchField.bind(this);
this.toggleEditToggle = this.toggleEditToggle.bind(this);
- this.setLocalStorageValue = this.setLocalStorageValue.bind(this);
this.menu = [
//{label: 'Dashboard', icon: 'pi pi-fw pi-home', to:'/dashboard',section: 'dashboard'},
@@ -81,17 +80,6 @@ class App extends Component {
});
}
this.menuClick = false;
- }
-
- /**
- * Set key value in local storage
- * @param {*} key
- * @param {*} value
- * @returns String value
- */
- setLocalStorageValue(key, value) {
- localStorage.setItem(key, value);
- return "done";
}
onToggleMenu(event) {
@@ -106,12 +94,10 @@ class App extends Component {
);
}
else if (this.state.layoutMode === 'static') {
- const result = this.setLocalStorageValue('staticMenuInactive', !this.state.staticMenuInactive);
+ localStorage.setItem('staticMenuInactive', !this.state.staticMenuInactive);
this.setState({
staticMenuInactive: !this.state.staticMenuInactive
- }/*, () => {
- localStorage.setItem('staticMenuInactive', this.state.staticMenuInactive);
- }*/);
+ });
}
}
else {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/FooterComponent.js b/SAS/TMSS/frontend/tmss_webapp/src/components/FormActionbar.js
similarity index 84%
rename from SAS/TMSS/frontend/tmss_webapp/src/components/FooterComponent.js
rename to SAS/TMSS/frontend/tmss_webapp/src/components/FormActionbar.js
index 115c64428db..9dd4488f1be 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/FooterComponent.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/FormActionbar.js
@@ -3,13 +3,13 @@ import { Button } from 'primereact/button';
import { Checkbox } from 'primereact/checkbox';
import UIConstants from '../utils/ui.constants';
-export default class FooterComponent extends Component {
+export default class FormActionbar extends Component {
constructor(props) {
super(props);
this.state = {
createAnother: false
}
- this.callBack = this.callBack.bind(this);
+ this.createAnotherCallBack = this.createAnotherCallBack.bind(this);
this.tooltipOptions = UIConstants.tooltipOptions;
}
@@ -17,7 +17,7 @@ export default class FooterComponent extends Component {
*
* @param {*} e
*/
- callBack(e) {
+ createAnotherCallBack(e) {
this.props.createAnotherCallBack(e);
}
@@ -25,17 +25,17 @@ export default class FooterComponent extends Component {
const manuExpand = localStorage.getItem('staticMenuInactive') === 'true' ? true : false;
return (
<>
- <div className='footer-short-div' style={{width: manuExpand ? '78%':'66%'}}>
+ <div className='footer-short-div' style={{width: manuExpand ? '95.3%':'84.75%'}}>
{this.props.createAnother !== undefined &&
<>
<Checkbox inputId="trigger" role="trigger" data-testid="createAnother" tooltip={this.props.tooltip} tooltipOptions={this.tooltipOptions}
- checked={this.props.createAnother} onChange={e => this.callBack(e)} style={{marginRight: '0.25em'}} />
+ checked={this.props.createAnother} onChange={e => this.createAnotherCallBack(e)} style={{marginRight: '0.25em'}} />
<label style={{display: 'inline', marginRight: '2em'}}> Create another? </label>
</>
}
<Button label="Save" className="p-button-primary act-btn-save" id="save-btn" data-testid="save-btn"
icon="pi pi-check" style={{marginRight: "1em", color: "white", marginTop: "5px", paddingBottom: "5px"}}
- onClick={this.props.onSubmit} disabled={this.props.enableDisableSave}/>
+ onClick={this.props.onSubmit} disabled={this.props.enableSaveBtn}/>
<Button label="Cancel" className="act-btn-cancel" icon="pi pi-times" onClick={this.props.onCancel}/>
</div>
</>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_actionbar.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_actionbar.scss
index 952e28e9d5b..7532722792d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_actionbar.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_actionbar.scss
@@ -1,14 +1,12 @@
.footer-long-div {
- //margin-bottom: 24px !important;
z-index: 100;
position: fixed;
- bottom: -5px;
+ bottom: 35px;
width: 100%;
background-color: transparent !important;
box-shadow: none !important;
vertical-align: middle !important;
- padding-left: 2px !important;
- //padding-bottom: 0.75em !important;
+ padding-left: 0px !important;
}
.footer-short-div {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
index 651f0574564..2774916187a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/create.js
@@ -7,7 +7,6 @@ import { InputTextarea } from 'primereact/inputtextarea';
import { Dropdown } from 'primereact/dropdown';
import { Button } from 'primereact/button';
import { Toast } from 'primereact/toast';
-import { Checkbox } from 'primereact/checkbox';
import { ResourceInputList } from '../../components/Resources/ResourceInputList';
import { CustomDialog } from '../../layout/components/CustomDialog';
import moment from 'moment';
@@ -19,7 +18,7 @@ import PageHeader from '../../layout/components/PageHeader';
import CycleService from '../../services/cycle.service';
import UnitConverter from '../../utils/unit.converter';
import UIConstants from '../../utils/ui.constants';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
/**
* Component to create a new Cycle
@@ -531,9 +530,9 @@ export class CycleCreate extends Component {
</div>
</div>
<div className="footer-long-div p-breadcrumb" >
- <FooterComponent createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
+ <FormActionbar createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
tooltip="Select checkbox to create another Cycle after saving this cycle"
- onSubmit={this.saveCycle} enableDisableSave={!this.state.validForm} onCancel={this.checkIsDirty} />
+ onSubmit={this.saveCycle} enableSaveBtn={!this.state.validForm} onCancel={this.checkIsDirty} />
</div>
</>
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
index ed5d1386161..1968684db8f 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/edit.js
@@ -8,7 +8,6 @@ import { Calendar } from 'primereact/calendar';
import { InputTextarea } from 'primereact/inputtextarea';
import { Dropdown } from 'primereact/dropdown';
import { Button } from 'primereact/button';
-import { Dialog } from 'primereact/dialog';
import { Toast } from 'primereact/toast';
import { ResourceInputList } from '../../components/Resources/ResourceInputList';
@@ -20,7 +19,7 @@ import CycleService from '../../services/cycle.service';
import UnitConverter from '../../utils/unit.converter';
import UIConstants from '../../utils/ui.constants';
import { appGrowl } from '../../layout/components/AppGrowl';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
export class CycleEdit extends Component {
constructor(props) {
@@ -530,7 +529,7 @@ export class CycleEdit extends Component {
</div>
</div>
<div className="footer-long-div p-breadcrumb" >
- <FooterComponent onSubmit={this.saveCycle}enableDisableSave={!this.state.validForm} onCancel={this.checkIsDirty} />
+ <FormActionbar onSubmit={this.saveCycle} enableSaveBtn={!this.state.validForm} onCancel={this.checkIsDirty} />
</div>
</>
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
index d29dc8b2db1..0743b29a51a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
@@ -20,7 +20,7 @@ import ProjectService from '../../services/project.service';
import UnitConverter from '../../utils/unit.converter';
import UIConstants from '../../utils/ui.constants';
import ReactTooltip from "react-tooltip";
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
/**
* Component to create a new Project
@@ -654,10 +654,10 @@ export class ProjectCreate extends Component {
<ReactTooltip id="reacttooltip" place={'left'} type={'dark'} effect={'solid'} multiline={true} />
</div>
</div>
- <div className="footer-long-div p-breadcrumb" >
- <FooterComponent createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
+ <div className="footer-long-div p-breadcrumb">
+ <FormActionbar createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
tooltip="Select checkbox to create another Project after saving this project"
- onSubmit={this.saveProject} enableDisableSave={!this.state.validForm} onCancel={this.checkIsDirty} />
+ onSubmit={this.saveProject} enableSaveBtn={!this.state.validForm} onCancel={this.checkIsDirty} />
</div>
</>
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
index 090063553e8..e33d29ac393 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
@@ -9,7 +9,6 @@ import { Checkbox } from 'primereact/checkbox';
import { Dropdown } from 'primereact/dropdown';
import { MultiSelect } from 'primereact/multiselect';
import { Button } from 'primereact/button';
-import { Dialog } from 'primereact/dialog';
import { Toast } from 'primereact/toast';
import { CustomDialog } from '../../layout/components/CustomDialog';
import { ResourceInputList } from '../../components/Resources/ResourceInputList';
@@ -25,7 +24,7 @@ import ReactTooltip from "react-tooltip";
import AuthUtil from '../../utils/auth.util';
import AccessDenied from '../../layout/components/AccessDenied';
import { appGrowl, setAppGrowl } from '../../layout/components/AppGrowl';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
export class ProjectEdit extends Component {
constructor(props) {
@@ -704,7 +703,7 @@ export class ProjectEdit extends Component {
</div>
</div>
<div className="footer-long-div p-breadcrumb" >
- <FooterComponent onSubmit={this.saveProject} enableDisableSave={!this.state.validForm} onCancel={this.checkIsDirty} />
+ <FormActionbar onSubmit={this.saveProject} enableSaveBtn={!this.state.validForm} onCancel={this.checkIsDirty} />
</div>
</>
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js
index 4b4f9489cfb..725c5c2cf83 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.create.js
@@ -7,8 +7,6 @@ import { Toast } from 'primereact/toast';
import { Dropdown } from 'primereact/dropdown';
import { InputText } from 'primereact/inputtext';
import { InputTextarea } from 'primereact/inputtextarea';
-import { Button } from 'primereact/button';
-import { Dialog } from 'primereact/dialog';
import Flatpickr from "react-flatpickr";
import AppLoader from '../../layout/components/AppLoader';
import PageHeader from '../../layout/components/PageHeader';
@@ -22,8 +20,7 @@ import Jeditor from '../../components/JSONEditor/JEditor';
import UtilService from '../../services/util.service';
import UnitConverter from '../../utils/unit.converter';
import { appGrowl } from '../../layout/components/AppGrowl';
-//import { Checkbox } from 'primereact/checkbox';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
import "flatpickr/dist/flatpickr.css";
import ParserUtility from '../../utils/parser.utility';
@@ -680,9 +677,9 @@ export class ReservationCreate extends Component {
</div>
</div>
<div className="footer-long-div p-breadcrumb" >
- <FooterComponent createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
+ <FormActionbar createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
tooltip="Select checkbox to create another reservation after saving this reservation"
- onSubmit={this.saveReservation} enableDisableSave={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
+ onSubmit={this.saveReservation} enableSaveBtn={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
</div>
</>
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.edit.js
index 381e4a7922c..a62d12dcdc8 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.edit.js
@@ -1,7 +1,5 @@
import React, { Component } from 'react';
import { Redirect } from 'react-router-dom'
-
-import { Button } from 'primereact/button';
import { Dropdown } from 'primereact/dropdown';
import { InputText } from 'primereact/inputtext';
import { InputTextarea } from 'primereact/inputtextarea';
@@ -23,7 +21,7 @@ import UtilService from '../../services/util.service';
import { InputMask } from 'primereact/inputmask';
import UnitConverter from '../../utils/unit.converter';
import ParserUtility from '../../utils/parser.utility';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
export class ReservationEdit extends Component {
constructor(props) {
@@ -623,7 +621,7 @@ export class ReservationEdit extends Component {
</div>
</div>
<div className="footer-long-div p-breadcrumb" >
- <FooterComponent onSubmit={this.saveReservation}enableDisableSave={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
+ <FormActionbar onSubmit={this.saveReservation} enableSaveBtn={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
</div>
</div>
</React.Fragment>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
index bed84812b2a..6cf60c7e8fa 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.js
@@ -10,7 +10,6 @@ import { InputText } from 'primereact/inputtext';
import { InputTextarea } from 'primereact/inputtextarea';
import { Dropdown } from 'primereact/dropdown';
import { Button } from 'primereact/button';
-import { Dialog } from 'primereact/dialog';
import { Toast } from 'primereact/toast';
import AppLoader from '../../layout/components/AppLoader';
import Jeditor from '../../components/JSONEditor/JEditor';
@@ -31,7 +30,7 @@ import ReactTooltip from "react-tooltip";
import AuthUtil from '../../utils/auth.util';
import { MultiSelect } from 'primereact/multiselect';
import { appGrowl, setAppGrowl } from '../../layout/components/AppGrowl';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
/**
* Component to create a new SchedulingUnit from Observation strategy template
@@ -881,7 +880,7 @@ export class SchedulingUnitCreate extends Component {
setCreateAnother(e) {
this.setState({'createAnother': e.target.checked})
}
-
+
render() {
if (this.state.redirect) {
return <Redirect to={ {pathname: this.state.redirect} }></Redirect>
@@ -1117,11 +1116,11 @@ export class SchedulingUnitCreate extends Component {
</div>
}
</div>
- <div className="footer-long-div p-breadcrumb" >
- <FooterComponent createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
+ <div className="footer-long-div p-breadcrumb" style={{marginLeft: '2em !important'}} >
+ <FormActionbar createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
tooltip="Select checkbox to create another Scheduling Unit after saving this Scheduling Unit"
onSubmit={this.saveSchedulingUnit}
- enableDisableSave={!this.state.constraintValidEditor || !this.state.validEditor || !this.state.validForm || !this.state.validConstraints || !this.state.validSpecification}
+ enableSaveBtn={!this.state.constraintValidEditor || !this.state.validEditor || !this.state.validForm || !this.state.validConstraints || !this.state.validSpecification}
onCancel={this.checkIsDirty} />
</div>
<ReactTooltip id="reacttooltip" place={'left'} type={'dark'} effect={'solid'} multiline={true} />
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
index 6addc220df9..8303166340d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/edit.js
@@ -6,10 +6,8 @@ import $RefParser from "@apidevtools/json-schema-ref-parser";
import { TriStateCheckbox } from 'primereact/tristatecheckbox';
import { InputText } from 'primereact/inputtext';
-//import { InputNumber } from 'primereact/inputnumber';
import { InputTextarea } from 'primereact/inputtextarea';
import { Dropdown } from 'primereact/dropdown';
-import { Button } from 'primereact/button';
import { Toast } from 'primereact/toast';
import { CustomDialog } from '../../layout/components/CustomDialog';
import AppLoader from '../../layout/components/AppLoader';
@@ -30,7 +28,7 @@ import ReactTooltip from "react-tooltip";
import AuthUtil from '../../utils/auth.util';
import AccessDenied from '../../layout/components/AccessDenied';
import { appGrowl } from '../../layout/components/AppGrowl';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
/**
* Compoenent to edit scheduling unit draft
@@ -873,8 +871,8 @@ export class EditSchedulingUnit extends Component {
}
<ReactTooltip id="reacttooltip" place={'left'} type={'dark'} effect={'solid'} multiline={true} />
<div className="footer-long-div p-breadcrumb" >
- <FooterComponent onSubmit={this.saveSchedulingUnit}
- enableDisableSave={!this.state.constraintValidEditor || !this.state.validEditor || !this.state.validForm || !this.state.validConstraints || !this.state.validSpecification} onCancel={this.checkIsDirty} />
+ <FormActionbar onSubmit={this.saveSchedulingUnit}
+ enableSaveBtn={!this.state.constraintValidEditor || !this.state.validEditor || !this.state.validForm || !this.state.validConstraints || !this.state.validSpecification} onCancel={this.checkIsDirty} />
</div>
<div className="p-grid" data-testid="confirm_dialog">
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.create.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.create.js
index 6f045279cd4..113cc6ebad5 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.create.js
@@ -23,9 +23,7 @@ import {AffectedTasksSelector} from './affeted.tasks.selector';
import { Chips } from 'primereact/chips';
import { Link } from 'react-router-dom';
import { publish } from '../../App';
-import { Checkbox } from 'primereact/checkbox';
-import ParserUtility from '../../utils/parser.utility';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
/**
* Component to create a new System Event
@@ -933,9 +931,9 @@ export class SystemEventCreate extends Component {
{!this.props.systemevent &&
<>
<div className="footer-long-div p-breadcrumb" >
- <FooterComponent createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
+ <FormActionbar createAnotherCallBack={this.setCreateAnother} createAnother={this.state.createAnother}
tooltip="Select checkbox to create another system event after saving this system event"
- onSubmit={this.saveSystemEvent} enableDisableSave={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
+ onSubmit={this.saveSystemEvent} enableSaveBtn={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
</div>
</>
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.edit.js
index b4c357ff3ca..10164263af8 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/SystemEvent/system.event.edit.js
@@ -24,7 +24,7 @@ import UnitConverter from '../../utils/unit.converter';
import {AffectedTasksSelector} from './affeted.tasks.selector';
import { Chips } from 'primereact/chips';
import { Dialog } from 'primereact/dialog';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
export class SystemEventEdit extends Component {
TASK_BLUEPRINT_EXPAND = 'scheduling_unit_blueprint,subtasks';
@@ -785,8 +785,8 @@ export class SystemEventEdit extends Component {
</div>
</div>
<div className="footer-long-div p-breadcrumb" >
- <FooterComponent onSubmit={this.updateSystemEvent}
- enableDisableSave={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
+ <FormActionbar onSubmit={this.updateSystemEvent}
+ enableSaveBtn={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
</div>
</div>
</React.Fragment>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
index 58431b52623..c268ebe2a6f 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
@@ -7,7 +7,6 @@ import { InputText } from 'primereact/inputtext';
import { InputTextarea } from 'primereact/inputtextarea';
import { Chips } from 'primereact/chips';
import { Dropdown } from 'primereact/dropdown';
-import { Button } from 'primereact/button';
import { CustomDialog } from '../../layout/components/CustomDialog';
import Jeditor from '../../components/JSONEditor/JEditor';
import { publish } from '../../App';
@@ -18,7 +17,7 @@ import PageHeader from '../../layout/components/PageHeader';
import AuthUtil from '../../utils/auth.util';
import AccessDenied from '../../layout/components/AccessDenied';
import UIConstants from '../../utils/ui.constants';
-import FooterComponent from '../../components/FooterComponent';
+import FormActionbar from '../../components/FormActionbar';
export class TaskEdit extends Component {
templateOutput = {}; // id: selectedTemplateId, output: values enetered in the editor form
@@ -369,20 +368,10 @@ export class TaskEdit extends Component {
</label>
</div>
</div>
-
- {/*<div className="p-grid p-justify-start act-btn-grp">
- <div className="p-col-1">
- <Button label="Save" className="p-button-primary" icon="pi pi-check" onClick={this.saveTask}
- data-testid="save-btn" disabled={!this.state.validEditor || !this.state.validForm} />
- </div>
- <div className="p-col-1">
- <Button label="Cancel" className="act-btn-cancel" icon="pi pi-times" onClick={this.checkIsDirty} />
- </div>
- </div>*/}
- <div className="footer-long-div p-breadcrumb" >
- <FooterComponent onSubmit={this.saveTask}
- enableDisableSave={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
- </div>
+ <div className="footer-long-div p-breadcrumb">
+ <FormActionbar onSubmit={this.saveTask}
+ enableSaveBtn={!this.state.validEditor || !this.state.validForm} onCancel={this.checkIsDirty} />
+ </div>
<div className="p-grid" data-testid="confirm_dialog">
<CustomDialog type="confirmation" visible={this.state.showDialog} width="40vw"
header={'Edit Task'} message={'Do you want to discard your changes? Your changes to the Task will not be saved.'}
--
GitLab