Commented out route and links related to viewing job monitoring dashb…

…oard. Also renamed and moved CSS class needed by Health Dashboard to _Grid.scss file and updated references to CSS class.
unity-sds · Aug 12, 2024 · 3bc61e5 · 3bc61e5
1 parent 795c57f
commit 3bc61e5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/src/Root.tsx b/src/Root.tsx
@@ -5,7 +5,7 @@ import {
 
 import Home from "./routes/home";
 import HealthDashboard from "./routes/health-dashboard";
-import JobMonitoring from "./routes/jobs/monitoring";
+//import JobMonitoring from "./routes/jobs/monitoring";
 //import NewJob from "./routes/jobs/new";
 
 import Navbar from "./components/Navbar"
@@ -71,9 +71,9 @@ function Root() {
               }
               {/*<Route path="/applications/catalog" element={<WebView url={Config.ads.url} />} />*/}
               <Route path="/health-dashboard" element={<HealthDashboard />} />
-              <Route path="/jobs/monitoring" element={<JobMonitoring />} />
+              {/*<Route path="/jobs/monitoring" element={<JobMonitoring />} />
               <Route path="/jobs/monitoring/:jobid_param" element={<JobMonitoring />} />
-              {/*<Route path="/jobs/new" element={<NewJob />} />*/}
+              <Route path="/jobs/new" element={<NewJob />} />*/}
               {
                 /* Add routes for job execution forms */
                 processes.map( (item) => {

diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
@@ -77,10 +77,10 @@ export default function Navbar() {
                         <MenuItem>
                            <NavLink to="/">Home</NavLink>
                         </MenuItem>
+                        {/* <MenuItem>
                         <MenuItem>
                            <NavLink to="/jobs/monitoring">Job Monitoring</NavLink>
                         </MenuItem>
-                        {/* <MenuItem>
                            <NavLink to="/jobs/new">Create New Job</NavLink>
                         </MenuItem> */}
                         <MenuItem>
@@ -148,10 +148,10 @@ export default function Navbar() {
                         <MenuItem>
                            <NavLink to="/">Home</NavLink>
                         </MenuItem>
+                        {/* <MenuItem>
                         <MenuItem>
                            <NavLink to="/jobs/monitoring">Job Monitoring</NavLink>
                         </MenuItem>
-                        {/* <MenuItem>
                            <NavLink to="/jobs/new">Create New Job</NavLink>
                         </MenuItem> */}
                         <MenuItem>
@@ -219,8 +219,8 @@ export default function Navbar() {
             </NavbarBreakpoint>
             <NavbarMobileMenu>
                <NavLink to="/" className="st-react-navbar-link"><IconHome />{' '}Home</NavLink>
-               <NavLink to="/jobs/monitoring" className="st-react-navbar-link">{' '}Job Monitoring</NavLink>
-               {/* <NavLink to="/jobs/new" className="st-react-navbar-link">{' '}Create New Job</NavLink> */}
+               {/*<NavLink to="/jobs/monitoring" className="st-react-navbar-link">{' '}Job Monitoring</NavLink>
+                <NavLink to="/jobs/new" className="st-react-navbar-link">{' '}Create New Job</NavLink> */}
                <NavLink to="/health-dashboard" className="st-react-navbar-link">{' '}Health Dashboard</NavLink>
                {
                  healthState.items.map( (service, index) => {

diff --git a/src/routes/health-dashboard/index.tsx b/src/routes/health-dashboard/index.tsx
@@ -97,7 +97,7 @@ function HealthDashboard() {
       <DocumentMeta title="Health Dashboard" description="Health Dashboard" />
       <div className="main-view">
         <h1>Health Dashboard</h1>
-        <div className="ag-theme-stellar data-grid-container">
+        <div className="ag-theme-stellar unity-aggrid-container">
           <AgGridReact
             rowData={healthState.items} // Row Data for Rows
             columnDefs={columnDefs} // Column Defs for Columns

diff --git a/src/routes/jobs/monitoring/index.css b/src/routes/jobs/monitoring/index.css
@@ -1,10 +1,3 @@
-.data-grid-container {
-   width: 100%;
-   height: 500px;
-   padding-top: 24px;
-   overflow: hidden;
-}
-
 .job-detail-item {
    padding-bottom: 8px;
    word-wrap: break-word;

diff --git a/src/routes/jobs/monitoring/index.tsx b/src/routes/jobs/monitoring/index.tsx
@@ -157,7 +157,7 @@ function JobMonitoring() {
                <div className='button-bar'>
                   <Button onClick={() => navigate("/jobs/new")}>Run New Job</Button>
                </div>
-               <div className="ag-theme-stellar data-grid-container">
+               <div className="ag-theme-stellar unity-aggrid-container">
                   <AgGridReact
                      rowData={rowData} // Row Data for Rows
                      columnDefs={columnDefs} // Column Defs for Columns

diff --git a/src/styles/components/_Grid.scss b/src/styles/components/_Grid.scss
@@ -1,3 +1,11 @@
+
+.unity-aggrid-container {
+  width: 100%;
+  height: 500px;
+  padding-top: 24px;
+  overflow: hidden;
+}
+
 .unity-aggrid-health-status {
   display: flex;
   justify-content: space-between;