diff --git a/.env.local b/.env.local index 548fde8a..c7c45767 100644 --- a/.env.local +++ b/.env.local @@ -93,13 +93,13 @@ CRMURL_VERSION = "v8.2" # CRMURL_VERSION = "v9.2" # D365 PP WGO -# CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a -# CLIENT_SECRET = V288Q~P1lFMvvX9Xnkx2pLixK~GOREH983Owqc1E -# RELAY_ROOT = https://ar-ns-lz-pedw-d365ppe-uks-01.servicebus.windows.net/ar-hc-lz-pedw-d365ppe-uks-01/ -# RELAYURI = "ar-ns-lz-pedw-d365ppe-uks-01.servicebus.windows.net" -# RELAYPATH = "ar-hc-lz-pedw-d365ppe-uks-01" -# CRMURL = "wg-pp-pedw.crm11.dynamics.com" -# CRMURL_VERSION = "v9.2" +CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a +CLIENT_SECRET = V288Q~P1lFMvvX9Xnkx2pLixK~GOREH983Owqc1E +RELAY_ROOT = https://ar-ns-lz-pedw-d365ppe-uks-01.servicebus.windows.net/ar-hc-lz-pedw-d365ppe-uks-01/ +RELAYURI = "ar-ns-lz-pedw-d365ppe-uks-01.servicebus.windows.net" +RELAYPATH = "ar-hc-lz-pedw-d365ppe-uks-01" +CRMURL = "wg-pp-pedw.crm11.dynamics.com" +CRMURL_VERSION = "v9.2" diff --git a/components/search/addresssearchresults.js b/components/search/addresssearchresults.js index 90b43527..3e25a6ab 100644 --- a/components/search/addresssearchresults.js +++ b/components/search/addresssearchresults.js @@ -311,7 +311,7 @@ const SearchResults = (props) => { resultsArrPaged.map((item, key) => { let detailsObj = jsonpath({ path: - '$..value[?(@ && @.ticketnumber=="' + + '$..[?(@ && @.ticketnumber=="' + item.ticketnumber + '")]', diff --git a/components/search/dnssearchresults.js b/components/search/dnssearchresults.js index 68500ec5..558b9f1a 100644 --- a/components/search/dnssearchresults.js +++ b/components/search/dnssearchresults.js @@ -381,7 +381,7 @@ const DNSSearchResults = (props) => { resultsArr.map((item, key) => { let detailsObj = jsonpath({ path: - '$..value[?(@ && @.ticketnumber=="' + + '$..[?(@ && @.ticketnumber=="' + item.ticketnumber + '")]', json: searchDetailsObj, diff --git a/components/search/searchresults.js b/components/search/searchresults.js index aa8bf582..0d75b7be 100644 --- a/components/search/searchresults.js +++ b/components/search/searchresults.js @@ -331,7 +331,7 @@ const SearchResults = (props) => { resultsArr.map((item, key) => { let detailsObj = jsonpath({ path: - '$..value[?(@ && @.ticketnumber=="' + + '$..[?(@ && @.ticketnumber=="' + item.ticketnumber + '")]', json: searchDetailsObj, @@ -451,24 +451,24 @@ const SearchResults = (props) => { ";" )[0] : "" - : hasValidKey( - item, - "pinswg_caseaddress" - ) - ? item.pinswg_caseaddress != null - ? item.pinswg_caseaddress.indexOf( - ";" - ) < 0 - ? item.pinswg_caseaddress - : router.locale == "cy" - ? item.pinswg_caseaddress.split( - ";" - )[1] - : item.pinswg_caseaddress.split( - ";" - )[0] - : "" - : ""} + : // : hasValidKey( + // item, + // "pinswg_caseaddress" + // ) + // ? item.pinswg_caseaddress != null + // ? item.pinswg_caseaddress.indexOf( + // ";" + // ) < 0 + // ? item.pinswg_caseaddress + // : router.locale == "cy" + // ? item.pinswg_caseaddress.split( + // ";" + // )[1] + // : item.pinswg_caseaddress.split( + // ";" + // )[0] + // : "" + ""} {_.has( detailsObj, "pinswg_siteaddressline1" diff --git a/locales/cy/myrepresentations.json b/locales/cy/myrepresentations.json index 8bc4965d..027f2b3a 100644 --- a/locales/cy/myrepresentations.json +++ b/locales/cy/myrepresentations.json @@ -31,7 +31,7 @@ "questionnaire-publish-policy-label": "Sylwch y gallai'r holl ddogfennau holiadur gael eu cyhoeddi yn unol รข'n Polisi Cyhoeddi. Os bydd eich holiadur yn cynnwys unrhyw wybodaeth sensitif neu wybodaeth a allai fod yn ddifenwol, efallai y caiff ei olygu cyn ei gyhoeddi", "add-files-label": "Ychwanegwch eich ffeiliau", "fileupload-drop-label": "Llusgwch a gollyngwch eich ffeiliau yma.", - "fileupload-file-list-label": "Dim ond ffeiliau .pdf, .doc, .docx, .xlsx, .tif, .tiff, .jpeg, .jpg neu .zip a dderbynnir", + "fileupload-file-list-label": "Dim ond ffeiliau .pdf, .doc, .docx, .xlsx, .tif, .tiff, .jpeg neu .jpg a dderbynnir", "fileupload-file-error-filesize-label": "yn rhy fawr. Llwythwch ffeil lai i fyny.", "fileupload-file-error-invalid-type-label": "mae ganddo fath annilys. Uwchlwythwch fath a ganiateir.", "fileupload-file-error-invalid-label": "yn annilys", diff --git a/locales/cy/newappeal.json b/locales/cy/newappeal.json index a7ff3284..bd59bbd9 100644 --- a/locales/cy/newappeal.json +++ b/locales/cy/newappeal.json @@ -82,7 +82,7 @@ "new-appeal-procedure-option-inperson": "Wyneb yn wyneb", "new-appeal-procedure-option-hybrid": "Hybrid", "new-appeal-fileupload-drop-label": "Llusgwch a gollyngwch eich ffeiliau yma.", - "new-appeal-fileupload-file-list-label": "Dim ond ffeiliau .pdf, .doc, .docx, .xlsx .tif, .tiff, .jpeg, .jpg neu .zip a dderbynnir", + "new-appeal-fileupload-file-list-label": "Dim ond ffeiliau .pdf, .doc, .docx, .xlsx, .tif, .tiff, .jpeg neu .jpg a dderbynnir", "new-appeal-fileupload-file-error-filesize-label": "yn rhy fawr. Llwythwch ffeil lai i fyny.", "new-appeal-fileupload-file-error-invalid-type-label": "mae ganddo fath annilys. Uwchlwythwch fath a ganiateir.", "new-appeal-fileupload-file-error-invalid-label": "yn annilys", diff --git a/locales/en/myrepresentations.json b/locales/en/myrepresentations.json index a252d6a2..aaa4e53a 100644 --- a/locales/en/myrepresentations.json +++ b/locales/en/myrepresentations.json @@ -31,7 +31,7 @@ "questionnaire-publish-policy-label": "Please note that all questionnaire documents may be published in line with our Publishing Policy. Should your questionnaire include any sensitive information or potentially defamatory information, it may be redacted before publishing", "add-files-label": "Add your files", "fileupload-drop-label": "Drag and drop your files here.", - "fileupload-file-list-label": "Only .pdf, .doc, .docx, .xlsx, .tif, .tiff, .jpeg, .jpg or .zip files will be accepted", + "fileupload-file-list-label": "Only .pdf, .doc, .docx, .xlsx, .tif, .tiff, .jpeg or .jpg files will be accepted", "fileupload-file-error-filesize-label": "is too large. Please upload a smaller file.", "fileupload-file-error-invalid-type-label": "has an invalid type. Please upload an allowed type.", "fileupload-file-error-invalid-label": "is invalid", diff --git a/locales/en/newappeal.json b/locales/en/newappeal.json index 7efe0599..8580faf2 100644 --- a/locales/en/newappeal.json +++ b/locales/en/newappeal.json @@ -82,7 +82,7 @@ "new-appeal-procedure-option-inperson": "In person", "new-appeal-procedure-option-hybrid": "Hybrid", "new-appeal-fileupload-drop-label": "Drag and drop your files here.", - "new-appeal-fileupload-file-list-label": "Only .pdf, .doc, .docx, .xlsx, .tif, .tiff, .jpeg, .jpg or .zip files will be accepted", + "new-appeal-fileupload-file-list-label": "Only .pdf, .doc, .docx, .xlsx, .tif, .tiff, .jpeg or .jpg files will be accepted", "new-appeal-fileupload-file-error-filesize-label": "is too large. Please upload a smaller file.", "new-appeal-fileupload-file-error-invalid-type-label": "has an invalid type. Please upload an allowed type.", "new-appeal-fileupload-file-error-invalid-label": "is invalid",