From bb643c17e49e3184ab3e827363e7e62753c44413 Mon Sep 17 00:00:00 2001 From: Tom Chapman Date: Tue, 19 Dec 2023 11:59:12 -0800 Subject: [PATCH 1/2] replace status preview with reports preview, fix issue with api --- epictrack-api/src/api/services/work_issues.py | 4 ++-- epictrack-api/src/api/services/work_status.py | 4 ++-- .../workPlan/issues/ReportsPreview/index.tsx | 6 +++--- .../workPlan/status/StatusContainer/index.tsx | 14 ++++++++++---- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/epictrack-api/src/api/services/work_issues.py b/epictrack-api/src/api/services/work_issues.py index e05a078aa..3d73da17c 100644 --- a/epictrack-api/src/api/services/work_issues.py +++ b/epictrack-api/src/api/services/work_issues.py @@ -113,9 +113,9 @@ def edit_issue_update(cls, work_id, issue_id, issue_data): if not issue_update_model: raise ResourceNotFoundError("Issue Description doesnt exist") if issue_update_model.is_approved: - one_of_roles = ( + one_of_roles = ([ KeycloakRole.EXTENDED_EDIT.value - ) + ]) authorisation.check_auth(one_of_roles=one_of_roles) issue_update_model.description = update_description.get('description') issue_update_model.flush() diff --git a/epictrack-api/src/api/services/work_status.py b/epictrack-api/src/api/services/work_status.py index 88ef250fe..dc936d3a7 100644 --- a/epictrack-api/src/api/services/work_status.py +++ b/epictrack-api/src/api/services/work_status.py @@ -55,9 +55,9 @@ def update_work_status(cls, work_status: WorkStatusModel, work_status_data: dict """Update an existing work status.""" # TODO Add Super user check if work_status.is_approved: - one_of_roles = ( + one_of_roles = ([ KeycloakRole.EXTENDED_EDIT.value - ) + ]) authorisation.check_auth(one_of_roles=one_of_roles) work_status.update(work_status_data) diff --git a/epictrack-web/src/components/workPlan/issues/ReportsPreview/index.tsx b/epictrack-web/src/components/workPlan/issues/ReportsPreview/index.tsx index 23d61450d..e40cbf42a 100644 --- a/epictrack-web/src/components/workPlan/issues/ReportsPreview/index.tsx +++ b/epictrack-web/src/components/workPlan/issues/ReportsPreview/index.tsx @@ -3,8 +3,8 @@ import { Button, Grid, Stack } from "@mui/material"; import TabPanel from "../../../shared/tab/TabPanel"; import { ThirtySixtyNinety } from "./ThirtySixtyNinety"; import { ReferralSchedule } from "./ReferralSchedule"; -import { IssuesContext } from "../IssuesContext"; import { PreviewSkeleton } from "./PreviewSkeleton"; +import { WorkplanContext } from "../../WorkPlanContext"; const TAB = { THIRTY_SIXTY_NINETY: 0, @@ -12,12 +12,12 @@ const TAB = { }; export const ReportsPreview = () => { - const { isIssuesLoading } = React.useContext(IssuesContext); + const { loading } = React.useContext(WorkplanContext); const [selectedTabIndex, setSelectedTabIndex] = React.useState( TAB.THIRTY_SIXTY_NINETY ); - if (isIssuesLoading) { + if (loading) { return ; } diff --git a/epictrack-web/src/components/workPlan/status/StatusContainer/index.tsx b/epictrack-web/src/components/workPlan/status/StatusContainer/index.tsx index e9a2ee352..a946b1a45 100644 --- a/epictrack-web/src/components/workPlan/status/StatusContainer/index.tsx +++ b/epictrack-web/src/components/workPlan/status/StatusContainer/index.tsx @@ -5,9 +5,9 @@ import { Palette } from "../../../../styles/theme"; import StatusView from "../StatusView"; import { ETTab, ETTabs } from "../../../shared/tab/Tab"; import TabPanel from "../../../shared/tab/TabPanel"; -import StatusPreview from "./StatusPreview"; import StatusNotes from "./StatusNotes"; import { tabPanelStyle, tabStyle, titleStyle } from "../../common/styles"; +import { ReportsPreview } from "../../issues/ReportsPreview"; const StatusContainer = () => { const [selectedTabIndex, setSelectedTabIndex] = React.useState(0); @@ -43,7 +43,7 @@ const StatusContainer = () => { paddingLeft: 0, ...tabStyle, }} - label="Status Preview" + label="Reports Preview" /> { > - + { ...tabPanelStyle, }} > - + Date: Wed, 20 Dec 2023 11:12:20 -0800 Subject: [PATCH 2/2] empty tuple --- epictrack-api/src/api/services/work_issues.py | 6 +++--- epictrack-api/src/api/services/work_status.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epictrack-api/src/api/services/work_issues.py b/epictrack-api/src/api/services/work_issues.py index 3d73da17c..8a688f80b 100644 --- a/epictrack-api/src/api/services/work_issues.py +++ b/epictrack-api/src/api/services/work_issues.py @@ -113,9 +113,9 @@ def edit_issue_update(cls, work_id, issue_id, issue_data): if not issue_update_model: raise ResourceNotFoundError("Issue Description doesnt exist") if issue_update_model.is_approved: - one_of_roles = ([ - KeycloakRole.EXTENDED_EDIT.value - ]) + one_of_roles = ( + KeycloakRole.EXTENDED_EDIT.value, + ) authorisation.check_auth(one_of_roles=one_of_roles) issue_update_model.description = update_description.get('description') issue_update_model.flush() diff --git a/epictrack-api/src/api/services/work_status.py b/epictrack-api/src/api/services/work_status.py index dc936d3a7..0231723b6 100644 --- a/epictrack-api/src/api/services/work_status.py +++ b/epictrack-api/src/api/services/work_status.py @@ -55,9 +55,9 @@ def update_work_status(cls, work_status: WorkStatusModel, work_status_data: dict """Update an existing work status.""" # TODO Add Super user check if work_status.is_approved: - one_of_roles = ([ - KeycloakRole.EXTENDED_EDIT.value - ]) + one_of_roles = ( + KeycloakRole.EXTENDED_EDIT.value, + ) authorisation.check_auth(one_of_roles=one_of_roles) work_status.update(work_status_data)