diff --git a/SAS/TMSS/frontend/tmss_webapp/src/authenticate/login.js b/SAS/TMSS/frontend/tmss_webapp/src/authenticate/login.js
index 4b37bc67076f1a1af79cbb2de5fcf4589ba39d7f..bb5361e6ceb7836b6b941db097c20e4ff7eb0df3 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/authenticate/login.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/authenticate/login.js
@@ -120,7 +120,7 @@ export class Login extends Component {
<div className="col-md-12 button-div" style={{textAlign: 'center', marginTop: '50px'}} >
<button className="btn btn-primary" id="KeyCloakLoginButton"
onClick={this.doKeyCloakLogin}>
- <img src="../images/Keycloak_Logo.png" style={{height: "50px"}} alt="Keycloak"/> Go to Keycloak Login</button>
+ Go to Keycloak Login</button>
</div>
}
{this.state.systemLogin &&
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js
index 6e60e03f5073b08c0579f36852c8a6a1760a9908..1377c062394b8af1ee579ef7f1d505b16562101f 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppTopbar.js
@@ -24,7 +24,7 @@ const AppTopbar = (props) => {
<button className="p-link layout-menu-button" onClick={props.onToggleMenu} title="Toggle Menu">
<i className="pi pi-bars"></i></button>
- <span className="header-title">TMSS</span>
+ <span className="header-title" title="V1.0.0">TMSS</span>
<span className="header-by">by</span>
<span className="header-company">ASTRON</span>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_login.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_login.scss
index 88a494ffa81b3ceb5db794f1aef2a1409f363579..f48df9bc86b646b22c6695241a633464834c7dc3 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_login.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_login.scss
@@ -35,6 +35,11 @@
font-weight: 600;
}
@media only screen and (max-width: 765px) {
+
+ .form-footer
+ {
+ float: left;
+ }
.login-part{
background-color: white;
min-width: 500px;
@@ -42,6 +47,8 @@
.login-form-link {
width:250px;
display: inline;
+ float: right;
+ text-align: left !important;
}
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss
index 37048f5cd9e1b589ed05d261308812d21e175e76..06edb327aba7fed358abf728cd11608e5b018628 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_viewtable.scss
@@ -289,7 +289,8 @@ body .p-paginator {
}
-.notfixed-column-td-Created, .notfixed-column-td-StartTime, .notfixed-column-td-EndTime, .notfixed-column-td-StartDate, .notfixed-column-td-EndDate {
+.notfixed-column-td-Created, .notfixed-column-td-StartTime, .notfixed-column-td-EndTime, .notfixed-column-td-StartDate, .notfixed-column-td-EndDate , .notfixed-column-td-ObservationStartTime , .notfixed-column-td-ObservationEndTime , .notfixed-column-td-ProcessStartTime, .notfixed-column-td-ProcessEndTime ,.notfixed-column-td-UpdatedAt
+ {
min-width: 237px;
}
@@ -297,3 +298,16 @@ body .p-paginator {
{
min-width: 200px;
}
+
+.notfixed-column-td-AssignedTo{
+ min-width: 200px;
+}
+.notfixed-column-td-CurrentWorkflowStage{
+ min-width: 250px;
+
+ :first-child {
+ width:220px
+ }
+}
+
+
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
index da8c13b7f2d004c3b2f9d5841266536ae1c5bc79..51523dc7dc45e0ce9b9f46c5ca1f05e921cd295e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -131,7 +131,7 @@ class SchedulingUnitList extends Component{
this.definitionCache = [];
this.state = {
showSpinner: false,
- suType: this.suUIAttr['listType'] || "Draft",
+ suType: this.suUIAttr['listType']?.replaceAll("_"," ") || "Draft",
columnOrders: [
"Status",
"Workflow Status",
@@ -432,14 +432,17 @@ class SchedulingUnitList extends Component{
}
changesutype(type = this.state.suType) {
-
let queryUrl = type;
if (type.toLowerCase() === 'blueprint_schedule') {
return queryUrl = 'blueprint'
}
- if (type=="Draft without BluePrint") {
- return queryUrl ="draft"
+ if (type.toLowerCase() === 'Drafts Without BluePrint') {
+ return queryUrl = 'draft'
}
+
+
+
+
return queryUrl.toLowerCase();
}
@@ -598,7 +601,7 @@ class SchedulingUnitList extends Component{
async getFilterColumns(type) {
- const columnDefinitionToBeRemove = ['status', 'unschedulable_reason', 'workflowStatus', 'results_accepted', 'on_sky_start_time', 'on_sky_stop_time', 'process_start_time', 'process_stop_time'];
+ const columnDefinitionToBeRemove = ['status', 'unschedulable_reason', 'workflowStatus', 'results_accepted', 'on_sky_start_time', 'on_sky_stop_time', 'process_start_time', 'process_stop_time','scheduled_central_lst'];
//For Constraint
const constColDefToBeRemove = ['observation_strategy_template_name', 'duration', 'observation_strategy_template_id', 'observation_strategy_template_description', 'on_sky_start_time', 'on_sky_stop_time', 'process_start_time', 'process_stop_time', 'task_content',
'target_observation_sap', 'do_cancel', 'created_at', 'updated_at', 'project_rank','rank', 'priority_queue', 'output_pinned', 'draft', 'targetName','targetAngle1','targetAngle2','targetRef'];
@@ -619,7 +622,7 @@ class SchedulingUnitList extends Component{
this.columnMap = [];
let tmpDefaulColumns = _.cloneDeep(this.state.defaultcolumns[0]);
let tmpOptionalColumns = _.cloneDeep(this.state.optionalcolumns[0]);
- let tmpColumnOrders = _.cloneDeep(this.state.columnOrders);
+ let tmpColumnOrders = _.cloneDeep(this.state.columnOrders);
if (this.state.suType === 'Blueprint') {
tmpOptionalColumns['draft'].name = 'Linked Draft ID';
let index = tmpColumnOrders.indexOf('Linked Blueprint ID') ;
@@ -655,7 +658,7 @@ class SchedulingUnitList extends Component{
this.getStatusList(suFilters);
tmpDefaulColumns = this.getAPIFilter(suFilters, tmpDefaulColumns);
tmpOptionalColumns = this.getAPIFilter(suFilters, tmpOptionalColumns);
- await this.setState({tmpDefaulcolumns: [tmpDefaulColumns], tmpOptionalcolumns:[tmpOptionalColumns], tmpColumnOrders: tmpColumnOrders, columnMap: this.columnMap})
+ this.setState({tmpDefaulcolumns: [tmpDefaulColumns], tmpOptionalcolumns:[tmpOptionalColumns], tmpColumnOrders: tmpColumnOrders, columnMap: this.columnMap})
}
}
@@ -829,7 +832,7 @@ class SchedulingUnitList extends Component{
let scheduleunits = [];
let expand,fields;
let params=suType.toLowerCase();
- if(suType.toLowerCase().startsWith('draft')){
+ if(suType.toLowerCase().startsWith('draft')){
expand=this.SU_DRAFT_EXPAND;
fields=this.SU_DRAFT_FIELDS;
@@ -886,7 +889,7 @@ class SchedulingUnitList extends Component{
cleanupTask: _.filter(projectSUs, {cleanupTask: true}).length === projectSUs.length,
copyFailedTasks: _.filter(projectSUs, {copyFailedTasks: true}).length === projectSUs.length,
}
-
+
if ( suType.toLowerCase().startsWith('draft')) {
for( const scheduleunit of scheduleunits){
let updatedSU = {};
@@ -927,12 +930,12 @@ class SchedulingUnitList extends Component{
await this.getFilterColumns(this.changesutype());
}
this.projects = await ProjectService.getProjectList(false, 'name,url');
- await this.setState({
+ this.setState({
scheduleunit: output, isLoading: false, optionalColumns: [optionalColumns], columnclassname: [columnclassname],
showSpinner: false, suPermissions: suPermissions, loadingStatus: false
});
}
- await this.setState({
+ this.setState({
scheduleunit: output, isLoading: false, optionalColumns: [optionalColumns], columnclassname: [columnclassname],
showSpinner: false, suPermissions: suPermissions
});
@@ -2687,7 +2690,7 @@ class SchedulingUnitList extends Component{
value={this.state.suType}
options={this.suTypeList}
onChange={(e) => {this.changeScheduleUnitType( e.value)}}
- style={{width: '13em', marginLeft: '0.5em'}}
+ style={{width: '18em', marginLeft: '0.5em'}}
/>
</span>
</div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
index f88f1ffd56e19083ae47d4c930e0cda929e4c274..8df2821c1fb387d516577f2525e82b2c15528fbd 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -211,15 +211,15 @@ class ViewSchedulingUnit extends Component {
"Control ID": "filter-input-75",
"Cancelled": "filter-input-50",
"Obsolete": "filter-input-50",
- "Duration (HH:mm:ss)": "filter-input-75",
+ "Duration (HH:mm:ss)": "filter-input-100",
"Template ID": "filter-input-50",
"Observation Start Time":"filter-input-150",
"Observation End Time":"filter-input-150",
"Process Start Time":"filter-input-150",
"Process End Time":"filter-input-150",
// "BluePrint / Task Draft link": "filter-input-100",
- "Relative Start Time (HH:mm:ss)": "filter-input-75",
- "Relative End Time (HH:mm:ss)": "filter-input-75",
+ "Relative Start Time (HH:mm:ss)": "filter-input-100",
+ "Relative End Time (HH:mm:ss)": "filter-input-100",
"Status": "filter-input-100",
"#Dataproducts": "filter-input-75",
"Data size": "filter-input-50",
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
index 507caf1e03f607c0e928f05615c20453bad179e0..e101d5b8568adc93972cf4cb73458ad5434ab58a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/create.test.js
@@ -137,7 +137,11 @@ test("Selects a project, loads the project's sets and selects the test schedulin
await setSchedulingUnitBasics(pageContent);
expect(scheduleSetListSpy).toHaveBeenCalled()
expect(pageContent.queryByTestId("project").textContent).toContain("high");
- expect(pageContent.queryByTestId("schedSet").textContent).toContain("Test Scheduling Set");
+ await waitFor(() => {
+ expect(pageContent.container.querySelector('.p-autocomplete-loader')).not.toBeInTheDocument();
+ expect(pageContent.queryByTestId("schedSet").textContent).toContain("Test Scheduling Set");
+ }, { timeout: 100 });
+
expect(pageContent.queryByTestId('save-btn')).toHaveAttribute("disabled");
});
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/state_logs.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/state_logs.js
index 9e6738ae7f77ce0839254c3fefdcc5491e93fd04..5e4e16df3f1adc8bee7b210c4bdd0cdd80459a7a 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/state_logs.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/state_logs.js
@@ -72,7 +72,7 @@ export class TaskStatusLogs extends Component {
return(
<React.Fragment>
{ this.state.isLoading? <AppLoader /> :
- <div className="p-grid">
+ <div >
<div className="col-lg-12" style={{zIndex:"1"}}>
<Button className="dialog-btn" label={this.state.showLatest?"Show All":"Show Latest Only"}
style={{width:"150px"}}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/AffectedTasksSelector.test.js b/SAS/TMSS/frontend/tmss_webapp/src/tests/AffectedTasksSelector.test.js
index be799e40710c5efcabaa7bdb871f44e71a5432e5..8e8cadce0147b79a219e283d0dfe57b51310fb25 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/AffectedTasksSelector.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/AffectedTasksSelector.test.js
@@ -31,7 +31,7 @@ function MakePrimaryMock() {
describe('AffectedTasksSelector ', () => {
it('Gets Suid from correct Node', async () => {
- let { component,mock} = await RenderAffectedTasksSelector(true,true,{ suId:"456",searchBy:'SUB',startTime:'01-01-2024',stopTime:'01-0-2024'});
+ let { component } = await RenderAffectedTasksSelector(true,true,{ suId:"456",searchBy:'SUB',startTime:'01-01-2024',stopTime:'01-0-2024'});
let searchInputText = screen.getByTestId("SuidInputText")
expect(searchInputText).toHaveValue("456")
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/app.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/app.test.js.snap
index 84ae4855b74c6668d897d3550e9cf881c6657edb..112d3e39bc65ff807277df70366f7b1ba7a5d538 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/app.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/app.test.js.snap
@@ -10,7 +10,7 @@ exports[`App Search Searches Correctly for Scheduling Unit: After Search 1`] =
<div class=\\"App\\">
<div class=\\"layout-wrapper layout-static\\">
<div class=\\"layout-wrapper layout-static layout-static-sidebar-inactive\\">
- <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
+ <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\" title=\\"V1.0.0\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
<div class=\\"top-date-bar\\">
<div class=\\"datetime-info-container\\"><span class=\\"date-element\\" data-testid=\\"Date-element\\"><span class=\\"date-title\\">Date</span><span class=\\"clock-time\\" title=\\"2023-12-24\\">2023-12-24</span></span><span class=\\"date-element\\" data-testid=\\"UTC-element\\"><span class=\\"date-title\\">UTC</span><time datetime=\\"X\\" class=\\"clock-time\\">22:58:22</time></span><span class=\\"date-element\\" data-testid=\\"LOFAR Core LST-element\\"><span class=\\"date-title\\">LOFAR Core LST</span><time datetime=\\"X\\" class=\\"clock-time\\">06:36:32</time></span></div>
</div>
@@ -102,7 +102,7 @@ exports[`App renders the App component with Redirection to login 1`] = `
<div class=\\"App\\">
<div class=\\"layout-wrapper layout-static\\">
<div class=\\"layout-wrapper layout-static layout-static-sidebar-inactive\\">
- <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
+ <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\" title=\\"V1.0.0\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
<div class=\\"top-date-bar\\">
<div class=\\"datetime-info-container\\"><span class=\\"date-element\\" data-testid=\\"Date-element\\"><span class=\\"date-title\\">Date</span><span class=\\"clock-time\\" title=\\"2023-12-24\\">2023-12-24</span></span><span class=\\"date-element\\" data-testid=\\"UTC-element\\"><span class=\\"date-title\\">UTC</span><time datetime=\\"X\\" class=\\"clock-time\\">22:58:22</time></span><span class=\\"date-element\\" data-testid=\\"LOFAR Core LST-element\\"><span class=\\"date-title\\">LOFAR Core LST</span><time datetime=\\"X\\" class=\\"clock-time\\">06:36:32</time></span></div>
</div>
@@ -178,7 +178,7 @@ exports[`App renders the App component with Valid Credentials: After Logout 1`]
<div class=\\"App\\">
<div class=\\"layout-wrapper layout-static\\">
<div class=\\"layout-wrapper layout-static layout-static-sidebar-inactive\\">
- <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
+ <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\" title=\\"V1.0.0\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
<div class=\\"top-date-bar\\">
<div class=\\"datetime-info-container\\"><span class=\\"date-element\\" data-testid=\\"Date-element\\"><span class=\\"date-title\\">Date</span><span class=\\"clock-time\\" title=\\"2023-12-24\\">2023-12-24</span></span><span class=\\"date-element\\" data-testid=\\"UTC-element\\"><span class=\\"date-title\\">UTC</span><time datetime=\\"X\\" class=\\"clock-time\\">22:58:22</time></span><span class=\\"date-element\\" data-testid=\\"LOFAR Core LST-element\\"><span class=\\"date-title\\">LOFAR Core LST</span><time datetime=\\"X\\" class=\\"clock-time\\">06:36:32</time></span></div>
</div>
@@ -603,7 +603,7 @@ exports[`App renders the App component with Valid Credentials: After Menu Toggle
<div class=\\"App\\">
<div class=\\"layout-wrapper layout-static\\">
<div class=\\"layout-wrapper layout-static layout-static-sidebar-inactive\\">
- <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
+ <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\" title=\\"V1.0.0\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
<div class=\\"top-date-bar\\">
<div class=\\"datetime-info-container\\"><span class=\\"date-element\\" data-testid=\\"Date-element\\"><span class=\\"date-title\\">Date</span><span class=\\"clock-time\\" title=\\"2023-12-24\\">2023-12-24</span></span><span class=\\"date-element\\" data-testid=\\"UTC-element\\"><span class=\\"date-title\\">UTC</span><time datetime=\\"X\\" class=\\"clock-time\\">22:58:22</time></span><span class=\\"date-element\\" data-testid=\\"LOFAR Core LST-element\\"><span class=\\"date-title\\">LOFAR Core LST</span><time datetime=\\"X\\" class=\\"clock-time\\">06:36:32</time></span></div>
</div>
@@ -1016,7 +1016,7 @@ exports[`App renders the App component with Valid Credentials: After Menu Toggle
<div class=\\"App\\">
<div class=\\"layout-wrapper layout-static\\">
<div class=\\"layout-wrapper layout-static layout-static-sidebar-inactive\\">
- <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
+ <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\" title=\\"V1.0.0\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
<div class=\\"top-date-bar\\">
<div class=\\"datetime-info-container\\"><span class=\\"date-element\\" data-testid=\\"Date-element\\"><span class=\\"date-title\\">Date</span><span class=\\"clock-time\\" title=\\"2023-12-24\\">2023-12-24</span></span><span class=\\"date-element\\" data-testid=\\"UTC-element\\"><span class=\\"date-title\\">UTC</span><time datetime=\\"X\\" class=\\"clock-time\\">22:58:22</time></span><span class=\\"date-element\\" data-testid=\\"LOFAR Core LST-element\\"><span class=\\"date-title\\">LOFAR Core LST</span><time datetime=\\"X\\" class=\\"clock-time\\">06:36:32</time></span></div>
</div>
@@ -1429,7 +1429,7 @@ exports[`App renders the App component with Valid Credentials: After Menu item c
<div class=\\"App\\">
<div class=\\"layout-wrapper layout-static\\">
<div class=\\"layout-wrapper layout-static layout-static-sidebar-inactive\\">
- <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
+ <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\" title=\\"V1.0.0\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
<div class=\\"top-date-bar\\">
<div class=\\"datetime-info-container\\"><span class=\\"date-element\\" data-testid=\\"Date-element\\"><span class=\\"date-title\\">Date</span><span class=\\"clock-time\\" title=\\"2023-12-24\\">2023-12-24</span></span><span class=\\"date-element\\" data-testid=\\"UTC-element\\"><span class=\\"date-title\\">UTC</span><time datetime=\\"X\\" class=\\"clock-time\\">22:58:22</time></span><span class=\\"date-element\\" data-testid=\\"LOFAR Core LST-element\\"><span class=\\"date-title\\">LOFAR Core LST</span><time datetime=\\"X\\" class=\\"clock-time\\">06:36:32</time></span></div>
</div>
@@ -1842,7 +1842,7 @@ exports[`App renders the App component with Valid Credentials: Valid Credentials
<div class=\\"App\\">
<div class=\\"layout-wrapper layout-static\\">
<div class=\\"layout-wrapper layout-static layout-static-sidebar-inactive\\">
- <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
+ <div class=\\"layout-topbar clearfix\\"><button class=\\"p-link layout-menu-button\\" title=\\"Toggle Menu\\"><i class=\\"pi pi-bars\\"></i></button><span class=\\"header-title\\" title=\\"V1.0.0\\">TMSS</span><span class=\\"header-by\\">by</span><span class=\\"header-company\\">ASTRON</span>
<div class=\\"top-date-bar\\">
<div class=\\"datetime-info-container\\"><span class=\\"date-element\\" data-testid=\\"Date-element\\"><span class=\\"date-title\\">Date</span><span class=\\"clock-time\\" title=\\"2023-12-24\\">2023-12-24</span></span><span class=\\"date-element\\" data-testid=\\"UTC-element\\"><span class=\\"date-title\\">UTC</span><time datetime=\\"X\\" class=\\"clock-time\\">22:58:22</time></span><span class=\\"date-element\\" data-testid=\\"LOFAR Core LST-element\\"><span class=\\"date-title\\">LOFAR Core LST</span><time datetime=\\"X\\" class=\\"clock-time\\">06:36:32</time></span></div>
</div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/login.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/login.test.js.snap
index b34b40625ff2109228e6c2f0ec2c3ceaa9c60b87..2381fe1797f73bc85908ca24022638fbd220ca2b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/login.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/login.test.js.snap
@@ -99,12 +99,7 @@ exports[`Login KeyCloack Login Redirect: KeyCloak Redirect 1`] = `
class="btn btn-primary"
id="KeyCloakLoginButton"
>
- <img
- alt="Keycloak"
- src="../images/Keycloak_Logo.png"
- style="height: 50px;"
- />
- Go to Keycloak Login
+ Go to Keycloak Login
</button>
</div>
</div>
@@ -241,12 +236,7 @@ exports[`Login Renders Login 1`] = `
class="btn btn-primary"
id="KeyCloakLoginButton"
>
- <img
- alt="Keycloak"
- src="../images/Keycloak_Logo.png"
- style="height: 50px;"
- />
- Go to Keycloak Login
+ Go to Keycloak Login
</button>
</div>
</div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/report.project.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/report.project.test.js.snap
index 7e001222ebe283ced6b1fc29c9f5c795eb879307..0f9961098207bc19e53e76d818e0b87504d12ec9 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/report.project.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/report.project.test.js.snap
@@ -1308,7 +1308,8 @@ exports[`Project Report Render With Contents Project Report renders correctly w
>
<input
aria-autocomplete="list"
- aria-expanded="false"
+ aria-controls="pr_id_3_list"
+ aria-expanded="true"
aria-haspopup="listbox"
autocomplete="off"
class=""
@@ -1318,34 +1319,6 @@ exports[`Project Report Render With Contents Project Report renders correctly w
/>
</li>
</ul>
- <svg
- aria-hidden="true"
- class="p-icon p-autocomplete-loader p-icon-spin"
- data-pc-section="loadingicon"
- fill="none"
- height="14"
- viewBox="0 0 14 14"
- width="14"
- xmlns="http://www.w3.org/2000/svg"
- >
- <g
- clip-path="url(#undefined)"
- >
- <path
- d="M6.99701 14C5.85441 13.999 4.72939 13.7186 3.72012 13.1832C2.71084 12.6478 1.84795 11.8737 1.20673 10.9284C0.565504 9.98305 0.165424 8.89526 0.041387 7.75989C-0.0826496 6.62453 0.073125 5.47607 0.495122 4.4147C0.917119 3.35333 1.59252 2.4113 2.46241 1.67077C3.33229 0.930247 4.37024 0.413729 5.4857 0.166275C6.60117 -0.0811796 7.76026 -0.0520535 8.86188 0.251112C9.9635 0.554278 10.9742 1.12227 11.8057 1.90555C11.915 2.01493 11.9764 2.16319 11.9764 2.31778C11.9764 2.47236 11.915 2.62062 11.8057 2.73C11.7521 2.78503 11.688 2.82877 11.6171 2.85864C11.5463 2.8885 11.4702 2.90389 11.3933 2.90389C11.3165 2.90389 11.2404 2.8885 11.1695 2.85864C11.0987 2.82877 11.0346 2.78503 10.9809 2.73C9.9998 1.81273 8.73246 1.26138 7.39226 1.16876C6.05206 1.07615 4.72086 1.44794 3.62279 2.22152C2.52471 2.99511 1.72683 4.12325 1.36345 5.41602C1.00008 6.70879 1.09342 8.08723 1.62775 9.31926C2.16209 10.5513 3.10478 11.5617 4.29713 12.1803C5.48947 12.7989 6.85865 12.988 8.17414 12.7157C9.48963 12.4435 10.6711 11.7264 11.5196 10.6854C12.3681 9.64432 12.8319 8.34282 12.8328 7C12.8328 6.84529 12.8943 6.69692 13.0038 6.58752C13.1132 6.47812 13.2616 6.41667 13.4164 6.41667C13.5712 6.41667 13.7196 6.47812 13.8291 6.58752C13.9385 6.69692 14 6.84529 14 7C14 8.85651 13.2622 10.637 11.9489 11.9497C10.6356 13.2625 8.85432 14 6.99701 14Z"
- fill="currentColor"
- />
- </g>
- <defs>
- <clippath>
- <rect
- fill="white"
- height="14"
- width="14"
- />
- </clippath>
- </defs>
- </svg>
</span>
<label
class="col-lg-2 col-md-2 col-sm-12"
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/schedulingunit.list.test.js.snap b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/schedulingunit.list.test.js.snap
index 036c3cf4962d42055b5ed45c555c6d34aa6897ed..a0152c05790de6d8ce31aa942483c76d440924a6 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/schedulingunit.list.test.js.snap
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/__snapshots__/schedulingunit.list.test.js.snap
@@ -53,7 +53,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class="p-dropdown p-component p-inputwrapper p-inputwrapper-filled"
data-pc-name="dropdown"
data-pc-section="root"
- style="width: 13em; margin-left: 0.5em;"
+ style="width: 18em; margin-left: 0.5em;"
>
<div
class="p-hidden-accessible"
@@ -486,13 +486,13 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class="viewtable"
data-testid="viewtable"
role="table"
- style="min-width: 1260px;"
+ style="min-width: 1200px;"
>
<thead>
<tr
data-testid="tablerows"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<th
class="fixed-column-td"
@@ -1419,47 +1419,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="cursor: col-resize;"
/>
</th>
- <th
- class="notfixed-column-td-CentralLST"
- role="tablehead"
- style="display: flex;"
- >
- <div
- style="display: flex;"
- >
- <div
- style="display: grid; vertical-align: bottom;"
- >
- <div
- class=""
- colspan="1"
- role="columnheader"
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
- >
- <div
- aria-describedby="rbd-hidden-text-0-hidden-text-0"
- data-rbd-drag-handle-context-id="0"
- data-rbd-drag-handle-draggable-id="Central LST"
- data-rbd-draggable-context-id="0"
- data-rbd-draggable-id="Central LST"
- draggable="false"
- role="button"
- style="transform: translate(0,0); user-select: none; cursor: default;"
- tabindex="0"
- >
- Central LST
- </div>
- </div>
- <div />
- </div>
- </div>
- <div
- class="resizer "
- draggable="false"
- role="separator"
- style="cursor: col-resize;"
- />
- </th>
</tr>
</thead>
<tbody
@@ -1469,7 +1428,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -1679,15 +1638,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -1695,7 +1645,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -1905,15 +1855,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -1921,7 +1862,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -2131,15 +2072,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -2147,7 +2079,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -2357,15 +2289,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -2373,7 +2296,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -2583,15 +2506,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -2599,7 +2513,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -2857,15 +2771,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -2873,7 +2778,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -3107,15 +3012,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -3123,7 +3019,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -3381,15 +3277,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -3397,7 +3284,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -3631,15 +3518,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -3647,7 +3525,7 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -3881,15 +3759,6 @@ exports[`Schedulinng Unit List Schedulinng List correctly with data 1`] = `
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -5516,7 +5385,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class="p-dropdown p-component p-inputwrapper p-inputwrapper-filled"
data-pc-name="dropdown"
data-pc-section="root"
- style="width: 13em; margin-left: 0.5em;"
+ style="width: 18em; margin-left: 0.5em;"
>
<div
class="p-hidden-accessible"
@@ -5949,13 +5818,13 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class="viewtable"
data-testid="viewtable"
role="table"
- style="min-width: 1260px;"
+ style="min-width: 1200px;"
>
<thead>
<tr
data-testid="tablerows"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<th
class="fixed-column-td"
@@ -6040,7 +5909,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
title="Toggle SortBy"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Scheduling Unit ID"
data-rbd-draggable-context-id="1"
@@ -6091,7 +5960,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Project"
data-rbd-draggable-context-id="1"
@@ -6143,7 +6012,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
title="Toggle SortBy"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Name"
data-rbd-draggable-context-id="1"
@@ -6199,7 +6068,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
title="Toggle SortBy"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Description"
data-rbd-draggable-context-id="1"
@@ -6250,7 +6119,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Project Rank"
data-rbd-draggable-context-id="1"
@@ -6292,7 +6161,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
title="Toggle SortBy"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Priority Queue"
data-rbd-draggable-context-id="1"
@@ -6357,7 +6226,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
title="Toggle SortBy"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Scheduling Set"
data-rbd-draggable-context-id="1"
@@ -6408,7 +6277,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Template Name"
data-rbd-draggable-context-id="1"
@@ -6459,7 +6328,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Template Description"
data-rbd-draggable-context-id="1"
@@ -6510,7 +6379,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Duration (HH:mm:ss)"
data-rbd-draggable-context-id="1"
@@ -6572,7 +6441,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Stations (CS/RS/IS)"
data-rbd-draggable-context-id="1"
@@ -6613,7 +6482,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Tasks content (O/P/I)"
data-rbd-draggable-context-id="1"
@@ -6654,7 +6523,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Number of SAPs in the target observation"
data-rbd-draggable-context-id="1"
@@ -6695,7 +6564,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Target - Name"
data-rbd-draggable-context-id="1"
@@ -6736,7 +6605,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Target - Angle 1"
data-rbd-draggable-context-id="1"
@@ -6777,7 +6646,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Target - Angle 2"
data-rbd-draggable-context-id="1"
@@ -6818,7 +6687,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Target - Reference Frame"
data-rbd-draggable-context-id="1"
@@ -6859,7 +6728,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
>
<div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
+ aria-describedby="rbd-hidden-text-1-hidden-text-40"
data-rbd-drag-handle-context-id="1"
data-rbd-drag-handle-draggable-id="Cancelled"
data-rbd-draggable-context-id="1"
@@ -6882,47 +6751,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="cursor: col-resize;"
/>
</th>
- <th
- class="notfixed-column-td-CentralLST"
- role="tablehead"
- style="display: flex;"
- >
- <div
- style="display: flex;"
- >
- <div
- style="display: grid; vertical-align: bottom;"
- >
- <div
- class=""
- colspan="1"
- role="columnheader"
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px; position: relative;"
- >
- <div
- aria-describedby="rbd-hidden-text-1-hidden-text-41"
- data-rbd-drag-handle-context-id="1"
- data-rbd-drag-handle-draggable-id="Central LST"
- data-rbd-draggable-context-id="1"
- data-rbd-draggable-id="Central LST"
- draggable="false"
- role="button"
- style="transform: translate(0,0); user-select: none; cursor: default;"
- tabindex="0"
- >
- Central LST
- </div>
- </div>
- <div />
- </div>
- </div>
- <div
- class="resizer "
- draggable="false"
- role="separator"
- style="cursor: col-resize;"
- />
- </th>
</tr>
</thead>
<tbody
@@ -6932,7 +6760,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -7142,15 +6970,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -7158,7 +6977,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -7368,15 +7187,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -7384,7 +7194,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -7594,15 +7404,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -7610,7 +7411,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -7820,15 +7621,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -7836,7 +7628,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -8046,15 +7838,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -8062,7 +7845,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -8320,15 +8103,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -8336,7 +8110,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -8570,15 +8344,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -8586,7 +8351,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -8844,15 +8609,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -8860,7 +8616,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -9094,15 +8850,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
@@ -9110,7 +8857,7 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
class=""
data-testid="tablerow"
role="row"
- style="display: flex; flex: 1 0 auto; min-width: 1260px;"
+ style="display: flex; flex: 1 0 auto; min-width: 1200px;"
>
<td
class="fixed-column-td"
@@ -9344,15 +9091,6 @@ exports[`Schedulinng Unit List Lite Schedulinng List Lite correctly with data
style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
>
- </div>
- </td>
- <td
- class="notfixed-column-td-CentralLST"
- >
- <div
- style="box-sizing: border-box; flex: 150 0 auto; min-width: 60px; width: 150px;"
- >
-
</div>
</td>
</tr>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/report.project.test.js b/SAS/TMSS/frontend/tmss_webapp/src/tests/report.project.test.js
index 0ca3813ba236c6d92399f6ed97e4f7373f2537c1..e4af76ecca8bebdac69822519a76fccd4ea951c7 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/report.project.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/report.project.test.js
@@ -101,6 +101,10 @@ describe('Project Report Render With Contents', () => {
const anchorElement = component.container.querySelector(".report-calendar");
expect(anchorElement).toBeInTheDocument();
});
+ await waitFor(() => {
+ expect(component.container.querySelector('.p-autocomplete-loader')).toBeNull();
+ }, { timeout: 5000 });
+
const componentSnapshotAfterCsv = component.asFragment();
expect(componentSnapshotAfterCsv).toMatchSnapshot("After CSV Generation");
await waitFor(() => {
@@ -112,6 +116,12 @@ describe('Project Report Render With Contents', () => {
await waitFor(() => {
expect(component.container.querySelector('.p-icon-spin')).toBeNull();
}, { timeout: 5000 });
+
+ await waitFor(() => {
+ expect(component.container.querySelector('.p-autocomplete-loader')).toBeNull();
+ }, { timeout: 5000 });
+
+
const componentSnapshotAfterClear = component.asFragment();
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/tests/workflow.test.js b/SAS/TMSS/frontend/tmss_webapp/src/tests/workflow.test.js
index a0d317570f103a6bfa3dca772ef787384ec0bdaa..67c407ddc3318f2882c70bbff71be0578128cd6b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/tests/workflow.test.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/tests/workflow.test.js
@@ -16,7 +16,7 @@ import qa_scheduling_unit_blueprint_exttended_withtasks from "../__mocks__/qa_sc
import qa_scheduling_unit_blueprint_extended_subtasks from "../__mocks__/qa_scheduling_unit_blueprint_extended_subtasks.json";
import { remove404Errors } from "../utils/test.helper";
import Workflow from "../routes/Workflow";
-import { LocalStorageMock, MakeLocalStorageMock } from "./localstoragemocks";
+import { LocalStorageMock } from "./localstoragemocks";
const qaflowitem = {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/utils/test.helper.js b/SAS/TMSS/frontend/tmss_webapp/src/utils/test.helper.js
index d5cbae8c580b2c2354f872fbc6ac6059c0888e4f..29a2068714d921223ebec8c9dea26cae289c310f 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/utils/test.helper.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/utils/test.helper.js
@@ -4,7 +4,7 @@ import {BrowserRouter as Router} from "react-router-dom";
import { load} from 'cheerio';
import beautify from 'js-beautify';
-const TIMEOUT = 10
+const TIMEOUT = 5
export async function clickItem(item, timeout = TIMEOUT) {
await act(async () => {
@@ -34,7 +34,7 @@ export async function renderPage(pageComponent) {
let content;
await act(async () => {
content = render(<Router>{pageComponent}</Router>);
- await new Promise((r) => setTimeout(r, 10));
+ await new Promise((r) => setTimeout(r, 5));
});
return content;
}