Author SHA1 Message Date
robbond e5ada29cdb made getstatus serverside not client 2026-05-28 11:34:50 +01:00
robbond 64dc4e78d2 csp fix remove unneccessary params 2026-05-28 11:00:23 +01:00
5 changed files with 34 additions and 35 deletions
+1 -4
View File
@@ -276,10 +276,7 @@ export const getPortalModuleDetailsProxy = (appealType, caseReference) => {
};
export const getCaseStatus = async (appealType, caseReference) => {
const route = buildFileQuery("/api/endpoint/getStatusCounts_api", {
appealType,
caseReference: encodeURI(caseReference)
});
const route = buildFileQuery("/api/endpoint/getStatusCounts_api", {});
return getJson(withBaseUrl(BASE_URL, route)).catch((error) => {
consoleLogger(error);
+6 -22
View File
@@ -199,27 +199,6 @@ let AdvancedSearch = (props) => {
const router = useRouter();
const { locale } = router;
const [caseStatusValues, setCaseStatusValues] = useState([]);
useEffect(() => {
const fetchCaseStatus = async () => {
try {
const response = await getCaseStatus();
setCaseStatusValues(
Array.isArray(response?.data)
? response.data
: response?.data?.value || response || []
);
} catch (error) {
console.error("Failed to fetch case statuses", error);
setCaseStatusValues([]);
}
};
fetchCaseStatus();
}, []);
const {
LPAData,
onSubmit,
@@ -246,6 +225,11 @@ let AdvancedSearch = (props) => {
? props.LPAData.LPAData.value
: [{}];
const caseStatusObject =
props?.LPAData?.caseStatusObj?.length > 0
? props.LPAData.caseStatusObj
: [{}];
const RenderLPAList = ({
name,
id,
@@ -705,7 +689,7 @@ let AdvancedSearch = (props) => {
name="statusCode"
id="statusCode"
component={RenderCaseStatusList}
optionsObj={caseStatusValues}
optionsObj={caseStatusObject}
//validate={[required]}
label={t(
"search:case-status-label"
+10 -6
View File
@@ -15,9 +15,10 @@ import Footer from "../components/footer";
import Header from "../components/header";
import Search from "../components/search";
import { setAppealType, setProjectType } from "../store/appealType/action";
import { setLPA } from "../store/lpa/action";
import { setLPA, setCaseStatus } from "../store/lpa/action";
import { wrapper } from "../store/store";
import ServiceBanner from "../components/servicebanner";
import { getCaseStatus } from "../actions/services/caseDirectService";
const Home = (props) => {
const { footerLinks, pages } = props;
@@ -127,11 +128,13 @@ const Home = (props) => {
export const getServerSideProps = wrapper.getServerSideProps(
(store) =>
async ({ query, req, res }) => {
let [appealTypeData, projectTypeData, lpaData] = await Promise.all([
await getAppealsTypes(),
await getProjectTypes(),
await getLPA()
]);
let [appealTypeData, projectTypeData, lpaData, caseStatusObj] =
await Promise.all([
await getAppealsTypes(),
await getProjectTypes(),
await getLPA(),
await getCaseStatus()
]);
//const lpaData = require("../data/lpa.json");
//const appealTypeData = require("../data/appealtypes.json");
@@ -139,6 +142,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
store.dispatch(setAppealType(appealTypeData));
store.dispatch(setProjectType(projectTypeData));
store.dispatch(setLPA(lpaData));
store.dispatch(setCaseStatus(caseStatusObj));
}
);
+10 -2
View File
@@ -3,17 +3,25 @@ import { actionTypes } from "redux-form";
export const LPADataActionTypes = {
GETLPADATA: "GETLPADATA",
SETLPADATA: "SETLPADATA",
SETCASESTATUS: "SETCASESTATUS"
};
export const getLPAObj = () => (dispatch) => {
return dispatch({
type: LPADataActionTypes.GETLPADATA,
type: LPADataActionTypes.GETLPADATA
});
};
export const setLPA = (lpaData) => (dispatch) => {
return dispatch({
type: LPADataActionTypes.SETLPADATA,
LPAData: lpaData,
LPAData: lpaData
});
};
export const setCaseStatus = (caseStatusObj) => (dispatch) => {
return dispatch({
type: LPADataActionTypes.SETCASESTATUS,
caseStatusObj: caseStatusObj
});
};
+7 -1
View File
@@ -2,6 +2,7 @@ import { LPADataActionTypes } from "./action";
const LPADataInitialState = {
LPAData: {},
caseStatusObj: {}
};
export default function reducer(state = LPADataInitialState, action) {
@@ -9,7 +10,12 @@ export default function reducer(state = LPADataInitialState, action) {
case LPADataActionTypes.SETLPADATA:
return {
...state,
LPAData: action.LPAData,
LPAData: action.LPAData
};
case LPADataActionTypes.SETCASESTATUS:
return {
...state,
caseStatusObj: action.caseStatusObj
};
default:
return state;