misc updates for filter and languages

actions/index.js

@@ -2,6 +2,7 @@ import axios from "axios";
 import https from "https";
 import CryptoJS from "crypto-js";
 import HmacSHA256 from "crypto-js/hmac-sha256";
+import { getFormCollection } from "../components/utils";
 
 let BASE_URL;
 const port = parseInt(process.env.PORT, 10) || 3000;
@@ -570,6 +571,13 @@ export const getAppealID = (
     updateFormCollection,
     primaryAttribute
 ) => {
+    console.log(
+        "is this the collection?:",
+        getFormCollection(updateFormCollection)
+    );
+
+    let formCollectionName = getFormCollection(updateFormCollection);
+    console.log(formCollectionName);
     return axios
         .get(
             "/api/endpoint/getappealid_api?updateFormCollection=" +
@@ -580,8 +588,11 @@ export const getAppealID = (
                 caseReference
         )
         .then((res) => {
-            console.log(res.data);
+            const result = Object.entries(res.data.value[0]).filter(
-            var appealID = res.data.value[0][primaryAttribute];
+                ([key]) => !key.startsWith("_")
+            )[0][1];
+
+            var appealID = result;
             return appealID;
         })
         .catch((error) => {

components/case/documents.js

@@ -79,7 +79,14 @@ const DocumentDetails = (props) => {
                                     id="showDocumentType"
                                     name="showDocumentType"
                                 >
-                                    <option value="all">All</option>
+                                    <option value="all">
+                                        {router.locale == "cy"
+                                            ? jsonpath.query(
+                                                  transLookup,
+                                                  '$..[?(@.value=="All")].value_cy'
+                                              )
+                                            : "All"}
+                                    </option>
                                     {documentTypes.map((item, key) => {
                                         return (
                                             <option
@@ -88,9 +95,17 @@ const DocumentDetails = (props) => {
                                                     item.pinswg_isharedocumentlocations
                                                 }
                                             >
-                                                {
+                                                {router.locale == "cy"
-                                                    item.pinswg_isharedocumentlocationsLabel
+                                                    ? jsonpath.query(
-                                                }
+                                                          transLookup,
+                                                          '$..[?(@.value=="' +
+                                                              item.pinswg_isharedocumentlocationsLabel +
+                                                              '")].value_cy'
+                                                      )
+                                                    : item.pinswg_isharedocumentlocationsLabel ||
+                                                      t(
+                                                          "case:summary-no-date-entered-label"
+                                                      )}
                                             </option>
                                         );
                                     })}
@@ -364,6 +379,7 @@ const DocumentDetails = (props) => {
         selectedDocumentType,
         fieldSortState,
         orderByState,
+        getDocumentTypes,
         getDocumentResults,
     ]);
 
@@ -390,7 +406,12 @@ const DocumentDetails = (props) => {
                     setShowSpinnerState(false);
                 });
         },
-        [props.incidentid, selectedOption, selectedDocumentType]
+        [
+            props.incidentid,
+            selectedOption,
+            selectedDocumentType,
+            setDocumentDetails,
+        ]
     );
 
     const getDocumentDetails = async () => {

components/newappeal/createCase.js

@@ -11,6 +11,7 @@ import {
 } from "../../store/appealType/action";
 import { getFormCollectionByID } from "../utils";
 import FileUpload from "./fileupload";
+import Aboutyou from "./aboutyou";
 
 let CreateCase = (props) => {
     // useEffect(() => {
@@ -231,6 +232,7 @@ let CreateCase = (props) => {
 
     return (
         <form onSubmit={handleSubmit(onHandleSubmit)}>
+            {/* <Aboutyou /> */}
             <Field
                 name="lpaTypes"
                 component={RenderLPAList}

components/search/dnssearchresults.js

@@ -235,13 +235,41 @@ const DNSSearchResults = (props) => {
                     <dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
                         <div className="govuk-summary-list__row results-headings">
                             <dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider  ">
-                                {t("search:searchresults-case-reference-label")}
+                                <button
+                                    type="button"
+                                    onClick={() => sortDataBy("title")}
+                                    className={
+                                        orderByState == "title"
+                                            ? fieldSortState == "asc"
+                                                ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                                : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                            : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                    }
+                                >
+                                    {t(
+                                        "search:searchresults-case-reference-label"
+                                    )}
+                                </button>
                             </dd>
                             <dd className="govuk-summary-list__key govuk-!-font-size-16">
                                 {t("search:searchresults-site-address-label")}
                             </dd>
                             <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                                <button
+                                    type="button"
+                                    onClick={() =>
+                                        sortDataBy("_customerid_value")
+                                    }
+                                    className={
+                                        orderByState == "_customerid_value"
+                                            ? fieldSortState == "asc"
+                                                ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                                : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                            : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                    }
+                                >
                                     {t("search:searchresults-applicant-label")}
+                                </button>
                             </dd>
                             <dd className="govuk-summary-list__key govuk-!-font-size-16">
                                 <button

components/search/searchresults.js

@@ -163,16 +163,39 @@ const SearchResults = (props) => {
                 <dl className="govuk-summary-list govuk-!-margin-bottom-9 results">
                     <div className="govuk-summary-list__row results-headings">
                         <dd className="govuk-summary-list__key govuk-!-font-size-16 results_wider  ">
+                            <button
+                                type="button"
+                                onClick={() => sortDataBy("title")}
+                                className={
+                                    orderByState == "title"
+                                        ? fieldSortState == "asc"
+                                            ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                            : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                        : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                }
+                            >
                                 {t("search:searchresults-case-reference-label")}
+                            </button>
                         </dd>
                         <dd className="govuk-summary-list__key govuk-!-font-size-16">
                             {t("search:searchresults-site-address-label")}
                         </dd>
                         <dd className="govuk-summary-list__key govuk-!-font-size-16">
+                            <button
+                                type="button"
+                                onClick={() => sortDataBy("_customerid_value")}
+                                className={
+                                    orderByState == "_customerid_value"
+                                        ? fieldSortState == "asc"
+                                            ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
+                                            : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
+                                        : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16`
+                                }
+                            >
                                 {t("search:searchresults-applicant-label")}
+                            </button>
                         </dd>
                         <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                            {/* {t("search:searchresults-authority-label")} */}
                             <button
                                 type="button"
                                 onClick={() =>
@@ -191,7 +214,6 @@ const SearchResults = (props) => {
                             </button>
                         </dd>
                         <dd className="govuk-summary-list__key govuk-!-font-size-16">
-                            {/* {t("search:searchresults-case-type-label")} */}
                             <button
                                 type="button"
                                 onClick={() =>

data/collections.json

@@ -315,15 +315,6 @@
             "appealTypeID": "846040025",
             "NavigationProperty": "pinswg_ListedBuildingandConservationrIds"
         },
-        {
-            "LogicalCollectionName": "pinswg_listedbuildingandconservationareaconsens",
-            "LogicalName": "pinswg_listedbuildingconservationareaconsent",
-            "PrimaryIdAttribute": "pinswg_listedbuildingandconservationrid",
-            "UrlName": "listedbuildingandconservationareaconsen",
-            "MetadataId": "4cd95405-8f81-eb11-aac0-00224800be9c",
-            "appealTypeID": "846040025",
-            "NavigationProperty": "pinswg_ListedBuildingandConservationrIds"
-        },
         {
             "LogicalCollectionName": "pinswg_environmentalpermittings",
             "LogicalName": "pinswg_environmentalpermitting",

data/lookuptranslations.json

@@ -444,6 +444,11 @@
         }
     ],
     "pinswg_isharedocumentlocations": [
+        {
+            "value": "All",
+            "value_cy": "I gyd",
+            "pinswg_isharedocumentlocations": 0
+        },
         {
             "value": "Main Party - Pre-Submission Docs",
             "value_cy": "Prif Barti - Dogfennau Cyn Cyflwyno",