Skip to content

Commit

Permalink
Update UserDashboard component to set Formio base URL and project URL…
Browse files Browse the repository at this point in the history
… from data returned from config API
  • Loading branch information
courtneymyers committed Jan 27, 2025
1 parent 671b196 commit 8505fac
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
21 changes: 17 additions & 4 deletions app/client/src/components/userDashboard.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import { useEffect } from "react";
import { Link, Outlet, useLocation, useNavigate } from "react-router-dom";
import { Formio } from "@formio/react";
import premium from "@formio/premium/lib/index.js";
import uswds from "@formio/uswds";
import icons from "uswds/img/sprite.svg";
// ---
import { serverUrl, formioBaseUrl, formioProjectUrl } from "@/config";
import { serverUrl } from "@/config";
import {
useHelpdeskAccess,
useConfigQuery,
useConfigData,
useBapSamQuery,
useBapSamData,
} from "@/utilities";
import { Loading } from "@/components/loading";
import { useDialogActions } from "@/contexts/dialog";

Formio.setBaseUrl(formioBaseUrl);
Formio.setProjectUrl(formioProjectUrl);
Formio.use(premium); /* eslint-disable-line react-hooks/rules-of-hooks */
Formio.use(uswds); /* eslint-disable-line react-hooks/rules-of-hooks */

Expand Down Expand Up @@ -61,11 +61,24 @@ export function UserDashboard(props: { email: string }) {
useConfigQuery();
useBapSamQuery();

const configData = useConfigData();
const bapSamData = useBapSamData();

const { displayDialog } = useDialogActions();
const helpdeskAccess = useHelpdeskAccess();

useEffect(() => {
const { formioBaseUrl, formioProjectName } = configData ?? {};

if (formioBaseUrl) {
Formio.setBaseUrl(formioBaseUrl);
}

if (formioBaseUrl && formioProjectName) {
Formio.setProjectUrl(`${formioBaseUrl}/${formioProjectName}`);
}
}, [configData]);

const onSubmissionsPage = pathname === "/";
const onHelpdeskPage = pathname === "/helpdesk";
const onFormPage =
Expand Down Expand Up @@ -93,7 +106,7 @@ export function UserDashboard(props: { email: string }) {
});
}

if (!bapSamData || !email) {
if (!configData || !bapSamData || !email) {
return <Loading />;
}

Expand Down
2 changes: 2 additions & 0 deletions app/client/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ export type UserData = {
};

export type ConfigData = {
formioBaseUrl: string;
formioProjectName: string;
rebateYear: RebateYear;
submissionPeriodOpen: {
2022: { frf: boolean; prf: boolean; crf: boolean };
Expand Down

0 comments on commit 8505fac

Please sign in to comment.