Skip to content

Commit cc375ab

Browse files
Merge pull request #1305 from bluewave-labs/cr-may-07-compliance-status-dashboard
Remove overall StatusCard from Dashboard
2 parents bfa8624 + 4453da9 commit cc375ab

File tree

1 file changed

+22
-72
lines changed
  • Clients/src/presentation/pages/Home/1.0Home

1 file changed

+22
-72
lines changed

Clients/src/presentation/pages/Home/1.0Home/index.tsx

+22-72
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,25 @@
11
import { useContext, useEffect, useState } from "react";
22
import { Stack, Typography, Modal, Box } from "@mui/material";
33
import {
4-
headerCardPlaceholder,
54
vwhomeBody,
65
vwhomeBodyControls,
76
vwhomeBodyProjects,
87
vwhomeBodyProjectsGrid,
98
vwhomeCreateModalFrame,
10-
vwhomeHeaderCards,
119
vwhomeHeading,
1210
} from "./style";
13-
import SmallStatsCard from "../../../components/Cards/SmallStatsCard";
1411
import VWButton from "../../../vw-v2-components/Buttons";
1512
import AddCircleOutlineIcon from "@mui/icons-material/AddCircleOutline";
1613
import CloudDownloadIcon from "@mui/icons-material/CloudDownload";
1714
import VWProjectCard from "../../../components/Cards/ProjectCard";
18-
import VWSkeleton from "../../../vw-v2-components/Skeletons";
15+
1916
import { postAutoDrivers } from "../../../../application/repository/entity.repository";
2017
import { VerifyWiseContext } from "../../../../application/contexts/VerifyWise.context";
2118
import NoProject from "../../../components/NoProject/NoProject";
2219
import VWToast from "../../../vw-v2-components/Toast";
2320
import Alert from "../../../components/Alert";
2421
import { logEngine } from "../../../../application/tools/log.engine";
2522
import VWProjectForm from "../../../vw-v2-components/Forms/ProjectForm";
26-
import {
27-
AssessmentProgress,
28-
ComplianceProgress,
29-
} from "../../../../application/interfaces/iprogress";
3023
import { useProjectData } from "../../../../application/hooks/useFetchProjects";
3124
import { AlertState } from "../../../../application/interfaces/appStates";
3225
import { fetchData } from "../../../../application/hooks/fetchDataHook";
@@ -37,10 +30,10 @@ import useMultipleOnScreen from "../../../../application/hooks/useMultipleOnScre
3730
const VWHome = () => {
3831
const { setDashboardValues, componentsVisible, changeComponentVisibility } =
3932
useContext(VerifyWiseContext);
40-
const [complianceProgressData, setComplianceProgressData] =
41-
useState<ComplianceProgress>();
42-
const [assessmentProgressData, setAssessmentProgressData] =
43-
useState<AssessmentProgress>();
33+
// const [complianceProgressData, setComplianceProgressData] =
34+
// useState<ComplianceProgress>();
35+
// const [assessmentProgressData, setAssessmentProgressData] =
36+
// useState<AssessmentProgress>();
4437
const [alertState, setAlertState] = useState<AlertState>();
4538
const [isProjectFormModalOpen, setIsProjectFormModalOpen] =
4639
useState<boolean>(false);
@@ -49,7 +42,7 @@ const VWHome = () => {
4942
const [showToastNotification, setShowToastNotification] =
5043
useState<boolean>(false);
5144

52-
const { projects, loading: projectLoading, fetchProjects } = useProjectData();
45+
const { projects, fetchProjects } = useProjectData();
5346

5447
const [runHomeTour, setRunHomeTour] = useState(false);
5548
const { refs, allVisible } = useMultipleOnScreen<HTMLElement>({
@@ -72,14 +65,14 @@ const VWHome = () => {
7265
await fetchData("/users", (data) => {
7366
setDashboardValues({ users: data });
7467
});
75-
await fetchData(
76-
"/eu-ai-act/all/compliances/progress",
77-
setComplianceProgressData
78-
);
79-
await fetchData(
80-
"/eu-ai-act/all/assessments/progress",
81-
setAssessmentProgressData
82-
);
68+
// await fetchData(
69+
// "/eu-ai-act/all/compliances/progress",
70+
// setComplianceProgressData
71+
// );
72+
// await fetchData(
73+
// "/eu-ai-act/all/assessments/progress",
74+
// setAssessmentProgressData
75+
// );
8376
await fetchProjects();
8477
};
8578

@@ -109,14 +102,14 @@ const VWHome = () => {
109102
}, 100);
110103

111104
await fetchProjects();
112-
await fetchData(
113-
"/eu-ai-act/all/compliances/progress",
114-
setComplianceProgressData
115-
);
116-
await fetchData(
117-
"/eu-ai-act/all/assessments/progress",
118-
setAssessmentProgressData
119-
);
105+
// await fetchData(
106+
// "/eu-ai-act/all/compliances/progress",
107+
// setComplianceProgressData
108+
// );
109+
// await fetchData(
110+
// "/eu-ai-act/all/assessments/progress",
111+
// setAssessmentProgressData
112+
// );
120113
setShowToastNotification(false);
121114
window.location.reload();
122115
} else {
@@ -166,49 +159,6 @@ const VWHome = () => {
166159
{showToastNotification && (
167160
<VWToast title="Generating demo data. Please wait..." />
168161
)}
169-
<Stack className="vwhome-header" sx={{ mb: 15 }}>
170-
<Typography sx={vwhomeHeading}>
171-
All projects compliance status
172-
</Typography>
173-
<Stack className="vwhome-header-cards" sx={vwhomeHeaderCards}>
174-
{projectLoading ? (
175-
<VWSkeleton variant="rectangular" sx={headerCardPlaceholder} />
176-
) : (
177-
<SmallStatsCard
178-
attributeTitle="Compliance tracker"
179-
progress={`${
180-
complianceProgressData
181-
? complianceProgressData.allDonesubControls
182-
: 0
183-
}/${
184-
complianceProgressData
185-
? complianceProgressData.allsubControls
186-
: 1
187-
}`}
188-
rate={
189-
(complianceProgressData?.allDonesubControls ?? 0) /
190-
(complianceProgressData?.allsubControls ?? 1)
191-
}
192-
/>
193-
)}
194-
{projectLoading ? (
195-
<VWSkeleton variant="rectangular" sx={headerCardPlaceholder} />
196-
) : (
197-
<SmallStatsCard
198-
attributeTitle="Assessment tracker"
199-
progress={`${assessmentProgressData?.answeredQuestions ?? 0}/${
200-
assessmentProgressData?.totalQuestions ?? 1
201-
}`}
202-
rate={
203-
assessmentProgressData
204-
? (assessmentProgressData.answeredQuestions ?? 0) /
205-
(assessmentProgressData.totalQuestions ?? 1)
206-
: 0
207-
}
208-
/>
209-
)}
210-
</Stack>
211-
</Stack>
212162
<Stack className="vwhome-body">
213163
<Stack sx={vwhomeBody}>
214164
<Typography sx={vwhomeHeading}>Projects overview</Typography>

0 commit comments

Comments
 (0)