Skip to content

Commit

Permalink
ORV2-2827 - FE: Update: Remove Applications in Progress Counter (#1600)
Browse files Browse the repository at this point in the history
Co-authored-by: GlenAOT <[email protected]>
  • Loading branch information
glen-aot and glen-aot authored Sep 17, 2024
1 parent c084e4a commit fdc89b1
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 37 deletions.
1 change: 0 additions & 1 deletion frontend/src/common/components/tabs/TabsList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
opacity: 1;
padding: 0.875rem 0;
}

&__count {
font-size: 0.875rem;
color: $bc-black;
Expand Down
44 changes: 28 additions & 16 deletions frontend/src/common/components/tabs/TabsList.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Chip, Tab, Tabs } from "@mui/material";
import { Tab, Tabs } from "@mui/material";

import "./TabsList.scss";
import { TabComponentProps } from "./types/TabComponentProps";
Expand Down Expand Up @@ -28,21 +28,33 @@ export const TabsList = ({
scrollButtons="auto"
aria-label="scrollable profile tabs"
>
{componentList.map(({ label, count }, index) => {
return (
<Tab
key={label}
className="tabs-list__tab"
label={
<div className="tab">
<div className="tab__label">{label}</div>
{count ? <Chip className="tab__count" label={count} /> : null}
</div>
}
{...TabProps(index)}
/>
);
})}
{componentList.map(
(
{
label,
// TODO remove this if we no longer need tab counters
// count
},
index,
) => {
return (
<Tab
key={label}
className="tabs-list__tab"
label={
<div className="tab">
<div className="tab__label">{label}</div>
{
// TODO remove this if we no longer need tab counters
/* {count ? <Chip className="tab__count" label={count} /> : null} */
}
</div>
}
{...TabProps(index)}
/>
);
},
)}
</Tabs>
);
};
16 changes: 2 additions & 14 deletions frontend/src/features/permits/components/dashboard/PermitLists.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
import React, { useState } from "react";

import React from "react";
import { TabLayout } from "../../../../common/components/dashboard/TabLayout";
import { StartApplicationAction } from "../../pages/Application/components/dashboard/StartApplicationAction";
import { ActivePermitList } from "../permit-list/ActivePermitList";
import { ExpiredPermitList } from "../permit-list/ExpiredPermitList";
import { ApplicationsInProgressList } from "../permit-list/ApplicationsInProgressList";
import { ApplicationsInReviewList } from "../permit-list/ApplicationsInReviewList";
import { Nullable } from "../../../../common/types/common";
import { usePermissionMatrix } from "../../../../common/authentication/PermissionMatrix";
import { RenderIf } from "../../../../common/components/reusable/RenderIf";

export const PermitLists = React.memo(() => {
const [applicationsInProgressCount, setApplicationsInProgressCount] =
useState<Nullable<number>>();
const handleApplicationsCountChange = (count: number) => {
setApplicationsInProgressCount(count);
};
const tabs = [];

const showApplicationsInProgressTab = usePermissionMatrix({
Expand All @@ -28,12 +21,7 @@ export const PermitLists = React.memo(() => {
if (showApplicationsInProgressTab) {
tabs.push({
label: "Applications in Progress",
count: applicationsInProgressCount,
component: (
<ApplicationsInProgressList
onCountChange={handleApplicationsCountChange}
/>
),
component: <ApplicationsInProgressList />,
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ const getColumns = (
return ApplicationInProgressColumnDefinition(userRole);
};

export const ApplicationsInProgressList = ({
onCountChange,
}: {
onCountChange: (count: number) => void;
}) => {
export const ApplicationsInProgressList = () => {
const {
applicationsInProgressQuery,
pagination,
Expand Down Expand Up @@ -82,7 +78,6 @@ export const ApplicationsInProgressList = ({
applicationsInProgress?.meta?.totalItems,
);
setShowAIPTable(totalCount > 0);
onCountChange(totalCount);
}, [applicationsInProgress?.meta?.totalItems]);

const { idirUserDetails, userDetails } = useContext(OnRouteBCContext);
Expand Down

0 comments on commit fdc89b1

Please sign in to comment.