Merged PR 2357: dashboards in admin for appeals and lpa
dashboards in admin for appeals and lpa Related work items: #23527
This commit is contained in:
+51
-4
@@ -11,9 +11,16 @@ import StorageTab from "../../components/admin/tabs/storage";
|
||||
import AccountsTab from "../../components/admin/tabs/accounts";
|
||||
import AppealsTab from "../../components/admin/tabs/appeals";
|
||||
import DocumentsTab from "../../components/admin/tabs/documents";
|
||||
import AppealsWithStatusTab from "../../components/admin/tabs/appealsWithStatus";
|
||||
import AppealStatusDashboard from "../../components/admin/tabs/appealsDashboard";
|
||||
import AppealLpaStatusDashboard from "../../components/admin/tabs/appealsDashboardLPA";
|
||||
|
||||
import { fetchAdminStorageData } from "../../components/admin/utils/serverside";
|
||||
import { getNewAppeals } from "../../actions/services/adminService";
|
||||
import {
|
||||
getNewAppeals,
|
||||
getStatusByAppeal,
|
||||
getStatusByAppealLPA
|
||||
} from "../../actions/services/adminService";
|
||||
|
||||
import { getSearchDetails } from "../../components/utils";
|
||||
|
||||
@@ -30,9 +37,11 @@ const StoragePage = (props) => {
|
||||
repCompleteCount,
|
||||
searchResultsObj,
|
||||
docsOffline,
|
||||
showFilteredDocs
|
||||
showFilteredDocs,
|
||||
statusObj,
|
||||
statusLPAObj
|
||||
} = props;
|
||||
const [whichTab, setWhichTab] = useState("documents");
|
||||
const [whichTab, setWhichTab] = useState("appealDashboard");
|
||||
|
||||
return (
|
||||
<div>
|
||||
@@ -54,6 +63,8 @@ const StoragePage = (props) => {
|
||||
{/* Tabs */}
|
||||
<ul className="govuk-tabs__list">
|
||||
{[
|
||||
"appealDashboard",
|
||||
"appealDashboardLPA",
|
||||
"documents",
|
||||
"appeals",
|
||||
"storage",
|
||||
@@ -85,6 +96,10 @@ const StoragePage = (props) => {
|
||||
"Storage Account"}
|
||||
{tab === "accounts" &&
|
||||
"User Accounts"}
|
||||
{tab === "appealDashboard" &&
|
||||
"Appeals Dashboard"}
|
||||
{tab === "appealDashboardLPA" &&
|
||||
"Appeals LPA Dashboard"}
|
||||
</a>
|
||||
</li>
|
||||
))}
|
||||
@@ -92,6 +107,26 @@ const StoragePage = (props) => {
|
||||
|
||||
{/* Panels */}
|
||||
|
||||
<div
|
||||
className={
|
||||
whichTab === "appealDashboard"
|
||||
? "govuk-tabs__panel"
|
||||
: "govuk-tabs__panel govuk-tabs__panel--hidden"
|
||||
}
|
||||
>
|
||||
<AppealStatusDashboard statusObj={statusObj} />
|
||||
</div>
|
||||
<div
|
||||
className={
|
||||
whichTab === "appealDashboardLPA"
|
||||
? "govuk-tabs__panel"
|
||||
: "govuk-tabs__panel govuk-tabs__panel--hidden"
|
||||
}
|
||||
>
|
||||
<AppealLpaStatusDashboard
|
||||
statusObj={statusLPAObj}
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
className={
|
||||
whichTab === "documents"
|
||||
@@ -119,6 +154,15 @@ const StoragePage = (props) => {
|
||||
searchResultsObj={searchResultsObj}
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
className={
|
||||
whichTab === "appealsWithStatus"
|
||||
? "govuk-tabs__panel"
|
||||
: "govuk-tabs__panel govuk-tabs__panel--hidden"
|
||||
}
|
||||
>
|
||||
<AppealsWithStatusTab statusObj={statusObj} />
|
||||
</div>
|
||||
|
||||
<div
|
||||
className={
|
||||
@@ -177,7 +221,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
||||
await fetchAdminStorageData();
|
||||
|
||||
const newAppeals = await getNewAppeals();
|
||||
|
||||
const statusObj = await getStatusByAppeal();
|
||||
const statusLPAObj = await getStatusByAppealLPA();
|
||||
const searchDetailsObj = await getSearchDetails(newAppeals);
|
||||
|
||||
store.dispatch(setSearchResults(newAppeals));
|
||||
@@ -188,6 +233,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
|
||||
|
||||
return {
|
||||
props: {
|
||||
statusObj,
|
||||
statusLPAObj,
|
||||
data,
|
||||
userData,
|
||||
repCompleteCount,
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
import { azureHeaders } from "../../../actions/core/headers";
|
||||
import { relayGet } from "../middleware/relayForwarding";
|
||||
import { RELAY_POLICY_BOUNDED_READ } from "../middleware/relayPolicyPresets";
|
||||
|
||||
import { statusValues } from "../../../components/utils/caseStagesObj";
|
||||
|
||||
export default async function ApiProxy(req, res) {
|
||||
const queryUrl =
|
||||
"incidents?$apply=groupby((statuscode,pinswg_appealcasetype),aggregate($count as caseCount))&$filter=pinswg_publishtoweb eq true";
|
||||
|
||||
return relayGet({
|
||||
queryUrl,
|
||||
res,
|
||||
requestOptionsBuilder: (accessToken) => azureHeaders(accessToken),
|
||||
relayPolicy: RELAY_POLICY_BOUNDED_READ,
|
||||
transformData: (data) => {
|
||||
const countsByStatusCode = (data.value || []).reduce(
|
||||
(acc, item) => {
|
||||
const statuscode = item.statuscode;
|
||||
|
||||
if (!acc[statuscode]) {
|
||||
acc[statuscode] = {
|
||||
caseCount: 0,
|
||||
appealTypes: []
|
||||
};
|
||||
}
|
||||
|
||||
acc[statuscode].caseCount += item.caseCount || 0;
|
||||
|
||||
acc[statuscode].appealTypes.push({
|
||||
value:
|
||||
item[
|
||||
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
|
||||
] || "",
|
||||
appealType: item.pinswg_appealcasetype,
|
||||
caseCount: item.caseCount || 0
|
||||
});
|
||||
|
||||
return acc;
|
||||
},
|
||||
{}
|
||||
);
|
||||
|
||||
return statusValues.map((status) => ({
|
||||
...status,
|
||||
caseCount: countsByStatusCode[status.statuscode] || 0,
|
||||
appealTypes:
|
||||
countsByStatusCode[status.statuscode]?.appealTypes || []
|
||||
}));
|
||||
},
|
||||
errorResponse: {
|
||||
status: 400,
|
||||
code: "STATUS_COUNTS_FETCH_FAILED",
|
||||
message: "Failed to fetch status counts"
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import { azureHeaders } from "../../../actions/core/headers";
|
||||
import { relayGet } from "../middleware/relayForwarding";
|
||||
import { RELAY_POLICY_BOUNDED_READ } from "../middleware/relayPolicyPresets";
|
||||
|
||||
import { statusValues } from "../../../components/utils/caseStagesObj";
|
||||
|
||||
export default async function ApiProxy(req, res) {
|
||||
// const queryUrl =
|
||||
// "incidents?$apply=groupby((statuscode,pinswg_appealcasetype),aggregate($count as caseCount))&$filter=pinswg_publishtoweb eq true";
|
||||
const queryUrl =
|
||||
"incidents?$select=statuscode,pinswg_appealcasetype,_pinswg_associatedlpa_value&$filter=pinswg_publishtoweb eq true";
|
||||
return relayGet({
|
||||
queryUrl,
|
||||
res,
|
||||
requestOptionsBuilder: (accessToken) => azureHeaders(accessToken),
|
||||
relayPolicy: RELAY_POLICY_BOUNDED_READ,
|
||||
|
||||
transformData: (data) => {
|
||||
const grouped = (data.value || []).reduce((acc, item) => {
|
||||
const key = [
|
||||
item.statuscode,
|
||||
item.pinswg_appealcasetype,
|
||||
item._pinswg_associatedlpa_value || "no-lpa"
|
||||
].join("|");
|
||||
|
||||
if (!acc[key]) {
|
||||
acc[key] = {
|
||||
statuscode: item.statuscode,
|
||||
status: item[
|
||||
"statuscode@OData.Community.Display.V1.FormattedValue"
|
||||
],
|
||||
appealType: item.pinswg_appealcasetype,
|
||||
appealTypeName:
|
||||
item[
|
||||
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
|
||||
],
|
||||
lpaId: item._pinswg_associatedlpa_value || null,
|
||||
lpaName:
|
||||
item[
|
||||
"_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
|
||||
] || null,
|
||||
caseCount: 0
|
||||
};
|
||||
}
|
||||
|
||||
acc[key].caseCount += 1;
|
||||
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
return Object.values(grouped);
|
||||
},
|
||||
errorResponse: {
|
||||
status: 400,
|
||||
code: "STATUS_COUNTS_FETCH_FAILED",
|
||||
message: "Failed to fetch status counts"
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
import { azureHeaders } from "../../../actions/core/headers";
|
||||
import { relayGet } from "../middleware/relayForwarding";
|
||||
import { RELAY_POLICY_BOUNDED_READ } from "../middleware/relayPolicyPresets";
|
||||
|
||||
import { statusValues } from "../../../components/utils/caseStagesObj";
|
||||
|
||||
export default async function ApiProxy(req, res) {
|
||||
const queryUrl =
|
||||
"incidents?$apply=groupby((statuscode,pinswg_appealcasetype),aggregate($count as caseCount))&$filter=pinswg_publishtoweb eq true";
|
||||
|
||||
return relayGet({
|
||||
queryUrl,
|
||||
res,
|
||||
requestOptionsBuilder: (accessToken) => azureHeaders(accessToken),
|
||||
relayPolicy: RELAY_POLICY_BOUNDED_READ,
|
||||
transformData: (data) => {
|
||||
const groupedByAppealType = (data.value || []).reduce(
|
||||
(acc, item) => {
|
||||
const appealType = item.pinswg_appealcasetype;
|
||||
|
||||
if (!acc[appealType]) {
|
||||
acc[appealType] = {
|
||||
value:
|
||||
item[
|
||||
"pinswg_appealcasetype@OData.Community.Display.V1.FormattedValue"
|
||||
] || "",
|
||||
appealType,
|
||||
caseCount: 0,
|
||||
statuses: []
|
||||
};
|
||||
}
|
||||
|
||||
acc[appealType].caseCount += item.caseCount || 0;
|
||||
|
||||
acc[appealType].statuses.push({
|
||||
value:
|
||||
item[
|
||||
"statuscode@OData.Community.Display.V1.FormattedValue"
|
||||
] || "",
|
||||
statuscode: item.statuscode,
|
||||
caseCount: item.caseCount || 0
|
||||
});
|
||||
|
||||
return acc;
|
||||
},
|
||||
{}
|
||||
);
|
||||
|
||||
return Object.values(groupedByAppealType);
|
||||
},
|
||||
errorResponse: {
|
||||
status: 400,
|
||||
code: "STATUS_COUNTS_FETCH_FAILED",
|
||||
message: "Failed to fetch status counts"
|
||||
}
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user