{
+ var startTime = docsOffline.split(",")[0];
+ var endTime = docsOffline.split(",")[1];
+
+ // console.log(startTime);
+ // console.log(endTime);
+
+ var currentDate = new Date();
+
+ var startDate = new Date(currentDate.getTime());
+ startDate.setHours(startTime.split(":")[0]);
+ startDate.setMinutes(startTime.split(":")[1]);
+ startDate.setSeconds(startTime.split(":")[2]);
+
+ var endDate = new Date(currentDate.getTime());
+ endDate.setHours(endTime.split(":")[0]);
+ endDate.setMinutes(endTime.split(":")[1]);
+ endDate.setSeconds(endTime.split(":")[2]);
+
+ // console.log(startDate);
+ // console.log(endDate);
+ // console.log(currentDate);
+
+ var valid = startDate < currentDate && endDate > currentDate;
+ ShowDocLinks = valid;
+ };
+
+ console.log("docsOffline", docsOffline, getDocLink(docsOffline));
+
return (
@@ -22,11 +57,29 @@ export default function MakeNewAppeal() {
{t("myportal:makenewappeal-card-paragraph-two")}
-
-
- {t("myportal:makenewappeal-card-button-label")}
-
-
+ {ShowDocLinks ? (
+
+
+ !
+
+
+
+ Notice
+
+ {t("myportal:docsoffline-newappeal-label")}
+
+
+ ) : (
+
+
+ {t("myportal:makenewappeal-card-button-label")}
+
+
+ )}
+
{t("myportal:makenewappeal-card-paragraph-three")}
diff --git a/components/myportal/myrepresentationsfromblob.js b/components/myportal/myrepresentationsfromblob.js
index 79383c82..129cfd1e 100644
--- a/components/myportal/myrepresentationsfromblob.js
+++ b/components/myportal/myrepresentationsfromblob.js
@@ -33,7 +33,7 @@ const MyRepresentations = (props) => {
{
{props.accountDetails.accountDetails.firstname}{" "}
{props.accountDetails.accountDetails.lastname}
diff --git a/components/search/searchresults.js b/components/search/searchresults.js
index 198ec13e..aa8bf582 100644
--- a/components/search/searchresults.js
+++ b/components/search/searchresults.js
@@ -66,7 +66,7 @@ const SearchResults = (props) => {
const [showSpinnerState, setShowSpinnerState] = useState(false);
const [selectedOption, setSelectedOption] = useState(10);
const [orderByState, setOrderbyState] = useState("createdon");
- const [fieldSortState, setfieldSortState] = useState("asc");
+ const [fieldSortState, setfieldSortState] = useState("desc");
const [loginToWatch, setLoginToWatch] = useState("true");
let spinnerState = () => {
diff --git a/components/utils/downloadmanager.js b/components/utils/downloadmanager.js
new file mode 100644
index 00000000..eb16d0bd
--- /dev/null
+++ b/components/utils/downloadmanager.js
@@ -0,0 +1,48 @@
+import { useState, useCallback } from "react";
+
+export function useDownloadQueue(maxConcurrent = 3) {
+ const [queue, setQueue] = useState([]); // queued tasks
+ const [activeCount, setActiveCount] = useState(0);
+ const [statuses, setStatuses] = useState({}); // { id: "idle"|"queued"|"downloading"|"done"|"failed" }
+
+ const scheduleNext = useCallback(() => {
+ setQueue((queueCurr) => {
+ if (activeCount >= maxConcurrent || queueCurr.length === 0)
+ return queueCurr;
+
+ const [task, ...rest] = queueCurr;
+
+ setStatuses((s) => ({ ...s, [task.id]: "downloading" }));
+ setActiveCount((c) => c + 1);
+
+ // Run the download fully in async IIFE
+ (async () => {
+ try {
+ await task.downloadFn(); // triggers fetch + blob +
click
+ setStatuses((s) => ({ ...s, [task.id]: "done" }));
+ } catch (err) {
+ console.error(err);
+ setStatuses((s) => ({ ...s, [task.id]: "failed" }));
+ } finally {
+ setActiveCount((c) => c - 1);
+ scheduleNext(); // promote next in queue
+ }
+ })();
+
+ return rest;
+ });
+ }, [activeCount, maxConcurrent]);
+
+ const startDownload = useCallback(
+ (id, downloadFn) => {
+ setStatuses((s) => ({ ...s, [id]: "queued" }));
+ setQueue((curr) => [...curr, { id, downloadFn }]);
+ scheduleNext();
+ },
+ [scheduleNext]
+ );
+
+ const getStatus = useCallback((id) => statuses[id] || "idle", [statuses]);
+
+ return { startDownload, getStatus };
+}
diff --git a/components/utils/downloads.js b/components/utils/downloads.js
new file mode 100644
index 00000000..6e8c81b4
--- /dev/null
+++ b/components/utils/downloads.js
@@ -0,0 +1,325 @@
+// // import { useState } from "react";
+
+// // export default function DocumentLink({ detailsObj, caseReference }) {
+// // const [downloadStatus, setDownloadStatus] = useState("");
+// // const [progress, setProgress] = useState(null);
+
+// // const handleDownload = async () => {
+// // setDownloadStatus("Downloading");
+// // setProgress(0);
+
+// // try {
+// // const res = await fetch(detailsObj.pinswg_hashlink);
+// // if (!res.ok) throw new Error("Download failed");
+
+// // const contentDisposition = res.headers.get("content-disposition");
+// // const filename = contentDisposition
+// // ? contentDisposition.split("filename=")[1]
+// // : detailsObj.pinswg_name || "document";
+
+// // const contentLength = res.headers.get("content-length");
+// // const totalBytes = contentLength
+// // ? parseInt(contentLength, 10)
+// // : null;
+
+// // const reader = res.body.getReader();
+// // let receivedBytes = 0;
+// // const chunks = [];
+
+// // while (true) {
+// // const { done, value } = await reader.read();
+// // if (done) break;
+
+// // chunks.push(value);
+// // receivedBytes += value.length;
+
+// // if (totalBytes) {
+// // const percent = Math.round(
+// // (receivedBytes / totalBytes) * 100
+// // );
+// // setProgress(percent);
+// // }
+// // }
+
+// // // Combine chunks into one blob
+// // const blob = new Blob(chunks);
+// // const url = window.URL.createObjectURL(blob);
+
+// // const link = document.createElement("a");
+// // link.href = url;
+// // link.download = filename;
+// // document.body.appendChild(link);
+// // link.click();
+// // document.body.removeChild(link);
+
+// // setDownloadStatus("Download complete!");
+// // setProgress(100);
+
+// // // Fire GA event
+// // window.gtag?.("event", "DownloadedFile", {
+// // caseReference,
+// // filename,
+// // });
+// // } catch (err) {
+// // console.error(err);
+// // setDownloadStatus("Download failed");
+// // setProgress(null);
+// // }
+// // };
+
+// // return (
+// // <>
+// // {detailsObj.pinswg_publishtoweb ? (
+// //
+// // ) : (
+// // <>
+// //
+// // Document name:
+// //
+// // {detailsObj.pinswg_name || ""}
+// //
+// // )}
+
+// // {downloadStatus && (
+// //
+// // {downloadStatus}
+// // {/* {progress !== null && ` (${progress}%)`} */}
+// //
+// // )}
+// //
+// // );
+// // }
+// import { useState } from "react";
+
+// export default function DocumentLink({
+// id,
+// detailsObj,
+// caseReference,
+// startDownload,
+// getStatus,
+// }) {
+// const [downloadStatus, setDownloadStatus] = useState("");
+// const [progress, setProgress] = useState(null);
+
+// const downloadFile = async () => {
+// setDownloadStatus("Downloading");
+// setProgress(0);
+
+// try {
+// const res = await fetch(detailsObj.pinswg_hashlink);
+// if (!res.ok) throw new Error("Download failed");
+
+// const contentDisposition = res.headers.get("content-disposition");
+// const filename = contentDisposition
+// ? contentDisposition.split("filename=")[1]
+// : detailsObj.pinswg_name || "document";
+
+// const contentLength = res.headers.get("content-length");
+// const totalBytes = contentLength
+// ? parseInt(contentLength, 10)
+// : null;
+
+// const reader = res.body.getReader();
+// let receivedBytes = 0;
+// const chunks = [];
+
+// while (true) {
+// const { done, value } = await reader.read();
+// if (done) break;
+
+// chunks.push(value);
+// receivedBytes += value.length;
+
+// if (totalBytes) {
+// const percent = Math.round(
+// (receivedBytes / totalBytes) * 100
+// );
+// setProgress(percent);
+// }
+// }
+
+// const blob = new Blob(chunks);
+// const url = window.URL.createObjectURL(blob);
+
+// const link = document.createElement("a");
+// link.href = url;
+// link.download = filename;
+// document.body.appendChild(link);
+// link.click();
+// document.body.removeChild(link);
+
+// setDownloadStatus("Download complete!");
+// setProgress(100);
+
+// window.gtag?.("event", "DownloadedFile", {
+// caseReference,
+// filename,
+// });
+// } catch (err) {
+// console.error(err);
+// setDownloadStatus("Download failed");
+// setProgress(null);
+// }
+// };
+
+// const handleClick = () => {
+// if (getStatus(id) !== "idle") return; // don't double enqueue
+// startDownload(id, downloadFile);
+// };
+
+// const status = getStatus(id);
+
+// return (
+// <>
+// {detailsObj.pinswg_publishtoweb ? (
+//
+// ) : (
+// <>
+//
+// Document name:
+//
+// {detailsObj.pinswg_name || ""}
+//
+// )}
+
+// {status !== "idle" && (
+//
+// {status === "downloading" && progress !== null
+// ? `Downloading (${progress}%)`
+// : status === "queued"
+// ? "Queued"
+// : status === "done"
+// ? "Download complete!"
+// : status === "failed"
+// ? "Download failed"
+// : ""}
+//
+// )}
+//
+// );
+// }
+
+import { useState } from "react";
+import useTranslation from "next-translate/useTranslation";
+
+export default function DocumentLink({
+ id,
+ detailsObj,
+ caseReference,
+ startDownload,
+ getStatus,
+}) {
+ const [progress, setProgress] = useState(null);
+ let { t } = useTranslation();
+ const downloadFile = async () => {
+ setProgress(0);
+
+ const res = await fetch(detailsObj.pinswg_hashlink);
+ if (!res.ok) throw new Error("Download failed");
+
+ const contentDisposition = res.headers.get("content-disposition");
+ const filename = contentDisposition
+ ? contentDisposition.split("filename=")[1]
+ : detailsObj.pinswg_name || "document";
+
+ const contentLength = res.headers.get("content-length");
+ const totalBytes = contentLength ? parseInt(contentLength, 10) : null;
+
+ const reader = res.body.getReader();
+ let receivedBytes = 0;
+ const chunks = [];
+
+ while (true) {
+ const { done, value } = await reader.read();
+ if (done) break;
+
+ chunks.push(value);
+ receivedBytes += value.length;
+
+ if (totalBytes) {
+ const percent = Math.round((receivedBytes / totalBytes) * 100);
+ setProgress(percent);
+ }
+ }
+
+ const blob = new Blob(chunks);
+ const url = window.URL.createObjectURL(blob);
+
+ const link = document.createElement("a");
+ link.href = url;
+ link.download = filename;
+ document.body.appendChild(link);
+ link.click();
+ document.body.removeChild(link);
+ window.URL.revokeObjectURL(url);
+
+ setProgress(100);
+ window.gtag?.("event", "DownloadedFile", { caseReference, filename });
+ };
+
+ const handleClick = () => {
+ if (getStatus(id) !== "idle") return; // avoid double enqueue
+ startDownload(id, downloadFile);
+ };
+
+ const status = getStatus(id);
+
+ return (
+
+ {detailsObj.pinswg_publishtoweb ? (
+
+ ) : (
+
+ {detailsObj.pinswg_name || ""}
+
+ )}
+
+ {status !== "idle" && (
+
+ {status === "downloading" && progress !== null
+ ? t("case:downloading-label")
+ : status === "queued"
+ ? t("case:download-queued-label")
+ : status === "done"
+ ? t("case:download-complete-label")
+ : status === "failed"
+ ? t("case:download-failed-label")
+ : ""}
+
+ )}
+
{[
+ "documents",
+ "appeals",
"storage",
"accounts",
- "appeals",
- "documents",
].map((tab) => (
- {
props.setCurrentPage(1);
}}
>
+ {" "}
+ {tab === "documents" &&
+ "Latest Documents"}
+ {tab === "appeals" &&
+ "Latest Appeals"}
{tab === "storage" &&
"Storage Account"}
{tab === "accounts" &&
"User Accounts"}
- {tab === "appeals" &&
- "Latest Appeals"}
- {tab === "documents" &&
- "Latest Documents"}
))}
{/* Panels */}
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/pages/advancedsearchresults.js b/pages/advancedsearchresults.js
index 05848822..f2135ea9 100644
--- a/pages/advancedsearchresults.js
+++ b/pages/advancedsearchresults.js
@@ -124,8 +124,8 @@ export const getServerSideProps = wrapper.getServerSideProps(
// "=============================== Advanced Search results:",
// searchResultsObj
// );
- const searchDetailsObj =
- (await getSearchDetails(searchResultsObj)) || null;
+ // const searchDetailsObj =
+ // (await getSearchDetails(searchResultsObj)) || null;
// console.log(
// "=============================== Advanced Search results details:",
// searchDetailsObj
@@ -136,7 +136,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
store.dispatch(setShowReps(showReps, showLoginCheck));
store.dispatch(setSearchResults(searchResultsObj));
- store.dispatch(setSearchDetails(searchDetailsObj));
+ // store.dispatch(setSearchDetails(searchDetailsObj));
store.dispatch(setSearch(Object.entries(query)));
return {
props: {
diff --git a/pages/api/admin/getlatestdocuments_api.js b/pages/api/admin/getlatestdocuments_api.js
index c5742dab..36b7117c 100644
--- a/pages/api/admin/getlatestdocuments_api.js
+++ b/pages/api/admin/getlatestdocuments_api.js
@@ -64,9 +64,11 @@ export default async function ApiProxy(req, res) {
var fieldSort = req.query.fieldSort || "desc";
var showNumberOfRecords = req.query.showNumberOfRecords || 10;
var documentType = req.query.documentType || "all";
+ var documentOrigin = req.query.documentOrigin || "all";
var numberOfWeeks = req.query.numberWeeks || 1;
var docTypeQueryString = "";
+ var docOriginQueryString = "";
if (documentType != "all") {
if (documentType.indexOf(",") >= 0) {
@@ -91,6 +93,27 @@ export default async function ApiProxy(req, res) {
}
}
+ if (documentOrigin != "all") {
+ if (documentOrigin.indexOf(",") >= 0) {
+ const documentOriginArr = documentOrigin.split(",");
+
+ docOriginQueryString = " and (";
+ documentOriginArr.forEach(function (item, index) {
+ console.log(item, index);
+
+ if (item != "all") {
+ docOriginQueryString += " pinswg_origin eq " + item;
+
+ docOriginQueryString +=
+ index < documentOriginArr.length - 1 ? " or " : "";
+ }
+ });
+ docOriginQueryString += " )";
+ } else {
+ docOriginQueryString += " and pinswg_origin eq " + documentOrigin;
+ }
+ }
+
function daysAgoISO(days) {
const today = new Date();
const resultDate = new Date(today);
@@ -103,6 +126,7 @@ export default async function ApiProxy(req, res) {
"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) +
docTypeQueryString +
+ docOriginQueryString +
"&$orderby=" +
orderby +
" " +
@@ -115,7 +139,7 @@ export default async function ApiProxy(req, res) {
console.log(
"\n==========================================\n",
- "\nnew docs search ",
+ "\nnew docs search---- ",
"\n\nQuery url: " + queryUrl,
"\n\nRelay link: " + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
"\n==========================================\n"
diff --git a/pages/api/documents/download/[id].js b/pages/api/documents/download/[id].js
index 044e62b9..cbc8db9c 100644
--- a/pages/api/documents/download/[id].js
+++ b/pages/api/documents/download/[id].js
@@ -1,110 +1,203 @@
-/**
- * @swagger
- * /api/documents/download/{id}:
- * get:
- * tags:
- * - Documents
- * description: Get document
- * parameters:
- * - name: id
- * in: path
- * description: iShare ID
- * type: string
- * required: true
- * default: A41567436
- * - name: hash
- * in: query
- * description: Hash string
- * default: e0a1c9cd2817826a25bca67e60b807eae747cbed769e3ec42cf997541c32be71
- * responses:
- * 200:
- * description: Success
- */
+// /**
+// * @swagger
+// * /api/documents/download/{id}:
+// * get:
+// * tags:
+// * - Documents
+// * description: Get document
+// * parameters:
+// * - name: id
+// * in: path
+// * description: iShare ID
+// * type: string
+// * required: true
+// * default: A41567436
+// * - name: hash
+// * in: query
+// * description: Hash string
+// * default: e0a1c9cd2817826a25bca67e60b807eae747cbed769e3ec42cf997541c32be71
+// * responses:
+// * 200:
+// * description: Success
+// */
+
+// import axios from "axios";
+// import CryptoJS from "crypto-js";
+// import { getToken, consoleLogger } from "../../../../actions";
+
+// const WORDKEY = process.env.HASHKEY;
+// const accessTokenEndpoint = process.env.ACCESS_TOKEN_ENDPOINT;
+// const tenantId = process.env.TENANT;
+
+// const WEBAPI_URL =
+// process.env.RELAY_ROOT ||
+// "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+
+// const hashAPIPath = (queryPath) => {
+// var hashlink = CryptoJS.HmacSHA256(
+// queryPath,
+// CryptoJS.enc.Hex.parse(WORDKEY)
+// );
+// hashlink = hashlink.toString(CryptoJS.enc.Hex);
+
+// //return "&hash=" + hashlink;
+
+// return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
+// };
+
+// const azureHeadersPaged = (access_token) => {
+// return {
+// headers: {
+// "OData-MaxVersion": "4.0",
+// "OData-Version": "4.0",
+// "Accept": "application/json;odata.metadata=none",
+// "Prefer":
+// 'odata.include-annotations="*",return=representation, odata.maxpagesize=10',
+// "Content-Type": "application/json",
+// "Authorization": "Bearer " + access_token,
+// },
+// };
+// };
+
+// export default async function ApiProxy(req, res) {
+// var token = await getToken();
+
+// var docRef = req.query;
+
+// var queryUrl = "documents/download/" + docRef.id + "?hash=" + docRef.hash;
+
+// const configDocument = (access_token) => {
+// return {
+// headers: {
+// "OData-MaxVersion": "4.0",
+// "OData-Version": "4.0",
+// "Accept": "application/json",
+// "Prefer": 'odata.include-annotations="*",return=representation',
+// "Content-Type": "application/json",
+// "Authorization": "Bearer " + access_token,
+// },
+// responseType: "arraybuffer",
+// };
+// };
+
+// return axios
+// .get(
+// WEBAPI_URL + queryUrl, // + hashAPIPath(queryUrl),
+// configDocument(token.access_token)
+// )
+// .then((response) => {
+// const bytes = response.data.byteLength;
+// console.log(bytes);
+
+// res.setHeader(
+// "content-disposition",
+// "attachment; filename=" +
+// response.headers["content-disposition"].split(
+// "filename="
+// )[1]
+// );
+// return res.status(200).send(response.data);
+// })
+// .then(() => {
+// console.log(docRef.id + "has downloaded");
+
+// return "downloadComplete";
+// })
+// .catch((error) => {
+// consoleLogger(error);
+// res.redirect("/filenotavailable");
+// });
+// }
import axios from "axios";
-import CryptoJS from "crypto-js";
import { getToken, consoleLogger } from "../../../../actions";
-const WORDKEY = process.env.HASHKEY;
-const accessTokenEndpoint = process.env.ACCESS_TOKEN_ENDPOINT;
-const tenantId = process.env.TENANT;
-
const WEBAPI_URL =
process.env.RELAY_ROOT ||
"https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
-const hashAPIPath = (queryPath) => {
- var hashlink = CryptoJS.HmacSHA256(
- queryPath,
- CryptoJS.enc.Hex.parse(WORDKEY)
- );
- hashlink = hashlink.toString(CryptoJS.enc.Hex);
-
- //return "&hash=" + hashlink;
-
- return (queryPath.indexOf("?") > -1 ? "&hash=" : "?hash=") + hashlink;
-};
-
-const azureHeadersPaged = (access_token) => {
- return {
- headers: {
- "OData-MaxVersion": "4.0",
- "OData-Version": "4.0",
- "Accept": "application/json;odata.metadata=none",
- "Prefer":
- 'odata.include-annotations="*",return=representation, odata.maxpagesize=10',
- "Content-Type": "application/json",
- "Authorization": "Bearer " + access_token,
- },
- };
-};
-
-export default async function ApiProxy(req, res) {
- var token = await getToken();
-
- var docRef = req.query;
-
- var queryUrl = "documents/download/" + docRef.id + "?hash=" + docRef.hash;
-
- const configDocument = (access_token) => {
- return {
- headers: {
- "OData-MaxVersion": "4.0",
- "OData-Version": "4.0",
- "Accept": "application/json",
- "Prefer": 'odata.include-annotations="*",return=representation',
- "Content-Type": "application/json",
- "Authorization": "Bearer " + access_token,
- },
- responseType: "arraybuffer",
- };
- };
-
- return axios
- .get(
- WEBAPI_URL + queryUrl, // + hashAPIPath(queryUrl),
- configDocument(token.access_token)
- )
- .then((response) => {
- const bytes = response.data.byteLength;
- console.log(bytes);
-
- res.setHeader(
- "content-disposition",
- "attachment; filename=" +
- response.headers["content-disposition"].split(
- "filename="
- )[1]
- );
- return res.status(200).send(response.data);
- })
- .then(() => {
- console.log(docRef.id + "has downloaded");
-
- return "downloadComplete";
- })
- .catch((error) => {
- consoleLogger(error);
- res.redirect("/filenotavailable");
- });
+// Retry utility with logging
+async function retry(fn, retries = 3, delay = 1000) {
+ for (let attempt = 1; attempt <= retries; attempt++) {
+ try {
+ return { response: await fn(), attempts: attempt };
+ } catch (err) {
+ if (attempt === retries) throw err;
+ console.log(`Retry ${attempt} failed, retrying in ${delay}ms...`);
+ await new Promise((res) => setTimeout(res, delay));
+ delay *= 2; // exponential backoff
+ }
+ }
}
+
+const ApiProxy = async (req, res) => {
+ const docRef = req.query;
+
+ try {
+ const token = await getToken();
+ const startTime = Date.now();
+
+ const fetchStream = async () => {
+ const queryUrl =
+ "documents/download/" + docRef.id + "?hash=" + docRef.hash;
+
+ return axios.get(WEBAPI_URL + queryUrl, {
+ headers: {
+ "OData-MaxVersion": "4.0",
+ "OData-Version": "4.0",
+ "Accept": "application/json",
+ "Prefer":
+ 'odata.include-annotations="*",return=representation',
+ "Content-Type": "application/json",
+ "Authorization": "Bearer " + token.access_token,
+ },
+ responseType: "stream",
+ });
+ };
+
+ const { response, attempts } = await retry(fetchStream, 3, 1000);
+
+ // Extract filename
+ const contentDisposition = response.headers["content-disposition"];
+ const filename = contentDisposition
+ ? contentDisposition.split("filename=")[1]
+ : docRef.id;
+
+ res.setHeader(
+ "Content-Disposition",
+ `attachment; filename=${filename}`
+ );
+ res.setHeader("Content-Type", "application/octet-stream");
+
+ let totalBytes = 0;
+
+ response.data.on("data", (chunk) => {
+ totalBytes += chunk.length;
+ });
+
+ response.data.pipe(res);
+
+ response.data.on("end", () => {
+ const durationMs = Date.now() - startTime;
+ console.log(
+ `[Download Complete] Document: ${filename}, ID: ${docRef.id}, Size: ${totalBytes} bytes, Duration: ${durationMs}ms, Attempts: ${attempts}`
+ );
+ });
+
+ response.data.on("error", (err) => {
+ consoleLogger(err);
+ if (!res.headersSent) res.redirect("/filenotavailable");
+ });
+ } catch (error) {
+ consoleLogger(error);
+ if (!res.headersSent) res.redirect("/filenotavailable");
+ }
+};
+
+export const config = {
+ api: {
+ responseLimit: false,
+ },
+};
+
+export default ApiProxy;
diff --git a/pages/api/endpoint/getbasicsearchdetailspaged_api.js b/pages/api/endpoint/getbasicsearchdetailspaged_api.js
index 1d841bab..417203c2 100644
--- a/pages/api/endpoint/getbasicsearchdetailspaged_api.js
+++ b/pages/api/endpoint/getbasicsearchdetailspaged_api.js
@@ -64,13 +64,16 @@ export default async function ApiProxy(req, res) {
primaryIdAttribute
).NavigationProperty;
+ // "?$filter=_" +
+ // (primaryIdAttribute == "pinswg_sipscase"
+ // ? "pinswg_sipscase_value"
+ // : primaryIdAttribute + "s_value ") +
+ // " eq " +
+ // incidentID +
+
var queryUrl =
appealTypeName +
- "?$filter=_" +
- (primaryIdAttribute == "pinswg_sipscase"
- ? "pinswg_sipscase_value"
- : primaryIdAttribute + "s_value ") +
- " eq " +
+ "?$filter=" +
incidentID +
"&$count=true" +
"&$expand=" +
diff --git a/pages/dnsapplications.js b/pages/dnsapplications.js
index eb859939..a1315141 100644
--- a/pages/dnsapplications.js
+++ b/pages/dnsapplications.js
@@ -124,38 +124,41 @@ export const getServerSideProps = wrapper.getServerSideProps(
"public, s-maxage=10, stale-while-revalidate=59"
);
- let searchResultsObj = await getBasicDNSSearch();
+ // let searchResultsObj = await getBasicDNSSearch();
- searchResultsObj =
- searchResultsObj.status == 502
- ? {
- value: [],
- errorCode: searchResultsObj.status,
- errorMsg: searchResultsObj.statusText,
- }
- : searchResultsObj;
+ // searchResultsObj =
+ // searchResultsObj.status == 502
+ // ? {
+ // value: [],
+ // errorCode: searchResultsObj.status,
+ // errorMsg: searchResultsObj.statusText,
+ // }
+ // : searchResultsObj;
const showLoginCheck = process.env.SHOWLOGIN || false;
const showMapCheck = process.env.SHOWMAPS || false;
- if (_.has(searchResultsObj, "status") == true) {
- return {
- redirect: {
- //destination: "/dns-not-found",
- destination: "/error",
- permanent: false,
- },
- };
- } else {
- const searchDetailsObj = await getSearchDetails(
- searchResultsObj
- );
- const dnsCoords = await getDNSCoords();
- store.dispatch(setSearchResults(searchResultsObj));
- store.dispatch(setSearchDetails(searchDetailsObj));
- store.dispatch(setSearch("DNS"));
- store.dispatch(setDNSCoords(dnsCoords));
- }
+ // if (_.has(searchResultsObj, "status") == true) {
+ // return {
+ // redirect: {
+ // //destination: "/dns-not-found",
+ // destination: "/error",
+ // permanent: false,
+ // },
+ // };
+ // } else {
+ // // const searchDetailsObj = await getSearchDetails(
+ // // searchResultsObj
+ // // );
+ // const dnsCoords = await getDNSCoords();
+ // // store.dispatch(setSearchResults(searchResultsObj));
+ // // store.dispatch(setSearchDetails(searchDetailsObj));
+ // store.dispatch(setSearch("DNS"));
+ // store.dispatch(setDNSCoords(dnsCoords));
+ // }
+ const dnsCoords = await getDNSCoords();
+ store.dispatch(setSearch("DNS"));
+ store.dispatch(setDNSCoords(dnsCoords));
return {
props: {
diff --git a/pages/myportal/case/[ticketnumber].js b/pages/myportal/case/[ticketnumber].js
index bbac2d10..de7e227a 100644
--- a/pages/myportal/case/[ticketnumber].js
+++ b/pages/myportal/case/[ticketnumber].js
@@ -106,8 +106,11 @@ const CaseHome = (props) => {
props.awaitingSubmission.awaitingSubmission
}
caseReference={
- props.searchResultsObj.searchResultsObj.value[0]
- .ticketnumber
+ props.currentView.caseReference.currentReference
+ }
+ ticketnumber={
+ props.currentView.caseReference.ticketnumber ||
+ router.query.ticketnumber
}
ticketnumber={
props.currentView.caseReference.ticketnumber ||
@@ -115,13 +118,9 @@ const CaseHome = (props) => {
}
currentType={props.currentType}
appealTypeID={
- props.searchResultsObj.searchResultsObj.value[0]
- .pinswg_appealcasetype
- }
- incidentid={
- props.searchResultsObj.searchResultsObj.value[0]
- .incidentid
+ props.currentView.caseReference.appealType
}
+ incidentid={props.currentView.caseReference.incidentid}
representationsObj={
props.searchResultsObj.representationsObj
}
diff --git a/pages/myportal/index.js b/pages/myportal/index.js
index 41ab4218..33540836 100644
--- a/pages/myportal/index.js
+++ b/pages/myportal/index.js
@@ -58,9 +58,10 @@ const Home = (props) => {
showLoginCheck,
currentView,
mySubmittedReps,
+ docsOffline,
} = props;
- const { t } = useTranslation();
+ let { t, lang } = useTranslation();
const router = useRouter();
const { locale, query } = router;
const { appealtypes } = query;
@@ -150,6 +151,7 @@ const Home = (props) => {
containerID={accountDetails.containerID}
showLoginCheck={showLoginCheck}
currentView={currentView}
+ docsOffline={docsOffline}
/>
@@ -357,6 +359,7 @@ export const getServerSideProps = wrapper.getServerSideProps(
showFileUpload: Boolean(process.env.SHOWFILEUPLOAD),
containerID: thisSession.user.id,
showLoginCheck,
+ docsOffline: process.env.DOCAPI_OFFLINE || false,
},
};
}
diff --git a/pages/searchresults.js b/pages/searchresults.js
index 81319814..417c4ba3 100644
--- a/pages/searchresults.js
+++ b/pages/searchresults.js
@@ -132,33 +132,34 @@ export const getServerSideProps = wrapper.getServerSideProps(
const showReps = process.env.SHOWREPRESENTATIONS || false;
store.dispatch(setShowReps(showReps, showLoginCheck));
- let searchResultsObj = await getBasicSearch(query.q);
+ // let searchResultsObj = await getBasicSearch(query.q);
- searchResultsObj =
- searchResultsObj.status == 502
- ? {
- value: [],
- errorCode: searchResultsObj.status,
- errorMsg: searchResultsObj.statusText,
- }
- : searchResultsObj;
+ // searchResultsObj =
+ // searchResultsObj.status == 502
+ // ? {
+ // value: [],
+ // errorCode: searchResultsObj.status,
+ // errorMsg: searchResultsObj.statusText,
+ // }
+ // : searchResultsObj;
- if (_.has(searchResultsObj, "status") == true) {
- return {
- redirect: {
- //destination: "/dns-not-found",
- destination: "/error",
- permanent: false,
- },
- };
- } else {
- const searchDetailsObj = await getSearchDetails(searchResultsObj);
+ // if (_.has(searchResultsObj, "status") == true) {
+ // return {
+ // redirect: {
+ // //destination: "/dns-not-found",
+ // destination: "/error",
+ // permanent: false,
+ // },
+ // };
+ // } else {
+ // // const searchDetailsObj = await getSearchDetails(searchResultsObj);
- store.dispatch(setSearchResults(searchResultsObj));
- store.dispatch(setSearchDetails(searchDetailsObj));
- store.dispatch(setSearch(query.q));
- }
+ // store.dispatch(setSearchResults(searchResultsObj));
+ // // store.dispatch(setSearchDetails(searchDetailsObj));
+ // store.dispatch(setSearch(query.q));
+ // }
+ store.dispatch(setSearch(query.q));
return {
props: {
isLinkedCase: isLinked,
diff --git a/styles/sass/welshgov/_application.scss b/styles/sass/welshgov/_application.scss
index 8c1f1b98..6a5b1152 100644
--- a/styles/sass/welshgov/_application.scss
+++ b/styles/sass/welshgov/_application.scss
@@ -550,7 +550,7 @@ a.longLinkBreak {
label {
margin-top: 0px;
background-color: $lightgrey_semi;
- padding: 20px 20px 20px 20px;
+ padding: 20px 20px 20px 50px;
&:before {
top: 18px;
@@ -753,7 +753,7 @@ textarea,
right: -10px;
}
- .govuk-header__link {
+ a.govuk-header__link {
background-color: $black;
padding: 10px 20px;
font-weight: 700;
@@ -765,9 +765,9 @@ textarea,
}
}
- .govuk-header__link:focus {
+ a.govuk-header__link:focus {
background-color: $black;
- padding: 10px 20px;
+ padding: 10px;
color: #fff;
box-shadow: none;
}
@@ -1476,6 +1476,22 @@ textarea,
top: calc(50% - 10px);
}
}
+
+ .documentLink {
+ border: none;
+ text-align: left;
+ cursor: pointer;
+ color: #0360a6;
+ display: block;
+ padding-left: 0px;
+
+ &:hover {
+ background-color: $white;
+ color: #3b7dc5;
+ border: none;
+ padding-left: 0px
+ }
+ }
}
.appealModule {
@@ -2906,8 +2922,6 @@ fade {
}
}
-
-
.fieldArrayLink {
border: none;
background: no-repeat;
@@ -3029,6 +3043,10 @@ fade {
.govuk-label-s {
font-size: 14px;
}
+
+ &.govuk-checkboxes_short {
+ height: 180px;
+ }
}