From d187907802970f442b97bea040f54cb2f7d9f8ef Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Wed, 6 Nov 2024 17:34:30 +0000 Subject: [PATCH] added fixes to reduce error when calling module details and filtering of docs --- .env.local | 100 ++-- actions/index.js | 8 +- components/breadcrumbs.js | 60 ++- components/case.js | 11 +- components/case/documents.js | 502 +++++++++++++++++- components/case/summary.js | 121 +++-- components/search/dnssearchresults.js | 16 +- components/search/searchresults.js | 17 +- i18n.js | 2 + pages/_document.js | 6 +- pages/api/endpoint/getdnslist_api.js | 13 +- .../endpoint/getsearchdocumentTypes_api.js | 48 +- .../getsearchdocumentdetailspaged_api.js | 37 +- pages/case/[ticketnumber].js | 4 + pages/dns/[developmentName].js | 62 ++- pages/myportal/dns/[developmentName].js | 270 ++++++++++ pages/myportal/index.js | 74 +-- styles/sass/welshgov/_application.scss | 195 +++++-- 18 files changed, 1277 insertions(+), 269 deletions(-) create mode 100644 pages/myportal/dns/[developmentName].js diff --git a/.env.local b/.env.local index f47e7a34..f625048c 100644 --- a/.env.local +++ b/.env.local @@ -4,47 +4,46 @@ GRANT_TYPE = "client_credentials" HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136d84f68818d3a96399467b52143e273d4f3bf4ae190848891535421cd6c -//CNR oauth CNR -CLIENT_ID = 3125ac03-91ac-46a7-a166-0086f0ed90b3 -CLIENT_SECRET = bFq8Q~9VX5Ra3lKnGGIXsB.G6-ZGMx7LqyqXjdr4 -RELAY_ROOT = https://ar-ns-lz-pedw-cnr-uks-01.servicebus.windows.net/ar-hc-lz-pedw-cnr-uks-01/ -RELAYURI = "ar-ns-lz-pedw-cnr-uks-01.servicebus.windows.net" -RELAYPATH = "ar-hc-lz-pedw-cnr-uks-01" -CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS" +# //CNR oauth CNR +# CLIENT_ID = 3125ac03-91ac-46a7-a166-0086f0ed90b3 +# CLIENT_SECRET = bFq8Q~9VX5Ra3lKnGGIXsB.G6-ZGMx7LqyqXjdr4 +# RELAY_ROOT = https://ar-ns-lz-pedw-cnr-uks-01.servicebus.windows.net/ar-hc-lz-pedw-cnr-uks-01/ +# RELAYURI = "ar-ns-lz-pedw-cnr-uks-01.servicebus.windows.net" +# RELAYPATH = "ar-hc-lz-pedw-cnr-uks-01" +# CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS" -//New Dev oauth ESNR -CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a -CLIENT_SECRET = .Jf8Q~tKMObCJjhh_hy3J5AIctFrBalU4FS~tdxk -RELAY_ROOT = https://ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net/ar-hc-lz-pedw-dev-uks-01/ -RELAYURI = "ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net" -RELAYPATH = "ar-hc-lz-pedw-dev-uks-01" -CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS" +# //New Dev oauth ESNR +# CLIENT_ID = 9b834097-03d7-409b-b038-ecfec31a394a +# CLIENT_SECRET = .Jf8Q~tKMObCJjhh_hy3J5AIctFrBalU4FS~tdxk +# RELAY_ROOT = https://ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net/ar-hc-lz-pedw-dev-uks-01/ +# RELAYURI = "ar-ns-lz-pedw-dev-uks-01.servicebus.windows.net" +# RELAYPATH = "ar-hc-lz-pedw-dev-uks-01" +# CRMURL = "devcrm2016.llcdt.gov.wales/DVPINS" -//New Test -# CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1 -# CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM -# RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/ -# RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net" -# RELAYPATH = "ar-hc-lz-pedw-test-uks-01" -# CRMURL = "tscrm2016.llcdt.gov.wales/UATPINS" +# //New Test +CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1 +CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM +RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/ +RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net" +RELAYPATH = "ar-hc-lz-pedw-test-uks-01" +CRMURL = "tscrm2016.llcdt.gov.wales/UATPINS" -//Preprod Oauth WGO -//CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a -////CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF -//CLIENT_SECRET = V288Q~P1lFMvvX9Xnkx2pLixK~GOREH983Owqc1E -//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/ -//RELAYURI = "pp-pedw-ns.servicebus.windows.net" -//RELAYPATH = "pp-pedw-hc" -//CRMURL = "ppcrm2016.llc.gov.wales/PPPINSWales" +# //New PreProd +# CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a +# CLIENT_SECRET = V288Q~P1lFMvvX9Xnkx2pLixK~GOREH983Owqc1E +# RELAY_ROOT = https://ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-ukw-01/ +# RELAYURI = "ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net" +# RELAYPATH = "ar-hc-lz-pedw-ppe-ukw-01" +# CRMURL = "ppcrm2016.llcdt.gov.wales/UATPINS" -//Prod Oauth WGO -//CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc -////CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~ -//CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR -//RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ -//RELAYURI = "prod-pedw-ns.servicebus.windows.net" -//RELAYPATH = "prod-pedw-hc" -//CRMURL = "crm2016.llc.gov.wales/PEDW" + +# //Prod Oauth WGO +# CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc +# CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR +# RELAY_ROOT = https://prod-pedw-ns.servicebus.windows.net/prod-pedw-hc/ +# RELAYURI = "prod-pedw-ns.servicebus.windows.net" +# RELAYPATH = "prod-pedw-hc" +# CRMURL = "crm2016.llc.gov.wales/PEDW" //GOOGLE_TAG_MANAGER = GTM-T78CBC3 @@ -52,11 +51,12 @@ GOOGLE_TAG_MANAGER = G-GTWW3JT03Z SHOWLOGIN = true SHOWREPRESENTATIONS = true SHOWFILEUPLOAD = "false" -SHOWMAPS = "false" +SHOWMAPS = true API_ROOT = "http://localhost:3000" CY_API_ROOT = "http://cymru.local:3000" I18N_DOMAIN = "cymru.local" DOCAPI_OFFLINE = "12:00:00,14:00:00" +SHOWFILTERDOCS = true // Next Auth vars @@ -65,22 +65,17 @@ NEXTAUTH_URL_INTERNAL = $API_ROOT NEXTAUTH_SECRET = SuperSecret // CNR sql server -DATABASE_URL = sqlserver://sql-srv-plt-pedw-cnr-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword - +# DATABASE_URL = sqlserver://sql-srv-plt-pedw-cnr-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword // dev test sql server -//DATABASE_URL = sqlserver://pedw-dev-test-sql-svr.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword +# DATABASE_URL = sqlserver://pedw-dev-test-sql-svr.database.windows.net:1433;database=PEDWDev;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword +DATABASE_URL = sqlserver://sql-srv-plt-pedw-dev-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword // Pre prod sql server -//DATABASE_URL = sqlserver://pp-pedw-sql.database.windows.net:1433;database=PEDWPreProd;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword -////DATABASE_URL = sqlserver://pp-pedw-sql.database.windows.net:1433;database=PEDWPreProd;user=pp-pedw-ukw;password=jscw4+896w9YaiXruOA3mtpNkio1oUZxBZcFJ9Awdz4=;encrypt=true;trustservercertificate=false;hostnameincertificate=*.database.windows.net;logintimeout=30;authentication=SqlPassword -//DATABASE_URL = sqlserver://pp-pedw-sql.database.windows.net:1433;database=PEDWPreProd;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustservercertificate=false;hostnameincertificate=*.database.windows.net;logintimeout=30 -//DATABASE_URL = sqlserver://pp-pedw-sql.privatelink.database.windows.net:1433;database=PEDWPreProd;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustservercertificate=false;hostnameincertificate=*.database.windows.net;logintimeout=30 - - +# DATABASE_URL = sqlserver://sql-srv-plt-pedw-ppe-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustservercertificate=true;hostnameincertificate=*.database.windows.net;logintimeout=30;authentication=SqlPassword // Prod sql server -//DATABASE_URL = sqlserver://pp-pedw-sql.database.windows.net:1433;database=PEDWPreProd;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword +# DATABASE_URL = sqlserver://pp-pedw-sql.database.windows.net:1433;database=PEDWPreProd;user=RobBondSQL;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword SECRET = SuperSecret @@ -107,11 +102,10 @@ AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwdevuks.blob.core.windows.net # AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg== # AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net - -// preprod key -//AZURE_STORAGE_ACCOUNT_NAME = "pedwpp" -//AZURE_STORAGE_ACCOUNT_KEY = koZ46STRqapSa2Dod8MLL6aju1eYLhhyJ6DXpCLMTnFLJvbDT6CHUv/jwr5U/Ta8a60MWzwToHQy+AStADO7sg== -//AZURE_PEDW_STORAGE_ENDPOINT = https://pedwpp.blob.core.windows.net +// New preprod key +# AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwppeuks" +# AZURE_STORAGE_ACCOUNT_KEY = B4GRKr+cA9b9mNM/GHFivzhzflJIZltG8bMmooXlYvGYySPAspTTHistAT30sHipnR+hh6dqUc9q+ASttAjPRQ== +# AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwppeuks.blob.core.windows.net // PROD key diff --git a/actions/index.js b/actions/index.js index cdb7c72f..1686728a 100644 --- a/actions/index.js +++ b/actions/index.js @@ -474,7 +474,7 @@ export const getAdvancedSearchPaged = ( }); }; -export const getBasicSearchDetails = ( +export const getBasicSearchDetails = async ( appealTypeName, caseReference, primaryIdAttribute, @@ -528,7 +528,7 @@ export const getBasicPartSavedDetails = ( }); }; -export const getBasicSearchDetailsPaged = ( +export const getBasicSearchDetailsPaged = async ( appealTypeName, caseReference, primaryIdAttribute, @@ -1015,7 +1015,7 @@ export const getAwaitingSubmissionFromBlobProxy = (containerName) => { }); }; -export const getPortalModuleDetails = (appealType, caseReference) => { +export const getPortalModuleDetails = async (appealType, caseReference) => { //console.log( // BASE_URL + // "/api/endpoint/getportalmoduledetails_api?appealType=" + @@ -1023,6 +1023,7 @@ export const getPortalModuleDetails = (appealType, caseReference) => { // "&caseReference=" + // encodeURI(caseReference) // ); + return axios .get( BASE_URL + @@ -1033,6 +1034,7 @@ export const getPortalModuleDetails = (appealType, caseReference) => { ) .then((res) => res.data) .catch((error) => { + console.log("error case ref:", caseReference); consoleLogger(error); }); }; diff --git a/components/breadcrumbs.js b/components/breadcrumbs.js index 9b1ac7f0..e6659caf 100644 --- a/components/breadcrumbs.js +++ b/components/breadcrumbs.js @@ -748,6 +748,38 @@ const Breadcrumbs = (props) => { )} + {router.pathname == + "/myportal/dns/[developmentName]" && ( + <> +
  • + + {t("common:breadcrumb-my-portal")} + +
    • +
  • + + {t("dnsCommon:service-name")} + +
    • +
  • + {t("common:breadcrumb-case-reference")}:{" "} + { + props.props.currentView.caseReference + .currentReference + } +
    • + + )} {router.pathname == "/case" && ( <>
  • @@ -909,14 +941,23 @@ const Breadcrumbs = (props) => {
    • )} - {router.pathname == "/dns/[developmentName]" && ( + + {router.pathname == "/dnsapplications" && ( + <> +
  • + {t("dnsCommon:service-name")} +
    • + + )} + {router.pathname == "/dnsdetails" && ( <>
  • @@ -932,19 +973,12 @@ const Breadcrumbs = (props) => {
    • )} - {router.pathname == "/dnsapplications" && ( - <> -
  • - {t("dnsCommon:service-name")} -
    • - - )} - {router.pathname == "/dnsdetails" && ( + {router.pathname == "/dns/[developmentName]" && ( <>
  • { searchDetailsObj={props.searchDetailsObj} searchString={props.searchString} incidentid={props.incidentid} - showMap={props.showMap} + showMap={props.showMaps} currentView={props.currentView} messagesObj={props.messagesObj} - /> - {showRepresentations == true && ( { setDocumentDetails, setCurrentPage, docsOffline, + showFilteredDocs, } = props; const router = useRouter(); @@ -40,6 +41,53 @@ const DocumentDetails = (props) => { const [selectedOption, setSelectedOption] = useState(10); const [documentTypes, setDocumentTypes] = useState([{}]); const [selectedDocumentType, setSelectedDocumentType] = useState("all"); + const [selectAll, setSelectAll] = useState(false); + + const [checkedItems, setCheckedItems] = useState( + documentTypes.reduce((acc, item) => { + acc[item.pinswg_isharedocumentlocations] = false; + return acc; + }, {}) + ); + + const handleCheckboxChange = (e) => { + const { name, checked } = e.target; + + setCheckedItems((prev) => ({ + ...prev, + [name]: checked, + })); + setSelectAll(false); + }; + + const handleSelectAllChange = (e) => { + const { checked } = e.target; + setSelectAll(checked); // Set the 'Select All' state + if (checked) { + // If 'Select All' is checked, check all the other checkboxes + + setCheckedItems( + documentTypes.reduce((acc, item) => { + acc[item.pinswg_isharedocumentlocations] = true; + return acc; + }, {}) + ); + } else { + clearCheckboxes(); + } + }; + + const clearCheckboxes = () => { + setSelectAll(false); + setCheckedItems( + documentTypes.reduce((acc, item) => { + acc[item.pinswg_isharedocumentlocations] = false; + return acc; + }, {}), + setSelectedDocumentType("all"), + setCurrentPage(1) + ); + }; let ShowDocLinks = false; let checkShowDocLinks = docsOffline != false ? true : false; @@ -107,7 +155,7 @@ const DocumentDetails = (props) => { id="showDocumentType" name="showDocumentType" > -