From 1e68ffb63f0af9443916fd3553a7433c80b0ad4b Mon Sep 17 00:00:00 2001 From: Andres Alvarez Date: Mon, 29 Jan 2024 11:34:40 -0500 Subject: [PATCH] fix projects --- src/@mock-api/MockAdapterProvider.tsx | 3 +- src/@mock-api/api/dashboards/analytics-api.ts | 10 +++++++ src/@mock-api/api/dashboards/crypto-api.ts | 10 +++++++ src/@mock-api/api/dashboards/finance-api.ts | 10 +++++++ src/@mock-api/api/dashboards/project-api.ts | 15 ++++++++++ .../project/ProjectDashboardAppHeader.tsx | 28 +++---------------- 6 files changed, 51 insertions(+), 25 deletions(-) create mode 100644 src/@mock-api/api/dashboards/analytics-api.ts create mode 100644 src/@mock-api/api/dashboards/crypto-api.ts create mode 100644 src/@mock-api/api/dashboards/finance-api.ts create mode 100644 src/@mock-api/api/dashboards/project-api.ts diff --git a/src/@mock-api/MockAdapterProvider.tsx b/src/@mock-api/MockAdapterProvider.tsx index 7a1fd22..7129467 100644 --- a/src/@mock-api/MockAdapterProvider.tsx +++ b/src/@mock-api/MockAdapterProvider.tsx @@ -5,6 +5,7 @@ import { useAppDispatch } from 'app/store/store'; import apiService from 'app/store/apiService'; import ExtendedMockAdapter from './ExtendedMockAdapter'; import { authApiMocks } from './api/auth-api'; +import { projectDashboardApiMocks } from './api/dashboards/project-api'; const mockAdapterOptions = { delayResponse: 0 @@ -26,7 +27,7 @@ function MockAdapterProvider(props: MockAdapterProviderProps) { const isInitialMount = useRef(true); useEffect(() => { const setupAllMocks = () => { - [authApiMocks].forEach((mockSetup) => { + [authApiMocks, projectDashboardApiMocks].forEach((mockSetup) => { mockSetup(mock); }); }; diff --git a/src/@mock-api/api/dashboards/analytics-api.ts b/src/@mock-api/api/dashboards/analytics-api.ts new file mode 100644 index 0000000..da6fa2b --- /dev/null +++ b/src/@mock-api/api/dashboards/analytics-api.ts @@ -0,0 +1,10 @@ +import mockApi from '../../mock-api.json'; +import ExtendedMockAdapter from '../../ExtendedMockAdapter'; + +const widgets = mockApi.components.examples.analytics_dashboard_widgets.value; + +export const analyticsDashboardApiMocks = (mock: ExtendedMockAdapter) => { + mock.onGet('/dashboards/analytics/widgets').reply(() => { + return [200, widgets]; + }); +}; diff --git a/src/@mock-api/api/dashboards/crypto-api.ts b/src/@mock-api/api/dashboards/crypto-api.ts new file mode 100644 index 0000000..bfc36b8 --- /dev/null +++ b/src/@mock-api/api/dashboards/crypto-api.ts @@ -0,0 +1,10 @@ +import mockApi from '../../mock-api.json'; +import ExtendedMockAdapter from '../../ExtendedMockAdapter'; + +const widgets = mockApi.components.examples.crypto_dashboard_widgets.value; + +export const cryptoDashboardApiMocks = (mock: ExtendedMockAdapter) => { + mock.onGet('/dashboards/crypto/widgets').reply(() => { + return [200, widgets]; + }); +}; diff --git a/src/@mock-api/api/dashboards/finance-api.ts b/src/@mock-api/api/dashboards/finance-api.ts new file mode 100644 index 0000000..15499ec --- /dev/null +++ b/src/@mock-api/api/dashboards/finance-api.ts @@ -0,0 +1,10 @@ +import mockApi from '../../mock-api.json'; +import ExtendedMockAdapter from '../../ExtendedMockAdapter'; + +const widgets = mockApi.components.examples.finance_dashboard_widgets.value; + +export const financeDashboardApiMocks = (mock: ExtendedMockAdapter) => { + mock.onGet('/dashboards/finance/widgets').reply(() => { + return [200, widgets]; + }); +}; diff --git a/src/@mock-api/api/dashboards/project-api.ts b/src/@mock-api/api/dashboards/project-api.ts new file mode 100644 index 0000000..e768411 --- /dev/null +++ b/src/@mock-api/api/dashboards/project-api.ts @@ -0,0 +1,15 @@ +import mockApi from '../../mock-api.json'; +import ExtendedMockAdapter from '../../ExtendedMockAdapter'; + +const widgets = mockApi.components.examples.project_dashboard_widgets.value; +const projects = mockApi.components.examples.project_dashboard_projects.value; + +export const projectDashboardApiMocks = (mock: ExtendedMockAdapter) => { + mock.onGet('/dashboards/project/widgets').reply(() => { + return [200, widgets]; + }); + + mock.onGet('/dashboards/project/projects').reply(() => { + return [200, projects]; + }); +}; diff --git a/src/app/main/dashboard/project/ProjectDashboardAppHeader.tsx b/src/app/main/dashboard/project/ProjectDashboardAppHeader.tsx index 9f5b8e2..b4740b8 100644 --- a/src/app/main/dashboard/project/ProjectDashboardAppHeader.tsx +++ b/src/app/main/dashboard/project/ProjectDashboardAppHeader.tsx @@ -1,6 +1,5 @@ import Avatar from '@mui/material/Avatar'; import Menu from '@mui/material/Menu'; -import MenuItem from '@mui/material/MenuItem'; import Typography from '@mui/material/Typography'; import { useState } from 'react'; import _ from '@lodash'; @@ -10,33 +9,14 @@ import FuseLoading from '@fuse/core/FuseLoading'; import { darken } from '@mui/material/styles'; import { useSelector } from 'react-redux'; import { selectUser } from 'src/app/auth/user/store/userSlice'; +import MenuItem from '@mui/material/MenuItem'; import { useGetProjectDashboardProjectsQuery } from './ProjectDashboardApi'; /** * The ProjectDashboardAppHeader page. */ function ProjectDashboardAppHeader() { - const { isLoading } = useGetProjectDashboardProjectsQuery(); - - - const projects=[ - { - "id": 1, - "name": "ACME Corp. Backend App" - }, - { - "id": 2, - "name": "ACME Corp. Frontend App" - }, - { - "id": 3, - "name": "Creapond" - }, - { - "id": 4, - "name": "Withinpixels" - } - ] + const { data: projects, isLoading } = useGetProjectDashboardProjectsQuery(); const user = useSelector(selectUser); @@ -150,7 +130,7 @@ function ProjectDashboardAppHeader() { open={Boolean(selectedProject.menuEl)} onClose={handleCloseProjectMenu} > - {/* {projects && + {projects && projects.map((project) => ( {project.name} - ))} */} + ))}