diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js
index 06521dd203b56cbe59f48143d249bf0fcca8581b..fdd553470409b4baabaa44d163371107e655918b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js
@@ -21,6 +21,7 @@ export default ({ title, subTitle, actions, ...props}) => {
};
const onButtonClick = (e, action) => {
+ e.preventDefault()
if (action.actOn && action.actOn === 'click') {
action.props.callback(e);
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
index 69343342fa45cd136a6d381b479772b72b791496..f1574f653ba783ced7d03bc887167c62474e1647 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Cycle/view.js
@@ -35,6 +35,7 @@ export class CycleView extends Component {
} else if (this.props.location.state && this.props.location.state.id) {
this.state.cycleId = this.props.location.state.id;
}
+ this.cancelView = this.cancelView.bind(this);
this.state.redirect = this.state.cycleId?"":'/cycle' // If no cycle id is passed, redirect to cycle list page
this.resourceUnitMap = UnitConverter.resourceUnitMap; // Resource unit conversion factor and constraints
}
@@ -50,6 +51,10 @@ export class CycleView extends Component {
this.setState({userrole: permission});
}
+ cancelView(){
+ this.props.history.length>1?this.props.history.goBack():this.props.history.push(`/cycle`);
+ }
+
/**
* To get the cycle details from the backend using the service
*
@@ -110,7 +115,8 @@ export class CycleView extends Component {
disabled: cycle.edit? !cycle.edit:true,
props:{ pathname: `/cycle/edit/${this.state.cycle.name}`,
state: {id: this.state.cycle?this.state.cycle.name:''}}},
- {icon: 'fa-window-close',props:{ pathname: `/cycle`}}]}/>
+ {icon: 'fa-window-close',
+ type: 'button', actOn: 'click', props:{ callback: this.cancelView }}]}/>
{ this.state.isLoading && <AppLoader /> }
{ this.state.cycle &&
<React.Fragment>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
index a601e164abe70f6df3db6e127befc062530e55e8..c929cc47ff51366a4f128600ed27d16622d3b9f0 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
@@ -32,6 +32,7 @@ export class ProjectView extends Component {
} else if (this.props.location.state && this.props.location.state.id) {
this.state.projectId = this.props.location.state.id;
}
+ this.cancelView = this.cancelView.bind(this);
this.state.redirect = this.state.projectId?"":'/project' // If no project id is passed, redirect to Project list page
this.resourceUnitMap = UnitConverter.resourceUnitMap; // Resource unit conversion factor and constraints
}
@@ -64,6 +65,9 @@ export class ProjectView extends Component {
}
}
+ cancelView(){
+ this.props.history.length>1?this.props.history.goBack():this.props.history.push(`/project`);
+ }
/**
* To get the project details from the backend using the service
*
@@ -116,7 +120,7 @@ export class ProjectView extends Component {
disabled: this.state.permissionById[this.state.projectId].edit?!this.state.permissionById[this.state.projectId].edit:true,
props : { pathname: `/project/edit/${this.state.project.name}`,
state: {id: this.state.project?this.state.project.name:''&& this.state.project}}},
- {icon:'fa-window-close',title: 'Click to Close Project View', props : { pathname:'/project' }}]}/>
+ {icon:'fa-window-close',title: 'Click to Close Project View', type: 'button', actOn: 'click', props:{ callback: this.cancelView }}]}/>
{ this.state.isLoading && <AppLoader /> }
{ this.state.project &&
<React.Fragment>
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 cf35f965e7985db1450c934b40854aaf06aad620..9e5b75d2c0f4ca41322be9a61110f2cf864f76f7 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
@@ -364,7 +364,7 @@ export class ReservationCreate extends Component {
*/
cancelCreate() {
publish('edit-dirty', false);
- this.props.history.length>1?this.props.history.goBack():this.props.history.push(`/reservation/list`);
+ this.props.history.length>1?this.props.history.goBack():this.props.history.push(`/su/timelineview`);
this.setState({ showDialog: false });
}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
index aff992ee5c742cd9420160633e040d3539b7581a..351f79852bb544acdd3f6ed3eb4de310fecf4e58 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Reservation/reservation.list.js
@@ -132,6 +132,7 @@ export class ReservationList extends Component{
this.deleteReservations = this.deleteReservations.bind(this);
this.closeDialog = this.closeDialog.bind(this);
this.getReservationDialogContent = this.getReservationDialogContent.bind(this);
+ this.closeList = this.closeList.bind(this);
}
async componentDidMount() {
@@ -375,6 +376,10 @@ export class ReservationList extends Component{
this.setState({dialogVisible: false});
}
+ closeList(){
+ this.props.history.length>1?this.props.history.goBack():this.props.history.push(`/su/timelineview`);
+ }
+
/**
* Create confirmation dialog details
*/
@@ -440,7 +445,7 @@ export class ReservationList extends Component{
title:permissions.create?'Add Reservation': "Don't have permission to add new Reservation",
disabled: permissions.create? !permissions.create: true,
props : { pathname: `/reservation/create`}},
- {icon: 'fa-window-close', title:'Click to close Reservation list', props : { pathname: `/su/timelineview`}}]}/>
+ {icon: 'fa-window-close', title:'Click to close Reservation list', type: 'button', actOn: 'click', props:{ callback: this.closeList }}]}/>
{this.state.isLoading? <AppLoader /> : (this.state.reservationsList && this.state.reservationsList.length>0) ?
<>
{permissions.list?
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 e7238d9f82204f4778ccbeaa6396e4a03bef6d13..317af97890272329a68a883aa91da0a1f0aa1bfb 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -202,6 +202,7 @@ class ViewSchedulingUnit extends Component {
this.getCleanUpDialogContent = this.getCleanUpDialogContent.bind(this);
this.cleanUpSUTask = this.cleanUpSUTask.bind(this);
this.confirmAutoDeletion = this.confirmAutoDeletion.bind(this);
+ this.cancelView = this.cancelView.bind(this);
}
componentDidUpdate(prevProps, prevState) {
@@ -234,6 +235,10 @@ class ViewSchedulingUnit extends Component {
}
+ cancelView(){
+ this.props.history.length>1?this.props.history.goBack():this.props.history.push(`/schedulingunit`);
+ }
+
toggleBySorting = (sortData) => {
UtilService.localStore({ type: 'set', key: this.lsKeySortColumn, value: sortData });
}
@@ -358,7 +363,7 @@ class ViewSchedulingUnit extends Component {
disabled: userPermissions.scheduleunit && userPermissions.scheduleunit.delete?canDelete?false:true : true,
type: 'button', actOn: 'click', props: { callback: this.showDeleteSUConfirmation }
});
- this.actions.push({ icon: 'fa-window-close', title: 'Click to Close Scheduling Unit View', props: { pathname: `/schedulingunit`}});
+ this.actions.push({ icon: 'fa-window-close', title: 'Click to Close Scheduling Unit View', type: 'button', actOn: 'click', props:{ callback: this.cancelView }});
if (this.props.match.params.type ==='draft') {
let blueprintExist = this.state.scheduleunit && this.state.scheduleunit.scheduling_unit_blueprints && this.state.scheduleunit.scheduling_unit_blueprints.length>0;
if(isIngestPresent) {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
index 87738a7e4fc3822256356c65f6cd6adde524c077..469d74e003a336fb6e0835ced484ac2fad8f135d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/excelview.schedulingset.js
@@ -2100,7 +2100,7 @@ export class SchedulingSetCreate extends Component {
*/
cancelCreate() {
publish('edit-dirty', false);
- this.setState({redirect: '/schedulingunit'});
+ this.props.history.length>1?this.props.history.goBack():this.props.history.push(`/schedulingunit`);
}
/**
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
index 98aa09fb663ba4e76433fedf35ccbb51857cd61a..08cef3568329ab7207e674a9987e8797f7aad07b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
@@ -44,6 +44,7 @@ export class TaskView extends Component {
this.getTaskDeleteDialogContent = this.getTaskDeleteDialogContent.bind(this);
this.showCancelConfirmation = this.showCancelConfirmation.bind(this);
this.cancelTask = this.cancelTask.bind(this);
+ this.cancelView = this.cancelView.bind(this);
if (this.props.match.params.id) {
@@ -178,6 +179,10 @@ export class TaskView extends Component {
this.setState({confirmDialogVisible: false});
}
+ cancelView(){
+ this.props.history.length>1?this.props.history.goBack():this.props.history.push(`/project`);
+ }
+
/**
* Delete Task
*/
@@ -280,7 +285,7 @@ export class TaskView extends Component {
this.state.permissionById && this.state.permissionById[this.state.taskId].delete? 'Delete Task': `${this.access_denied_message} to delete`,
type: 'button', disabled: this.state.hasBlueprint, actOn: 'click', props:{ callback: this.showDeleteConfirmation}});
actions.push({ icon: 'fa-window-close', link: this.props.history.goBack,
- title:'Click to Close Task', props : { pathname:'/task' }});
+ title:'Click to Close Task', type: 'button', actOn: 'click', props:{ callback: this.cancelView }});
// Child component to render predecessors and successors list
const TaskRelationList = ({ list }) => (
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
index 9b7b0c2bc5b82147484c10579a442c3246e11382..97ad351b03c623732397f87ef766ac4d3f069ab4 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Timeline/week.view.js
@@ -90,9 +90,11 @@ export class WeekTimelineView extends Component {
async componentDidMount() {
const permission = await AuthUtil.getUserRolePermission();
+ const timelinePermission = permission.userRolePermission.timeline;
const weekviewPermission = permission.userRolePermission.weekoverview;
- let menuOptions = [{ label: 'Add Reservation', icon: "fa fa-", disabled: !weekviewPermission.addreservation, command: () => { this.selectOptionMenu('Add Reservation') } },
- { label: 'Reservation List', icon: "fa fa-", disabled: !weekviewPermission.listreservation, command: () => { this.selectOptionMenu('Reservation List') } },
+ let menuOptions = [{ label: 'Add Reservation', icon: "fa fa-", disabled: !timelinePermission.addreservation, command: (e) => { this.selectOptionMenu(e, 'Add Reservation') } },
+ { label: 'Reservation List', icon: "fa fa-", disabled: !timelinePermission.listreservation, command: (e) => {
+ this.selectOptionMenu(e, 'Reservation List') } },
]
this.setState({menuOptions: menuOptions, userPermission: weekviewPermission});
@@ -476,16 +478,26 @@ export class WeekTimelineView extends Component {
this.optionsMenu.toggle(event);
}
- selectOptionMenu(menuName) {
+ selectOptionMenu(e, menuName) {
switch (menuName) {
case 'Reservation List': {
- this.props.history.push('/reservation/list');
- this.setState({ redirect: `/reservation/list` });
+ if(e.originalEvent.ctrlKey) {
+ window.open('/reservation/list','_blank');
+ }
+ else {
+ this.props.history.push('/reservation/list');
+ this.setState({ redirect: `/reservation/list` });
+ }
break;
}
case 'Add Reservation': {
- this.props.history.push('/reservation/create');
- this.setState({ redirect: `/reservation/create` });
+ if(e.originalEvent.ctrlKey) {
+ window.open('/reservation/create','_blank');
+ }
+ else {
+ this.props.history.push('/reservation/create')
+ this.setState({ redirect: `/reservation/create`});
+ }
break;
}
default: {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
index f6dd7d2b24f0d022e59aaae94f89086c4d969c13..43a99a7955af30d8cdc478e9eb59ece2b0454646 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/index.js
@@ -238,6 +238,9 @@ export default (props) => {
let title = getStepItems()[currentView - 1].label;
return title;
}
+ const cancelView = () => {
+ props.history.length>1? props.history.goBack(): props.history.push(`/su/workflow`);
+ }
return (
@@ -246,7 +249,7 @@ export default (props) => {
{currentStep &&
<PageHeader location={props.location} title={getTitle()}
actions={[{type:'ext_link', icon:'', label: 'SDC Helpdesk', title: 'Report major issues here', props: { pathname: 'https://support.astron.nl/sdchelpdesk' } },
- {icon: 'fa-window-close', link: props.history.goBack, title: 'Click to Close Workflow', props: { pathname: '/su/workflow' } },
+ {icon: 'fa-window-close', title: 'Click to Close Workflow', type: 'button', actOn: 'click', props:{ callback: cancelView }},
]} />}
{loader && <AppLoader />}
{!loader && schedulingUnit &&
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js
index 824828fa36fa4c121d711575bea38e4aba974cff..73e4ca30312e6b75557c7092bd2af9901dd05a2e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Workflow/workflow.list.js
@@ -295,8 +295,7 @@ class WorkflowList extends Component{
{project && project.list ?
<>
<PageHeader location={this.props.location} title={'Workflow - List'}
- actions={[{icon: 'fa-window-close', title:'Click to Close Workflow - List',
- type: 'button', actOn: 'click', props:{ callback: this.close }}]}/>
+ actions={[]}/>
<div style={{marginTop: '15px'}}>
{this.state.isLoading ? <AppLoader/> : (this.state.workflowProcessList.length>0 )?
<>