diff --git a/.env.local b/.env.local index b4bd9db4..7d13acc3 100644 --- a/.env.local +++ b/.env.local @@ -49,15 +49,15 @@ CRMURL = "tscrm2016.llcdt.gov.wales/UATPINS" # CRMURL = "crm2016.llc.gov.wales/PEDW" # //New Prod -# CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc -# CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR -# RELAY_ROOT = https://ar-ns-lz-pedw-prod-uks-01.servicebus.windows.net/ar-hc-lz-pedw-prod-uks-01/ -# RELAYURI = "ar-ns-lz-pedw-prod-uks-01.servicebus.windows.net" -# RELAYPATH = "ar-hc-lz-pedw-prod-uks-01" -# # RELAY_ROOT = https://ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net/ar-hc-lz-pedw-prod-ukw-01/ -# # RELAYURI = "ar-ns-lz-pedw-prod-ukw-01.servicebus.windows.net" -# # RELAYPATH = "ar-hc-lz-pedw-prod-ukw-01" -# CRMURL = "crm2016.llcdt.gov.wales/PEDW" +CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc +CLIENT_SECRET = tFk8Q~E.R-HFjROTu1sRKqwb_ONzy05uPYoF6awR +RELAY_ROOT = https://ar-ns-lz-pedw-prod-uks-01.servicebus.windows.net/ar-hc-lz-pedw-prod-uks-01/ +RELAYURI = "ar-ns-lz-pedw-prod-uks-01.servicebus.windows.net" +RELAYPATH = "ar-hc-lz-pedw-prod-uks-01" +# RELAY_ROOT = https://ar-ns-lz-pedw-ppe-ukw-01.servicebus.windows.net/ar-hc-lz-pedw-prod-ukw-01/ +# RELAYURI = "ar-ns-lz-pedw-prod-ukw-01.servicebus.windows.net" +# RELAYPATH = "ar-hc-lz-pedw-prod-ukw-01" +CRMURL = "crm2016.llcdt.gov.wales/PEDW" //GOOGLE_TAG_MANAGER = GTM-T78CBC3 @@ -84,7 +84,11 @@ DATABASE_URL = sqlserver://sql-srv-plt-pedw-cnr-uks-01.database.windows.net:1433 // 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://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 +// 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 + +// test sql server + DATABASE_URL = sqlserver://sql-srv-plt-pedw-test-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://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 @@ -93,7 +97,7 @@ DATABASE_URL = sqlserver://sql-srv-plt-pedw-cnr-uks-01.database.windows.net:1433 # 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 // Prod sql server -# DATABASE_URL = sqlserver://sql-srv-plt-pedw-prod-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-prod-uks-01.database.windows.net:1433;database=PEDW;user=PedwSqlAdmin;password=GhWKr62F5sQ69dZx;encrypt=true;trustServerCertificate=true;hostNameInCertificate=*.database.windows.net;loginTimeout=30;authentication=ActiveDirectoryPassword SECRET = SuperSecret @@ -131,9 +135,9 @@ AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net # AZURE_PEDW_STORAGE_ENDPOINT = https://pedwprod.blob.core.windows.net # // New PROD key -# AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwproduks" -# AZURE_STORAGE_ACCOUNT_KEY = OfV9MFqXcLLPam9GhEdMWadIOwIzhc5hd5TUqzIuQoswFdtV4ybaemjatSv+Kht0Ny1qQKjLplwY+AStUTZJrg== -# AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwproduks.blob.core.windows.net +AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwproduks" +AZURE_STORAGE_ACCOUNT_KEY = OfV9MFqXcLLPam9GhEdMWadIOwIzhc5hd5TUqzIuQoswFdtV4ybaemjatSv+Kht0Ny1qQKjLplwY+AStUTZJrg== +AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwproduks.blob.core.windows.net AZURE_PEDW_CONTAINER = "pedwapplications" @@ -145,7 +149,7 @@ NOTIFY_API_KEY = pedwnextauthlivekey-90f93710-9dae-423e-aea1-11eccd0dc132-5c0ed1 SHOW_DEBUG = true - + // DEV Connection string //NEXT_PUBLIC_APP_INSIGHT = InstrumentationKey=4b7568b3-70bd-4591-9dc2-267c0a6501d1;IngestionEndpoint=https://ukwest-0.in.applicationinsights.azure.com/;LiveEndpoint=https://ukwest.livediagnostics.monitor.azure.com/;ApplicationId=447d38b5-5d40-4238-8fb3-0ef4741b3db1 diff --git a/components/admin/tabs/appeals.js b/components/admin/tabs/appeals.js index 324a9ed7..ce39a05f 100644 --- a/components/admin/tabs/appeals.js +++ b/components/admin/tabs/appeals.js @@ -198,7 +198,9 @@ function AppealsTab(props) { -
+
+ Origin +
{showSpinnerState == true ? (
@@ -234,28 +236,23 @@ function AppealsTab(props) { >
- { - sendGAEvent( - "event", - "CaseViewed", - { - caseReference: - item.ticketnumber, - } - ), + {item.pinswg_publishtoweb == true ? ( + { setCurrentReference({ "ticketnumber": item.ticketnumber, @@ -280,16 +277,20 @@ function AppealsTab(props) { ? detailsObj.pinswg_specialistcaseprocess : "", }); - }} - > - - {t( - "search:searchresults-case-reference-label" - )} - : - - {item.title} - + }} + > + + {t( + "search:searchresults-case-reference-label" + )} + : + + {item.title} + + ) : ( + item.title + )} +
{new Date( item.createdon @@ -473,6 +474,11 @@ function AppealsTab(props) { "statuscode@OData.Community.Display.V1.FormattedValue" ] || "N/A"}
+
+ {item[ + "caseorigincode@OData.Community.Display.V1.FormattedValue" + ] || "N/A"} +
); }) diff --git a/components/admin/tabs/documents.js b/components/admin/tabs/documents.js index ae496be0..23818da2 100644 --- a/components/admin/tabs/documents.js +++ b/components/admin/tabs/documents.js @@ -724,20 +724,29 @@ const DocumentsTab = (props) => { : ""}
- - { - detailsObj[ - "_pinswg_documentids_value@OData.Community.Display.V1.FormattedValue" - ] - } - + {detailsObj.publishtoweb == + true ? ( + + { + detailsObj[ + "_pinswg_documentids_value@OData.Community.Display.V1.FormattedValue" + ] + } + + ) : ( + detailsObj[ + "_pinswg_documentids_value@OData.Community.Display.V1.FormattedValue" + ] + )}
-
+
{ detailsObj[ "pinswg_origin@OData.Community.Display.V1.FormattedValue" diff --git a/pages/api/admin/getlatestdocuments_api.js b/pages/api/admin/getlatestdocuments_api.js index 66b82513..c5742dab 100644 --- a/pages/api/admin/getlatestdocuments_api.js +++ b/pages/api/admin/getlatestdocuments_api.js @@ -99,19 +99,6 @@ export default async function ApiProxy(req, res) { return resultDate.toISOString().replace(/\.000Z$/, "Z"); // format as 'YYYY-MM-DDT00:00:00Z' } - function flattenDocuments(response) { - return { - ...response, - value: Array.isArray(response.value) - ? response.value.map((doc) => ({ - ...doc, - ticketnumber: - doc.pinswg_DocumentIds?.ticketnumber || null, - })) - : [], - }; - } - var queryUrl = "pinswg_documents?$select=pinswg_name,createdon,pinswg_publishtoweb,_pinswg_documentids_value,pinswg_isharedocumentlocations,pinswg_isharedocumentreference,pinswg_uploadurl,pinswg_uploadstatus,pinswg_origin&$filter=createdon ge " + daysAgoISO(numberOfWeeks) + @@ -121,7 +108,7 @@ export default async function ApiProxy(req, res) { " " + fieldSort + "&$count=true" + - "&$expand=pinswg_DocumentIds($select = ticketnumber)" + + "&$expand=pinswg_DocumentIds($select = ticketnumber,pinswg_publishtoweb)" + (typeof pageNumber != "undefined" ? "&$skiptoken=" + '' : ""); @@ -143,6 +130,7 @@ export default async function ApiProxy(req, res) { let flattened = data.value.map((r) => ({ ...r, ticketnumber: r.pinswg_DocumentIds?.ticketnumber || null, + publishtoweb: r.pinswg_DocumentIds?.pinswg_publishtoweb || null, })); data.value = flattened; diff --git a/pages/api/admin/getnewappeals_api.js b/pages/api/admin/getnewappeals_api.js index 779081ee..daa69cb0 100644 --- a/pages/api/admin/getnewappeals_api.js +++ b/pages/api/admin/getnewappeals_api.js @@ -52,7 +52,7 @@ export default async function ApiProxy(req, res) { var showNumberOfRecords = req.query.showNumberOfRecords || 10; var queryUrl = - "incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$filter=caseorigincode eq 3&$orderby=" + + "incidents?$select=caseorigincode,pinswg_publishtoweb,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$orderby=" + orderby + " " + fieldSort +