From ccd3b8ffc5fb111154a672caf771bbf38e26eb8b Mon Sep 17 00:00:00 2001
From: rdbsolutions <rob@rdbsolutions.co.uk>
Date: Wed, 6 Dec 2023 15:20:09 +0000
Subject: [PATCH] update build id to store version number

---
 components/case/representation/index.js       |   1 +
 .../representation/representationAgent.js     |  24 ++-
 .../representation/representationAppellant.js | 183 ++++++++++--------
 .../representation/representationElements.js  |  54 +++---
 .../representationInterestedPartyPerson.js    | 158 ++++++++-------
 next.config.js                                |  10 +-
 package.json                                  |   1 +
 store/store.js                                |   2 +-
 8 files changed, 250 insertions(+), 183 deletions(-)

diff --git a/components/case/representation/index.js b/components/case/representation/index.js
index eaf568da..f8b1b2d5 100644
--- a/components/case/representation/index.js
+++ b/components/case/representation/index.js
@@ -271,6 +271,7 @@ let MakeRepresentation = (props) => {
                         />
                     );
                     break;
+                case "interestedparty":
                 case t(
                     "myrepresentations:capacity-options-arr-interested"
                 ).toLowerCase():
diff --git a/components/case/representation/representationAgent.js b/components/case/representation/representationAgent.js
index a1cc8e24..7bb7b1c3 100644
--- a/components/case/representation/representationAgent.js
+++ b/components/case/representation/representationAgent.js
@@ -56,12 +56,24 @@ const RepAgent = (props) => {
                     >
                         {t("myrepresentations:kind-of-rep-label")}
                     </label>
-                    <Field
-                        name="representationType"
-                        component={RenderPickList}
-                        datafieldname="representationType"
-                        optionsArr={appellantApplicantRepresentationArr}
-                    />
+                    {typeof props.representationType == "undefined" ||
+                    typeof formObj.representationForm.values
+                        .representationType == "undefined" ? (
+                        <Field
+                            name="representationType"
+                            component={RenderPickList}
+                            datafieldname="representationType"
+                            optionsArr={appellantApplicantRepresentationArr}
+                        />
+                    ) : (
+                        <label className="govuk-label govuk-body-m">
+                            Representation Type:{" "}
+                            {
+                                formObj.representationForm.values
+                                    .representationType
+                            }{" "}
+                        </label>
+                    )}
                 </div>
             </div>
             {/* <div className="govuk-grid-row">
diff --git a/components/case/representation/representationAppellant.js b/components/case/representation/representationAppellant.js
index 4253243a..ce788c73 100644
--- a/components/case/representation/representationAppellant.js
+++ b/components/case/representation/representationAppellant.js
@@ -56,13 +56,12 @@ const RepAppellant = (props) => {
                         className="govuk-label govuk-body-m"
                         htmlFor="representationType"
                     >
-                        {t(
-                            "myrepresentations:representation-from-an-agent-heading"
-                        )}
-                        ?
+                        {t("myrepresentations:kind-of-rep-label")}
                     </label>
 
-                    {typeof props.representationType == "undefined" ? (
+                    {typeof props.representationType == "undefined" ||
+                    typeof formObj.representationForm.values
+                        .representationType == "undefined" ? (
                         <Field
                             name="representationType"
                             component={RenderPickList}
@@ -70,7 +69,13 @@ const RepAppellant = (props) => {
                             optionsArr={appellantApplicantRepresentationArr}
                         />
                     ) : (
-                        <p>{props.representationType}</p>
+                        <label className="govuk-label govuk-body-m">
+                            Representation Type:{" "}
+                            {
+                                formObj.representationForm.values
+                                    .representationType
+                            }{" "}
+                        </label>
                     )}
                 </div>
             </div>
@@ -90,79 +95,103 @@ const RepAppellant = (props) => {
                     </div>
                 </div> */}
 
-            <div className="govuk-grid-row">
-                <div className="govuk-form-group">
-                    <p className="govuk-body">
-                        {t("myrepresentations:enter-comment-label")}
-                    </p>
-                    <fieldset
-                        className="govuk-fieldset"
-                        aria-describedby="commentBox-hint"
-                    >
-                        <div id="commentBox-hint" className="govuk-hint">
-                            {t("myrepresentations:comments-set-out-label")}:
-                        </div>
-                        <div className="govuk-form-group">
-                            <Field
-                                name="representationComments"
-                                id="representationComments"
-                                component={RenderRichMultiline}
-                                type="text"
-                                rows="5"
-                                className="govuk-textarea govuk-input--width-30"
-                                aria-describedby={props.name + "-hint"}
-                            />
-                            {RepresentationGuidanceText(
-                                formObj.representationForm.values.appealType
-                            )}
-                        </div>
-                        <div className="govuk-form-group govuk-!-margin-bottom-9">
-                            <FileUploadField
-                                name={"representationDocuments"}
-                                label={t("myrepresentations:add-files-label")}
-                                ticketnumber={props.props.caseReference}
-                                hint={"sdsd"}
-                                fileList={[]}
-                                setFilesForRepresentation={[]}
-                                containerID={
-                                    props.props.props.accountDetails.containerID
-                                }
-                            />
-                        </div>
-                        {props.currentView.caseReference.hasOwnProperty(
-                            "repDetails"
-                        ) &&
-                        props.currentView.caseReference.repDetails.filesList
-                            .length > 0 ? (
-                            <div className="govuk-form-group govuk-!-margin-bottom-9">
-                                {props.currentView.caseReference.repDetails.filesList.map(
-                                    (blob, i) => (
-                                        <div
-                                            key={blob.name + "_" + i}
-                                            className="govuk-!-margin-bottom-5 fileThumb "
-                                        >
-                                            <img
-                                                src={getThumbnailIconByExtension(
-                                                    blob.name
-                                                )}
-                                                alt={blob.name}
-                                                width="50"
-                                            />
-
-                                            <span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
-                                                {blob.name} (
-                                                {bytesToSize(blob.size)})
-                                            </span>
-                                        </div>
-                                    )
+            {(typeof props.representationType != "undefined" ||
+                typeof formObj.representationForm.values.representationType !=
+                    "undefined") && (
+                <div className="govuk-grid-row">
+                    <div className="govuk-form-group">
+                        <p className="govuk-body">
+                            {t("myrepresentations:enter-comment-label")}
+                        </p>
+                        <fieldset
+                            className="govuk-fieldset"
+                            aria-describedby="commentBox-hint"
+                        >
+                            <div id="commentBox-hint" className="govuk-hint">
+                                {t("myrepresentations:comments-set-out-label")}:
+                            </div>
+                            <div className="govuk-form-group">
+                                <Field
+                                    name="representationComments"
+                                    id="representationComments"
+                                    component={RenderRichMultiline}
+                                    type="text"
+                                    rows="5"
+                                    className="govuk-textarea govuk-input--width-30"
+                                    aria-describedby={props.name + "-hint"}
+                                />
+                                {formObj.representationForm.values.appealType ==
+                                "846040004" ? (
+                                    <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
+                                        {t(
+                                            "myrepresentations:questionnaire-publish-policy-label"
+                                        )}{" "}
+                                        <a href="https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html">
+                                            https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html
+                                        </a>
+                                    </p>
+                                ) : (
+                                    <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
+                                        {t(
+                                            "myrepresentations:publish-policy-label"
+                                        )}{" "}
+                                        <a href="https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html">
+                                            https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html
+                                        </a>
+                                    </p>
                                 )}
                             </div>
-                        ) : (
-                            ""
-                        )}
-                    </fieldset>
-                </div>{" "}
-            </div>
+                            <div className="govuk-form-group govuk-!-margin-bottom-9">
+                                <FileUploadField
+                                    name={"representationDocuments"}
+                                    label={t(
+                                        "myrepresentations:add-files-label"
+                                    )}
+                                    ticketnumber={props.props.caseReference}
+                                    hint={"sdsd"}
+                                    fileList={[]}
+                                    setFilesForRepresentation={[]}
+                                    containerID={
+                                        props.props.props.accountDetails
+                                            .containerID
+                                    }
+                                />
+                            </div>
+                            {props.currentView.caseReference.hasOwnProperty(
+                                "repDetails"
+                            ) &&
+                            props.currentView.caseReference.repDetails.filesList
+                                .length > 0 ? (
+                                <div className="govuk-form-group govuk-!-margin-bottom-9">
+                                    {props.currentView.caseReference.repDetails.filesList.map(
+                                        (blob, i) => (
+                                            <div
+                                                key={blob.name + "_" + i}
+                                                className="govuk-!-margin-bottom-5 fileThumb "
+                                            >
+                                                <img
+                                                    src={getThumbnailIconByExtension(
+                                                        blob.name
+                                                    )}
+                                                    alt={blob.name}
+                                                    width="50"
+                                                />
+
+                                                <span className="govuk-body govuk-!-font-size-14 govuk-!-padding-left-5">
+                                                    {blob.name} (
+                                                    {bytesToSize(blob.size)})
+                                                </span>
+                                            </div>
+                                        )
+                                    )}
+                                </div>
+                            ) : (
+                                ""
+                            )}
+                        </fieldset>
+                    </div>{" "}
+                </div>
+            )}
             <div className="govuk-grid-row">
                 <div className="govuk-button-group">
                     <button
diff --git a/components/case/representation/representationElements.js b/components/case/representation/representationElements.js
index ae40409b..08d57456 100644
--- a/components/case/representation/representationElements.js
+++ b/components/case/representation/representationElements.js
@@ -1128,32 +1128,32 @@ export function FileUploadField(props) {
     );
 }
 
-export const RepresentationGuidanceText = (appealType) => {
-    let { t } = useTranslation();
+// export const RepresentationGuidanceText = (appealType) => {
+//     let { t } = useTranslation();
 
-    console.log(appealType);
-    switch (appealType) {
-        case "846040004": //has/cas
-            return (
-                <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
-                    {t("myrepresentations:questionnaire-publish-policy-label")}{" "}
-                    <a href="https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html">
-                        https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html
-                    </a>
-                </p>
-            );
-            break;
-        default:
-            return (
-                <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
-                    {t("myrepresentations:publish-policy-label")}{" "}
-                    <a href="https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html">
-                        https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html
-                    </a>
-                </p>
-            );
-            break;
-    }
+//     console.log(appealType);
+//     switch (appealType) {
+//         case "846040004": //has/cas
+//             return (
+//                 <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
+//                     {t("myrepresentations:questionnaire-publish-policy-label")}{" "}
+//                     <a href="https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html">
+//                         https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html
+//                     </a>
+//                 </p>
+//             );
+//             break;
+//         default:
+//             return (
+//                 <p className="govuk-hint govuk-!-font-size-14 govuk-!-margin-top-5">
+//                     {t("myrepresentations:publish-policy-label")}{" "}
+//                     <a href="https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html">
+//                         https://gov.wales/planning-and-environment-decisions-wales-publishing-policy-html
+//                     </a>
+//                 </p>
+//             );
+//             break;
+//     }
 
-    return guidanceString;
-};
+//     return guidanceString;
+// };
diff --git a/components/case/representation/representationInterestedPartyPerson.js b/components/case/representation/representationInterestedPartyPerson.js
index d07e6e6d..6fde5f43 100644
--- a/components/case/representation/representationInterestedPartyPerson.js
+++ b/components/case/representation/representationInterestedPartyPerson.js
@@ -36,7 +36,7 @@ const RepInterestedPartyPerson = (props) => {
             <div className="govuk-grid-row">
                 <h2 className="govuk-heading-m ">
                     {t(
-                        "myrepresentations:representation-from-an-interested-party-heading"
+                        "myrepresentations:representation-from-an-interested-person-heading"
                     )}
                 </h2>
                 <div className="govuk-form-group">
@@ -44,82 +44,104 @@ const RepInterestedPartyPerson = (props) => {
                         className="govuk-label govuk-body-m"
                         htmlFor="representationType"
                     >
-                        {t(
-                            "myrepresentations:representation-from-an-agent-heading"
-                        )}
-                        ?
+                        {t("myrepresentations:kind-of-rep-label")}
                     </label>
-                    <Field
-                        name="representationType"
-                        component={RenderPickList}
-                        datafieldname="representationType"
-                        validate={[required]}
-                        optionsArr={interestedPersonRepresentationArr}
-                        errorMsg={t("newappeal:select-an-option-label")}
-                    />
+                    {typeof props.representationType == undefined ||
+                    typeof formObj.representationForm.values
+                        .representationType == "undefined" ? (
+                        <Field
+                            name="representationType"
+                            component={RenderPickList}
+                            datafieldname="representationType"
+                            validate={[required]}
+                            optionsArr={interestedPersonRepresentationArr}
+                            errorMsg={t("newappeal:select-an-option-label")}
+                        />
+                    ) : (
+                        <label className="govuk-label govuk-body-m">
+                            Representation Type:{" "}
+                            {
+                                formObj.representationForm.values
+                                    .representationType
+                            }{" "}
+                        </label>
+                    )}
                 </div>
             </div>
-
-            <div className="govuk-grid-row">
-                <div className="govuk-form-group">
-                    <Field
-                        name="representationOnBehalfOf"
-                        datafieldname="representationOnBehalfOf"
-                        // label="In what capacity do you wish to make representations on this case?"
-                        options={["Yes", "No"]}
-                        id="representationOnBehalfOf"
-                        className="govuk-radios__input"
-                        errorMsg={t("newappeal:select-an-option-label")}
-                        component={RenderCondtionalRadioList}
-                        validate={[required]}
-                        legend={
-                            "Are you acting on behalf of a company, group or organisation?"
-                        }
-                    />
-                </div>
-            </div>
-
-            <div className="govuk-grid-row">
-                <div className="govuk-form-group">
-                    <p className="govuk-body">
-                        {t("myrepresentations:enter-comment-label")}
-                    </p>
-                    <fieldset
-                        className="govuk-fieldset"
-                        aria-describedby="commentBox-hint"
-                    >
-                        <div id="commentBox-hint" className="govuk-hint">
-                            {t("myrepresentations:comments-set-out-label")}:
-                        </div>
+            {(typeof props.representationType != "undefined" ||
+                typeof formObj.representationForm.values.representationType !=
+                    "undefined") && (
+                <>
+                    <div className="govuk-grid-row">
                         <div className="govuk-form-group">
                             <Field
-                                name="representationComments"
-                                id="representationComments"
-                                component={RenderRichMultiline}
-                                type="text"
-                                rows="5"
-                                className="govuk-textarea govuk-input--width-30"
-                                aria-describedby={props.name + "-hint"}
-                            />
-                        </div>
-
-                        <div className="govuk-form-group govuk-!-margin-bottom-9">
-                            <FileUploadField
-                                name={"representationDocuments"}
-                                label={t("myrepresentations:add-files-label")}
-                                ticketnumber={props.props.caseReference}
-                                hint={"sdsd"}
-                                fileList={[]}
-                                setFilesForRepresentation={[]}
-                                containerID={
-                                    props.props.props.accountDetails.containerID
+                                name="representationOnBehalfOf"
+                                datafieldname="representationOnBehalfOf"
+                                // label="In what capacity do you wish to make representations on this case?"
+                                options={["Yes", "No"]}
+                                id="representationOnBehalfOf"
+                                className="govuk-radios__input"
+                                errorMsg={t("newappeal:select-an-option-label")}
+                                component={RenderCondtionalRadioList}
+                                validate={[required]}
+                                legend={
+                                    "Are you acting on behalf of a company, group or organisation?"
                                 }
                             />
                         </div>
-                    </fieldset>
-                </div>{" "}
-            </div>
+                    </div>
 
+                    <div className="govuk-grid-row">
+                        <div className="govuk-form-group">
+                            <p className="govuk-body">
+                                {t("myrepresentations:enter-comment-label")}
+                            </p>
+                            <fieldset
+                                className="govuk-fieldset"
+                                aria-describedby="commentBox-hint"
+                            >
+                                <div
+                                    id="commentBox-hint"
+                                    className="govuk-hint"
+                                >
+                                    {t(
+                                        "myrepresentations:comments-set-out-label"
+                                    )}
+                                    :
+                                </div>
+                                <div className="govuk-form-group">
+                                    <Field
+                                        name="representationComments"
+                                        id="representationComments"
+                                        component={RenderRichMultiline}
+                                        type="text"
+                                        rows="5"
+                                        className="govuk-textarea govuk-input--width-30"
+                                        aria-describedby={props.name + "-hint"}
+                                    />
+                                </div>
+
+                                <div className="govuk-form-group govuk-!-margin-bottom-9">
+                                    <FileUploadField
+                                        name={"representationDocuments"}
+                                        label={t(
+                                            "myrepresentations:add-files-label"
+                                        )}
+                                        ticketnumber={props.props.caseReference}
+                                        hint={"sdsd"}
+                                        fileList={[]}
+                                        setFilesForRepresentation={[]}
+                                        containerID={
+                                            props.props.props.accountDetails
+                                                .containerID
+                                        }
+                                    />
+                                </div>
+                            </fieldset>
+                        </div>{" "}
+                    </div>
+                </>
+            )}
             <div className="govuk-grid-row">
                 <div className="govuk-button-group">
                     <button
diff --git a/next.config.js b/next.config.js
index 0dd67f77..ba443dec 100644
--- a/next.config.js
+++ b/next.config.js
@@ -2,6 +2,7 @@
 //const withStyles = require("@webdeb/next-styles");
 //const { nextI18NextRewrites } = require("next-i18next/rewrites");
 const nextTranslate = require("next-translate-plugin");
+const nextBuildId = require("next-build-id");
 
 // module.exports = withStyles({
 //     sass: true, // use .scss files
@@ -52,8 +53,12 @@ const securityHeaders = [
     //     value: "frame-src 'self'; child-src 'self';object-src 'none'; script-src 'self' 'https://www.googletagmanager.com' unsafe-inline",
     // },
 ];
+const buildId = nextBuildId.sync({ dir: __dirname });
 
 module.exports = {
+    env: {
+        BUILD_ID_ENV: buildId,
+    },
     swcMinify: false,
     sassOptions: {
         includePaths: [
@@ -72,10 +77,7 @@ module.exports = {
             },
         ];
     },
-    generateBuildId: async () => {
-        // You can, for example, get the latest git commit hash here
-        return "pinswg-build-id";
-    },
+    generateBuildId: () => buildId,
     poweredByHeader: false,
     async rewrites() {
         return [
diff --git a/package.json b/package.json
index b7e25f97..1a058bfc 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
         "nanoid": "^3.2.0",
         "next": "^14.0.1",
         "next-auth": "^4.24.4",
+        "next-build-id": "^3.0.0",
         "next-connect": "^0.12.2",
         "next-redux-wrapper": "^7.0.5",
         "next-swagger-doc": "^0.4.0",
diff --git a/store/store.js b/store/store.js
index dd4d0279..c8bfb945 100644
--- a/store/store.js
+++ b/store/store.js
@@ -137,7 +137,7 @@ const makeStore = ({ isServer }) => {
                 "watchedCases",
                 "form",
             ],
-            version: 3,
+            version: process.env.BUILD_ID_ENV,
             storage: storage,
             stateReconciler: autoMergeLevel2, // if needed, use a safer storage
             migrate: createMigrate(migrations, { debug: true }),