From 8ef36504c587525092840c6add5812d81c11d111 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 16 Sep 2025 12:44:40 -0700 Subject: [PATCH] Revert accidentally commited dashboard changes. --- .../sider-menu/sider-menu.organism.jsx | 6 -- .../pages/dashboard/dashboard.page.jsx | 61 ------------------- .../dashboard/dashboard.page.styles.scss | 8 --- src/components/pages/routes/routes.page.jsx | 10 +-- src/redux/reporting/reporting.reducer.js | 1 - src/redux/reporting/reporting.types.js | 3 +- 6 files changed, 6 insertions(+), 83 deletions(-) delete mode 100644 src/components/pages/dashboard/dashboard.page.jsx delete mode 100644 src/components/pages/dashboard/dashboard.page.styles.scss diff --git a/src/components/organisms/sider-menu/sider-menu.organism.jsx b/src/components/organisms/sider-menu/sider-menu.organism.jsx index d127c23..34b2490 100644 --- a/src/components/organisms/sider-menu/sider-menu.organism.jsx +++ b/src/components/organisms/sider-menu/sider-menu.organism.jsx @@ -2,7 +2,6 @@ import { AuditOutlined, BarChartOutlined, CloseOutlined, - DashboardFilled, FileAddFilled, LogoutOutlined, MoonOutlined, @@ -49,11 +48,6 @@ export function SiderMenuOrganism({ darkMode, toggleDarkMode }) { }} mode="inline" items={[ - { - key: "/dashboard", - icon: , - label: Dashboard - }, { key: "/", icon: , diff --git a/src/components/pages/dashboard/dashboard.page.jsx b/src/components/pages/dashboard/dashboard.page.jsx deleted file mode 100644 index a9b1159..0000000 --- a/src/components/pages/dashboard/dashboard.page.jsx +++ /dev/null @@ -1,61 +0,0 @@ -import { Card, Typography } from "antd"; -import React from "react"; -import { connect } from "react-redux"; -import { Link } from "react-router-dom"; -import { createStructuredSelector } from "reselect"; -import { setSelectedJobId } from "../../../redux/application/application.actions"; -import { selectDates, selectReportingError } from "../../../redux/reporting/reporting.selectors"; -import ReportingTitleAtom from "../../atoms/reporting-title/reporting-title.atom"; -import ReportingDatesMolecule from "../../molecules/reporting-dates/reporting-dates.molecule"; -import ReportingJobsListMolecule from "../../molecules/reporting-jobs-list/reporting-jobs-list.molecule"; -import ReportingScatterChartMolecule from "../../molecules/reporting-scatterchart/reporting-scatterchart.molecule"; -import ReportingTotalsStatsMolecule from "../../molecules/reporting-totals-stats/reporting-totals-stats.molecule"; -import "./dashboard.page.styles.scss"; - -const mapStateToProps = createStructuredSelector({ - dates: selectDates, - error: selectReportingError -}); -const mapDispatchToProps = (dispatch) => ({ - setSelectedJobId: (id) => dispatch(setSelectedJobId(id)) -}); - -export function DashboardPage({ dates, error, setSelectedJobId }) { - return ( -
- - - - {error && ( -
- {error.message} -
    - {error.jobs.map((j, idx) => ( -
  • - setSelectedJobId(j.id)} to={"/"}> - {`${j.clm_no} - ${j.error}`} - -
  • - ))} -
-
- )} - {!error && dates && dates.startDate && dates.endDate && ( -
- - - - - - - - - - -
- )} -
- ); -} - -export default connect(mapStateToProps, mapDispatchToProps)(DashboardPage); diff --git a/src/components/pages/dashboard/dashboard.page.styles.scss b/src/components/pages/dashboard/dashboard.page.styles.scss deleted file mode 100644 index f1bdba2..0000000 --- a/src/components/pages/dashboard/dashboard.page.styles.scss +++ /dev/null @@ -1,8 +0,0 @@ -.reporting-container { - height: 100%; - overflow-y: auto; - //background-color: rgb(244, 244, 244); - & > .reporting-cards > * { - padding: 1rem; - } -} diff --git a/src/components/pages/routes/routes.page.jsx b/src/components/pages/routes/routes.page.jsx index 77b8663..73d7c19 100644 --- a/src/components/pages/routes/routes.page.jsx +++ b/src/components/pages/routes/routes.page.jsx @@ -1,6 +1,8 @@ import { Layout } from "antd"; +import React from "react"; import { connect } from "react-redux"; -import { Route, Routes } from "react-router-dom"; +import { Routes } from "react-router-dom"; +import { Route } from "react-router-dom"; import { createStructuredSelector } from "reselect"; import { selectBodyshop, selectDarkMode } from "../../../redux/user/user.selectors"; import ErrorResultAtom from "../../atoms/error-result/error-result.atom"; @@ -8,13 +10,12 @@ import ReleaseNotes from "../../molecules/release-notes/release-notes.molecule"; import NotificationModalOrganism from "../../organisms/notification-modal/notification-modal.organism"; import SiderMenuOrganism from "../../organisms/sider-menu/sider-menu.organism"; import UpdateManagerOrganism from "../../organisms/update-manager/update-manager.organism"; -import AdminPage from "../admin/admin.page"; -import AuditPage from "../audit/audit.page"; -import DashboardPage from "../dashboard/dashboard.page"; import JobsPage from "../jobs/jobs.page"; import ReportingPage from "../reporting/reporting.page"; import ScanPage from "../scan/scan.page"; import SettingsPage from "../settings/settings.page"; +import AuditPage from "../audit/audit.page"; +import AdminPage from "../admin/admin.page"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, darkMode: selectDarkMode }); const mapDispatchToProps = (dispatch) => ({}); @@ -38,7 +39,6 @@ export function RoutesPage({ bodyshop, darkMode }) { } /> - } /> } /> } /> } /> diff --git a/src/redux/reporting/reporting.reducer.js b/src/redux/reporting/reporting.reducer.js index 7e256bd..609d897 100644 --- a/src/redux/reporting/reporting.reducer.js +++ b/src/redux/reporting/reporting.reducer.js @@ -2,7 +2,6 @@ import ReportingActionTypes from "./reporting.types"; const INITIAL_STATE = { dates: { startDate: null, endDate: null }, data: [], - dashboardData: [], scoreCard: null, error: null, loading: false, diff --git a/src/redux/reporting/reporting.types.js b/src/redux/reporting/reporting.types.js index f872873..fa2fc08 100644 --- a/src/redux/reporting/reporting.types.js +++ b/src/redux/reporting/reporting.types.js @@ -11,7 +11,6 @@ const ReportingActionTypes = { ADD_EXCLUDED_ID: "ADD_EXCLUDED_ID", REMOVE_EXCLUDED_ID: "REMOVE_EXCLUDED_ID", CLEAR_EXCLUDED_IDS: "CLEAR_EXCLUDED_IDS", - SET_CACHED_JOBS: "SET_CACHED_JOBS", - SET_DASHBOARD_DATA: "SET_DASHBOARD_DATA" + SET_CACHED_JOBS: "SET_CACHED_JOBS" }; export default ReportingActionTypes;