From 0cad3a52b1204df6995b9a16891770e2bf60195c Mon Sep 17 00:00:00 2001
From: unknown <n.santhanam@redkarma.eu>
Date: Mon, 17 Aug 2020 11:02:31 +0530
Subject: [PATCH] TMSS-297
Page Header Updated
---
SAS/TMSS/frontend/tmss_webapp/src/App.js | 19 +++++++--
.../src/layout/components/AppBreadcrumb.js | 4 +-
.../tmss_webapp/src/routes/Dashboard/index.js | 4 +-
.../tmss_webapp/src/routes/Project/create.js | 8 +---
.../tmss_webapp/src/routes/Project/edit.js | 6 +--
.../tmss_webapp/src/routes/Project/list.js | 5 +--
.../tmss_webapp/src/routes/Project/view.js | 7 +---
.../routes/Scheduling/SchedulingUnitList.js | 4 +-
.../routes/Scheduling/ViewSchedulingUnit.js | 9 ++---
.../src/routes/Scheduling/index.js | 2 +-
.../tmss_webapp/src/routes/Task/edit.js | 3 --
.../tmss_webapp/src/routes/Task/view.js | 3 --
.../frontend/tmss_webapp/src/routes/index.js | 39 ++++++++++++-------
13 files changed, 57 insertions(+), 56 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/App.js b/SAS/TMSS/frontend/tmss_webapp/src/App.js
index 4445c3bf0ce..19b52034e06 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/App.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/App.js
@@ -23,6 +23,7 @@ class App extends Component {
layoutMode: 'static',
currentMenu: '',
currentPath: '/',
+ currentPageName:'',
staticMenuInactive: false,
overlayMenuActive: false,
mobileMenuActive: false,
@@ -31,6 +32,7 @@ class App extends Component {
this.onToggleMenu = this.onToggleMenu.bind(this);
this.onSidebarClick = this.onSidebarClick.bind(this);
this.onMenuItemClick = this.onMenuItemClick.bind(this);
+ this.setCurrentPageName = this.setCurrentPageName.bind(this);
this.menu = [
{label: 'Dashboard', icon: 'pi pi-fw pi-home', to:'/dashboard'},
@@ -87,6 +89,12 @@ class App extends Component {
isDesktop() {
return window.innerWidth > 1024;
}
+
+ setCurrentPageName(currentPageName) {
+ if (currentPageName !== this.state.currentPageName) {
+ this.setState({ currentPageName })
+ }
+ }
render() {
const wrapperClass = classNames('layout-wrapper', {
@@ -96,7 +104,8 @@ class App extends Component {
'layout-overlay-sidebar-active': this.state.overlayMenuActive && this.state.layoutMode === 'overlay',
'layout-mobile-sidebar-active': this.state.mobileMenuActive
});
- const AppBreadCrumbWithRouter = withRouter(AppBreadcrumb);
+ const AppBreadCrumbWithRouter = withRouter(AppBreadcrumb);
+
return (
<React.Fragment>
@@ -105,10 +114,12 @@ class App extends Component {
<div className={wrapperClass}>
<AppTopbar onToggleMenu={this.onToggleMenu}></AppTopbar>
<Router basename={ this.state.currentPath }>
- <AppMenu model={this.menu} onMenuItemClick={this.onMenuItemClick} />
+ <AppMenu model={this.menu} onMenuItemClick={this.onMenuItemClick} />
<div className="layout-main">
- <AppBreadCrumbWithRouter/>
- <RoutedContent />
+ <AppBreadCrumbWithRouter setCurrentPageName={this.setCurrentPageName} />
+ {/* Display current pagename */}
+ <h2>{this.state.currentPageName}</h2>
+ <RoutedContent />
</div>
</Router>
<AppFooter></AppFooter>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppBreadcrumb.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppBreadcrumb.js
index 0abba394b1c..eec54bcbc70 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppBreadcrumb.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/AppBreadcrumb.js
@@ -27,11 +27,13 @@ export class AppBreadcrumb extends Component {
onRoute() {
const { breadcrumbs } = this.state;
+ const { setCurrentPageName } = this.props;
const currentRoute = routes.find(route => matchPath(this.props.location.pathname, {path: route.path, exact: true, strict: true}));
//for intial route ,there wont be any route object so it failed
if(!currentRoute){
return;
- }
+ }
+ setCurrentPageName(currentRoute.pageTitle);
if (!breadcrumbs.length) {
this.setState({ breadcrumbs: [{...this.props.location, name: currentRoute.name}] });
return;
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Dashboard/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Dashboard/index.js
index a0a798161d6..2eddc5b4392 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Dashboard/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Dashboard/index.js
@@ -8,9 +8,7 @@ export class Dashboard extends Component {
console.log(this.props)
}
render() {
- return (
- <h1>Dashboard</h1>
- );
+ return 'Welcome TMSS';
}
}
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 e8df560a75c..e400bf2f3d5 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/create.js
@@ -334,13 +334,9 @@ export class ProjectCreate extends Component {
<React.Fragment>
<div className="p-grid">
<Growl ref={(el) => this.growl = el} />
-
- <div className="p-col-10 p-lg-10 p-md-10">
- <h2>Project - Add</h2>
- </div>
- <div className="p-col-2 p-lg-2 p-md-2">
+ <div className="p-col-2 p-lg-2 p-md-2">
<Link to={{ pathname: '/project'}} tite="Close Edit" style={{float: "right"}}>
- <i className="fa fa-window-close" style={{marginTop: "10px"}}></i>
+ <i className="fa fa-window-close" style={{position:"absolute",top: "105px",marginLeft:"863px"}}></i>
</Link>
</div>
</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 78b443a5c2d..0136988f137 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/edit.js
@@ -358,13 +358,9 @@ export class ProjectEdit extends Component {
<React.Fragment>
<div className="p-grid">
<Growl ref={(el) => this.growl = el} />
-
- <div className="p-col-10 p-lg-10 p-md-10">
- <h2>Project - Edit</h2>
- </div>
<div className="p-col-2 p-lg-2 p-md-2">
<Link to={{ pathname: `/project/view/${this.state.project.name}`}} title="Close Edit" style={{float: "right"}}>
- <i className="fa fa-window-close" style={{marginTop: "10px"}}></i>
+ <i className="fa fa-window-close" style={{position: "absolute",top: "105px",marginLeft: "875px"}}></i>
</Link>
</div>
</div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
index af3869b13dd..f47fc36beca 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/list.js
@@ -71,12 +71,9 @@ export class ProjectList extends Component{
return(
<>
<div className="p-grid">
- <div className="p-col-10 p-lg-10 p-md-10">
- <h2>Project - List </h2>
- </div>
<div className="p-col-2 p-lg-2 p-md-2">
<Link to={{ pathname: '/project/create'}} title="Add New Project" style={{float: "right"}}>
- <i className="fa fa-plus-square" style={{marginTop: "10px"}}></i>
+ <i className="fa fa-plus-square" style={{top: "105px",position: "absolute",marginLeft: "865px"}}></i>
</Link>
</div>
</div>
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 1d92160e998..eca8951d2d9 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Project/view.js
@@ -80,17 +80,14 @@ export class ProjectView extends Component {
return (
<React.Fragment>
<div className="p-grid">
- <div className="p-col-10 p-lg-10 p-md-10">
- <h2>Project - Details </h2>
- </div>
{ this.state.project &&
<div className="p-col-2 p-lg-2 p-md-2">
<Link to={{ pathname: `/project`}} title="Close View" style={{float: "right"}}>
- <i className="fa fa-times" style={{marginTop: "10px", marginLeft: "5px"}}></i>
+ <i className="fa fa-times" style={{position:"absolute",top:"105px",marginLeft:"870px"}}></i>
</Link>
<Link to={{ pathname: `/project/edit/${this.state.project.name}`, state: {id: this.state.project?this.state.project.name:''}}} title="Edit Project"
style={{float: "right"}}>
- <i className="fa fa-edit" style={{marginTop: "10px"}}></i>
+ <i className="fa fa-edit" style={{position:"absolute",top:"105px",marginLeft:"845px"}}></i>
</Link>
</div>
}
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 7c2913af9f4..4ef6b176343 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/SchedulingUnitList.js
@@ -1,8 +1,8 @@
import React, { Component } from 'react'
import 'primeflex/primeflex.css';
-import AppLoader from "./../../layout/components/AppLoader";
-import ViewTable from './../../components/ViewTable';
+import AppLoader from "../../layout/components/AppLoader";
+import ViewTable from '../../components/ViewTable';
import ScheduleService from '../../services/schedule.service';
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 4b3c24179fb..eaececbd9a8 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -73,17 +73,14 @@ class ViewSchedulingUnit extends Component{
return(
<>
<div className="p-grid">
- <div className="p-col-10">
- <h2>Scheduling Unit - Details </h2>
- </div>
- <div className="p-col-2">
+ <div className="p-col-2">
<Link to={{ pathname: '/schedulingunit'}} title="Close"
style={{float:'right'}}>
- <i className="fa fa-times" style={{marginTop: "10px", marginLeft: '5px'}}></i>
+ <i className="fa fa-times" style={{position:"absolute",top:"105px",marginLeft:"870px"}}></i>
</Link>
<Link to={{ pathname: '/schedulingunit/edit', state: {id: this.state.scheduleunit?this.state.scheduleunit.id:''}}} title="Edit"
style={{float:'right'}}>
- <i className="fa fa-edit" style={{marginTop: "10px"}}></i>
+ <i className="fa fa-edit" style={{position:"absolute",top:"105px",marginLeft:"845px"}}></i>
</Link>
</div>
</div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/index.js
index 062317b2127..81a439da72d 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/index.js
@@ -14,7 +14,7 @@ export class Scheduling extends Component {
render() {
return (
<>
- <h2>Scheduling Unit - List</h2>
+
{this.state.scheduleunit &&
<SchedulingUnitList /> }
</>
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 90ad6359847..14aa1457928 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/edit.js
@@ -188,9 +188,6 @@ export class TaskEdit extends Component {
return (
<React.Fragment>
<div className="p-grid">
- <div className="p-col-10 p-lg-10 p-md-10">
- <h2>Task - Edit</h2>
- </div>
<div className="p-col-2 p-lg-2 p-md-2">
<Link to={{ pathname: `/task/view/draft/${this.state.task?this.state.task.id:''}`}} title="Close Edit"
style={{float: "right"}} >
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 a8d612e25fe..66f6f11db4b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
@@ -127,9 +127,6 @@ export class TaskView extends Component {
return (
<React.Fragment>
<div className="p-grid">
- <div className="p-col-10 p-lg-10 p-md-10">
- <h2>Task - Details </h2>
- </div>
<div className="p-col-2 p-lg-2 p-md-2">
{this.state.taskType === 'draft' &&
<div>
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
index 8d4c6379325..8efb26f988e 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/index.js
@@ -15,55 +15,68 @@ import ViewSchedulingUnit from './Scheduling/ViewSchedulingUnit'
export const routes = [
{
path: "/not-found",
- component: NotFound
+ component: NotFound,
+
},{
path: "/dashboard",
component: Dashboard,
- name: 'Dashboard'
+ name: 'Dashboard',
+ pageTitle: 'Dashboard'
},{
path: "/schedulingunit",
component: Scheduling,
- name: 'Scheduling Unit'
+ name: 'Scheduling Unit',
+ pageTitle: 'Scheduling Unit - List'
},{
path: "/task",
component: TaskView,
- name: 'Task'
+ name: 'Task',
+ pageTitle: 'Task-View'
},{
path: "/task/view",
component: TaskView,
- name: 'Task'
+ name: 'Task',
+ pageTitle: 'Task View'
},{
path: "/task/view/:type/:id",
component: TaskView,
- name: 'Task Details'
+ name: 'Task Details',
+ pageTitle: 'Task Details'
},{
path: "/task/edit",
component: TaskEdit,
- name: 'Task Edit'
+ name: 'Task Edit',
+ pageTitle: 'Task-Edit'
},{
path: "/schedulingunit/view",
component: ViewSchedulingUnit,
- name: 'Scheduling View'
+ name: 'Scheduling View',
+ pageTitle: 'Scheduling Unit - Details'
},{
path: "/project",
component: ProjectList,
- name: 'Project List'
+ name: 'Project List',
+ pageTitle: 'Project - List'
},{
path: "/project/create",
component: ProjectCreate,
- name: 'Project Add'
+ name: 'Project Add',
+ pageTitle: 'Project - Add'
},{
path: "/project/view",
component: ProjectView,
- name: 'Project View'
+ name: 'Project View',
+ pageTitle: 'Project - Details '
},{
path: "/project/view/:id",
component: ProjectView,
- name: 'Project View'
+ name: 'Project View',
+ pageTitle: 'Project - View'
},{
path: "/project/edit/:id",
component: ProjectEdit,
- name: 'Project Edit'
+ name: 'Project Edit',
+ pageTitle: 'Project - Edit'
},
];
--
GitLab