diff --git a/.env.local b/.env.local index 5a31d972..51c64c55 100644 --- a/.env.local +++ b/.env.local @@ -13,27 +13,27 @@ HASHKEY = 028ffbae928d7191c0017f298260995f901d78eabde1436c0af0423459cc3715832136 # 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" +# 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" +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 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" +# RELAY_ROOT = https://ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net/ar-hc-lz-pedw-ppe-uks-01/ +# RELAYURI = "ar-ns-lz-pedw-ppe-uks-01.servicebus.windows.net" +# RELAYPATH = "ar-hc-lz-pedw-ppe-uks-01" # CRMURL = "ppcrm2016.llcdt.gov.wales/UATPINS" @@ -51,7 +51,7 @@ GOOGLE_TAG_MANAGER = G-GTWW3JT03Z SHOWLOGIN = true SHOWREPRESENTATIONS = true SHOWFILEUPLOAD = "false" -SHOWMAPS = true +SHOWMAPS = false API_ROOT = "http://localhost:3000" CY_API_ROOT = "http://cymru.local:3000" I18N_DOMAIN = "cymru.local" @@ -93,14 +93,14 @@ AZURE_CLIENT_SECRET = $CLIENT_SECRET # AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwcnruks.blob.core.windows.net // new dev key -AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwdevuks" -AZURE_STORAGE_ACCOUNT_KEY = MmrsrCjBfop9pI2oImsP/+lJUWU2DrXsAB8nq5bOVROTmPovSGxjCjKw9+TAFr00k8WDUK9r6mVx+AStcMLyAA== -AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwdevuks.blob.core.windows.net +# AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwdevuks" +# AZURE_STORAGE_ACCOUNT_KEY = MmrsrCjBfop9pI2oImsP/+lJUWU2DrXsAB8nq5bOVROTmPovSGxjCjKw9+TAFr00k8WDUK9r6mVx+AStcMLyAA== +# AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwdevuks.blob.core.windows.net // New test key -# AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks" -# AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg== -# AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net +AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks" +AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg== +AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net // New preprod key # AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwppeuks" diff --git a/components/case/summary.js b/components/case/summary.js index 04712df4..5c76cd70 100644 --- a/components/case/summary.js +++ b/components/case/summary.js @@ -3,7 +3,7 @@ import _ from "lodash"; import useTranslation from "next-translate/useTranslation"; import Link from "next/link"; import { useRouter } from "next/router"; -import { useEffect } from "react"; +import { useEffect, useState } from "react"; import { connect } from "react-redux"; import transLookup from "../../data/lookuptranslations.json"; import Documents from "./documents"; @@ -14,6 +14,7 @@ import { getLinkedCases, getPortalModuleDetailsProxy, getWatchedCasesProxy, + setCaseInvolvment, } from "../../actions"; import { setCurrentLinkedCases, @@ -56,6 +57,8 @@ import Pinswg_rowid from "./summaryTypes/pinswg_rowid"; import Pinswg_transportandworkactid from "./summaryTypes/pinswg_transportandworkactid"; import Pinswg_wayleaveid from "./summaryTypes/pinswg_wayleaveid"; import CaseNoticeBanner from "./caseNoticeBanner"; +import WatchModal from "./watchmodal"; + const CaseSummary = (props) => { let { t } = useTranslation(); @@ -88,6 +91,16 @@ const CaseSummary = (props) => { currentType == "directResultsObj" ? "true" : currentView.showLogin; const { data: session, status } = useSession(); + const [isModalOpen, setIsModalOpen] = useState(false); + + const handleOpenModal = () => { + setIsModalOpen(true); + }; + + const handleCloseModal = () => { + setIsModalOpen(false); + }; + const cookies = parseCookies(); const isLPA = @@ -114,6 +127,8 @@ const CaseSummary = (props) => { }); }); }); + + setCaseInvolvment(incidentid, loggedInUser); }; const isWatchedCase = (whichIncident) => { @@ -586,39 +601,48 @@ const CaseSummary = (props) => { )}{" "} ) : ( - + <> + + {/* */} + ))} {!session && ( @@ -669,6 +693,11 @@ const CaseSummary = (props) => { "case:watch-this-case-link" )} + {/* */} )} @@ -714,6 +743,13 @@ const CaseSummary = (props) => { docsOffline={docsOffline} showFilteredDocs={props.showFilteredDocs} /> + {/* */} ) : ( <> diff --git a/components/case/watchmodal.js b/components/case/watchmodal.js new file mode 100644 index 00000000..e085e930 --- /dev/null +++ b/components/case/watchmodal.js @@ -0,0 +1,94 @@ +import { signOut } from "next-auth/react"; +import useTranslation from "next-translate/useTranslation"; +import { useRouter } from "next/router"; +import { useState, useEffect } from "react"; +import { destroyCookie, parseCookies, setCookie } from "nookies"; +import { signIn, useSession } from "next-auth/react"; + +const WatchModal = (props) => { + let { t } = useTranslation(); + + const { isOpen, onClose } = props; + + const currentType = props.currentType; + const casesObj = props.casesObj; + const { data: session, status } = useSession(); + const router = useRouter(); + const { locale } = router; + + let now = new Date(); + let expDate = new Date(now); + + expDate.setDate(now.getDate() + 365); + + if (!isOpen) return null; + + return ( + <> +
+
+
+

Watch case

+

+ {!session + ? " You will now be signed in to watch this case" + : " you are logged in already"} +

+
+ + +
+
+ {" "} + +
+
+
+
+
+ + ); +}; + +export default WatchModal; diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js index 0c0816eb..2f8a708c 100644 --- a/components/newappeal/buildchecksection.js +++ b/components/newappeal/buildchecksection.js @@ -73,7 +73,9 @@ let BuildCheckSection = (props) => { //console.log("attached docs: - ", buildAppealFilesArray); buildAppealFilesArray = props.props.form.appealForm.values.filesList || []; - let filesUploadObj = props.appealType.fileList.value[0]; + let filesUploadObj = props.appealType.fileList.hasOwnProperty("value") + ? props.appealType.fileList.value[0] + : []; for (let key in filesUploadObj) { typeof filesUploadObj[key].name != "undefined" && diff --git a/i18n.js b/i18n.js index 72ed0964..61a69198 100644 --- a/i18n.js +++ b/i18n.js @@ -30,7 +30,7 @@ module.exports = { "/myportal/dns/*": ["dnsCommon", "case", "common"], "/myportal/dns/[developmentName]": ["dnsCommon", "case", "common"], "/advancedsearch": ["search", "myportal"], - "/advancedsearchresults": ["search"], + "/advancedsearchresults": ["search", "case"], "/searchresults": ["search", "case"], "/addresssearch": ["search", "case", "myportal"], "/addresssearchresults": ["search", "case", "myportal"],