Skip to content

Commit

Permalink
Merge pull request #261 from djnunez-aot/ux/update-yellow-bars
Browse files Browse the repository at this point in the history
Update yellow bar spacing & submission form container
  • Loading branch information
jadmsaadaot authored Jan 27, 2025
2 parents dabd72a + 37629e6 commit de3f26a
Show file tree
Hide file tree
Showing 11 changed files with 259 additions and 383 deletions.
3 changes: 2 additions & 1 deletion submit-web/src/components/Shared/Text/BarTitle.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Box, Typography } from "@mui/material";
import { YellowBar } from "../YellowBar";
import { BCDesignTokens } from "epic.theme";

export default function BarTitle({ title }: { title: string }) {
return (
<Box>
<Box sx={{ mt: BCDesignTokens.layoutMarginMedium }}>
<YellowBar />
<Typography variant="h5">{title}</Typography>
</Box>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,39 +48,39 @@ export const ConsultationRecordProponentView = () => {
]);

const formSubmission = submissionItem?.submissions?.find(
(submission) => submission.type === SUBMISSION_TYPE.FORM,
(submission) => submission.type === SUBMISSION_TYPE.FORM
);
const defaultFormValues = useMemo(() => {
if (!formSubmission?.submitted_form?.submission_json) return {};

return {
...formSubmission.submitted_form.submission_json,
allPartiesConsulted: booleanToString(
formSubmission.submitted_form.submission_json.allPartiesConsulted,
formSubmission.submitted_form.submission_json.allPartiesConsulted
),
planWasReviewed: booleanToString(
formSubmission.submitted_form.submission_json.planWasReviewed,
formSubmission.submitted_form.submission_json.planWasReviewed
),
writtenExplanationsProvidedToParties: booleanToString(
formSubmission.submitted_form.submission_json
.writtenExplanationsProvidedToParties,
.writtenExplanationsProvidedToParties
),
writtenExplanationsProvidedToCommenters: booleanToString(
formSubmission.submitted_form.submission_json
.writtenExplanationsProvidedToCommenters,
.writtenExplanationsProvidedToCommenters
),
};
}, [formSubmission]);

const documentSubmissions = submissionItem?.submissions?.filter(
(submission) => submission.type === SUBMISSION_TYPE.DOCUMENT,
(submission) => submission.type === SUBMISSION_TYPE.DOCUMENT
);
const defaultDocumentValues = useMemo(() => {
if (!documentSubmissions) return {};

return {
consultationRecords: documentSubmissions.map(
(submission) => submission.submitted_document.url,
(submission) => submission.submitted_document.url
),
};
}, [documentSubmissions]);
Expand Down Expand Up @@ -132,7 +132,7 @@ export const ConsultationRecordProponentView = () => {

const saveSubmission = async (
formData: ConsultationRecordForm,
status: SubmissionItemStatus,
status: SubmissionItemStatus
) => {
const {
consultedParties,
Expand All @@ -151,10 +151,10 @@ export const ConsultationRecordProponentView = () => {
allPartiesConsulted: stringToBoolean(allPartiesConsulted),
planWasReviewed: stringToBoolean(planWasReviewed),
writtenExplanationsProvidedToParties: stringToBoolean(
writtenExplanationsProvidedToParties,
writtenExplanationsProvidedToParties
),
writtenExplanationsProvidedToCommenters: stringToBoolean(
writtenExplanationsProvidedToCommenters,
writtenExplanationsProvidedToCommenters
),
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const ConsultationRecordStaffView = () => {
});

const formSubmission = submissionItem?.submissions?.find(
(submission) => submission.type === SUBMISSION_TYPE.FORM,
(submission) => submission.type === SUBMISSION_TYPE.FORM
);

const formData = useMemo(() => {
Expand Down
Loading

0 comments on commit de3f26a

Please sign in to comment.