robbond/pedwfrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

address search fix includes link with ticketnumber

Browse Source
This commit is contained in:
robbond
2024-06-21 13:45:02 +01:00
parent 45e359155d
commit b02b7d937e
6 changed files with 71 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.local
+26 -10
View File
@@ -21,17 +21,18 @@ RELAYPATH = "test-pedw-hc"
//Preprod Oauth WGO
//CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a
//CLIENT_SECRET = Ioo7Q~RJfhWsE45wPsuHm1CzRk1SppnNN3lZF
//RELAY_ROOT = https://pp-pedw-ns.servicebus.windows.net/pp-pedw-hc/
//RELAYURI = "pp-pedw-ns.servicebus.windows.net"
//RELAYPATH = "pp-pedw-hc"
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"
//Prod Oauth WGO
//CLIENT_ID = 3e4141a3-1fbd-454e-98f0-7f3a4f14a3cc
//CLIENT_SECRET = mJN7Q~lFu.xFGa5KCc.zwIm_fJAWxajyQaFo~
////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"
@@ -53,7 +54,16 @@ NEXTAUTH_URL = $API_ROOT
NEXTAUTH_URL_INTERNAL = $API_ROOT
NEXTAUTH_SECRET = SuperSecret
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
// 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
// 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
// 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
SECRET = SuperSecret
@@ -69,10 +79,16 @@ AZURE_CLIENT_SECRET = $CLIENT_SECRET
//AZURE_PEDW_STORAGE_ENDPOINT = https://pedwdev.blob.core.windows.net
// test key
AZURE_STORAGE_ACCOUNT_NAME = "pedwtest"
//AZURE_STORAGE_ACCOUNT_NAME = "pedwtest"
//AZURE_STORAGE_ACCOUNT_KEY = Dl8qUVEnR2mglklQorttMurmjUpe2lI3oMWl9V245U6BOLutXDwmpU36afeTrGLK+zfzNVLErsWM+AStiYsimw==
AZURE_STORAGE_ACCOUNT_KEY = iEQKwh4TB9BT63pU5a6+ivn6ItiDkuIkYCrUwjm9STJTdMBOKWUT06EEcP8pcy/qeQ89ogK75mFQ+AStT53G/g==
AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net
//AZURE_STORAGE_ACCOUNT_KEY = iEQKwh4TB9BT63pU5a6+ivn6ItiDkuIkYCrUwjm9STJTdMBOKWUT06EEcP8pcy/qeQ89ogK75mFQ+AStT53G/g==
//AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.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
AZURE_PEDW_CONTAINER = "pedwapplications"
actions/azurestorage.js
+2 -1
View File
@@ -1,6 +1,7 @@
import { DefaultAzureCredential } from "@azure/identity";
import _ from "lodash";
import { hashAPIPath } from ".";
import { hashAPIPath, consoleLogger } from ".";
import { da } from "date-fns/locale";
const {
ContainerClient,
components/search/addresssearchresults.js
+1 -1
View File
@@ -263,7 +263,7 @@ const SearchResults = (props) => {
? "/myportal/case"
: "/case") +
"/" +
item.pinswg_name
item.ticketnumber
}
className="govuk-link--no-underline"
// onClick={() => {
pages/api/endpoint/getbasicsearch_by_address_api copy.js
+1 -1
View File
@@ -393,7 +393,7 @@ export default async function ApiProxy(req, res) {
postcode +
"')) "
: "") +
"&$orderby=createdon desc&$select=modifiedon,_pinswg_appellant_value,pinswg_name," +
"&$orderby=createdon desc&$select=ticketnumber,modifiedon,_pinswg_appellant_value,pinswg_name," +
(item.LogicalCollectionName == "pinswg_ldps" ||
item.LogicalCollectionName == "pinswg_harbourrevisionorders"
? "pinswg_addresstown,pinswg_addressline1,pinswg_addresscounty,pinswg_addressline2,pinswg_addresspostcode"
pages/api/endpoint/getbasicsearch_by_address_api.js
+13 -12
View File
@@ -450,15 +450,15 @@ export default async function ApiProxy(req, res) {
item.NavigationProperty.toLowerCase() +
"_value";
//console.log(
// "\n==========================================\n",
// "basic search: " + queryUrl,
// "\n\n",
// item.LogicalCollectionName,
// "\n\n",
// WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
// "\n==========================================\n"
// );
console.log(
"\n==========================================\n",
"basic search: " + queryUrl,
"\n\n",
item.LogicalCollectionName,
"\n\n",
WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
"\n==========================================\n"
);
const resultObj = axios
.get(
@@ -495,7 +495,7 @@ export default async function ApiProxy(req, res) {
const getIncidentResultsObj = await Promise.all(
searchResultsObj.map(async (key) => {
var queryUrl =
"incidents?$select=pinswg_publishtoweb,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=incidentid eq " +
"incidents?$select=ticketnumber,pinswg_publishtoweb,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=incidentid eq " +
key.incidentid +
" and pinswg_appealcasetype ne null &$orderby=createdon desc&$count=true";
@@ -507,10 +507,11 @@ export default async function ApiProxy(req, res) {
azureHeaders(token.access_token)
)
.then(({ data }) => {
return data.value[0].pinswg_publishtoweb;
return data.value[0];
});
Object.assign(key, {
"pinswg_publishtoweb": incidentObj,
"pinswg_publishtoweb": incidentObj.pinswg_publishtoweb,
"ticketnumber": incidentObj.ticketnumber,
});
return incidentObj;
prisma/schema.prisma
+28 -30
View File
@@ -1,37 +1,35 @@
datasource db {
provider = "sqlserver"
url = env("DATABASE_URL")
shadowDatabaseUrl = env("SHADOW_DATABASE_URL")
}
generator client {
provider = "prisma-client-js"
}
datasource db {
provider = "sqlserver"
url = env("DATABASE_URL")
}
model Account {
id String @id @default(cuid())
userId String @map("user_id")
type String
provider String
providerAccountId String
refresh_token String? @db.Text
access_token String? @db.Text
expires_at Int?
token_type String?
scope String?
id_token String? @db.Text
session_state String?
id String @id(map: "PK__accounts__3213E83F407D3F70") @default(cuid()) @db.VarChar(191)
userId String @map("user_id") @db.VarChar(191)
type String @db.VarChar(191)
provider String @db.VarChar(191)
provider_account_id String @db.VarChar(191)
refresh_token String? @db.VarChar(Max)
access_token String? @db.VarChar(Max)
expires_at Int?
token_type String? @db.VarChar(191)
scope String? @db.VarChar(191)
id_token String? @db.VarChar(Max)
session_state String? @db.VarChar(191)
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
@@unique([provider, providerAccountId])
@@unique([provider, provider_account_id])
@@map("accounts")
}
model Session {
id String @id @default(cuid())
sessionToken String @unique @map("session_token")
userId String @map("user_id")
id String @id(map: "PK__sessions__3213E83F3DEBC794") @default(cuid()) @db.VarChar(191)
sessionToken String @unique @map("session_token") @db.VarChar(191)
userId String @map("user_id") @db.VarChar(191)
expires DateTime
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
@@ -39,11 +37,11 @@ model Session {
}
model User {
id String @id @default(cuid())
name String?
email String? @unique
id String @id(map: "PK__users__3213E83F038A1396") @default(cuid()) @db.VarChar(191)
name String? @db.VarChar(191)
email String? @unique @db.VarChar(191)
emailVerified DateTime? @map("email_verified")
image String?
image String? @db.VarChar(191)
accounts Account[]
sessions Session[]
@@ -51,8 +49,8 @@ model User {
}
model VerificationToken {
identifier String
token String @unique
identifier String @db.VarChar(191)
token String @unique @db.VarChar(191)
expires DateTime
@@unique([identifier, token])