{
);
function showSummary(casesObj, detailsObj) {
- let appealIDObj =
- getFormCollectionByID(appealTypeID).PrimaryIdAttribute;
+ let appealIDObj = getFormCollectionByID(
+ appealTypeID || setCaseQueryObj.value[0].pinswg_appealcasetype
+ ).PrimaryIdAttribute;
switch (appealIDObj) {
case "pinswg_advertsid":
@@ -1107,7 +1119,9 @@ const CaseSummary = (props) => {
useEffect(() => {
const linkCaseObj = async () => {
- let docObj = await getLinkedCases(incidentid).then((data) => {
+ let docObj = await getLinkedCases(
+ incidentid || setCaseQueryObj.value[0].incidentid
+ ).then((data) => {
//console.log(data);
setCurrentLinkedCases(data);
return data;
diff --git a/next-env.d.ts b/next-env.d.ts
index fd36f949..a4a7b3f5 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,6 +1,5 @@
///
///
-///
// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
diff --git a/pages/case/[ticketnumber].js b/pages/case/[ticketnumber].js
index b95e1b29..c66c4cb8 100644
--- a/pages/case/[ticketnumber].js
+++ b/pages/case/[ticketnumber].js
@@ -239,7 +239,7 @@ const mapStateToProps = (state) => {
accountDetails: state.accountDetails,
currentView: state.currentView,
search: state.search,
- searchResultsObj: state.searchResultsObj,
+ //searchResultsObj: state.searchResultsObj,
documentDetailsObj: state.searchResultsObj.documentDetailsObj,
formData: state.formData,
appealType: state.appealType,
diff --git a/pages/dns/[developmentName].js b/pages/dns/[developmentName].js
index fcf1fb82..02122f8a 100644
--- a/pages/dns/[developmentName].js
+++ b/pages/dns/[developmentName].js
@@ -44,7 +44,9 @@ const CaseHome = (props) => {
Reference:{" "}
- {props.currentView.caseReference.currentReference}{" "}
+ {props.currentView.caseReference.currentReference ||
+ props.searchResultsObj.searchResultsObj.value[0]
+ .title}{" "}
Developments of National Significance
@@ -86,9 +88,9 @@ const CaseHome = (props) => {
props.searchResultsObj.searchResultsObj.value[0]
.ticketnumber
}
- ticketnumber={
- props.currentView.caseReference.ticketnumber
- }
+ // ticketnumber={
+ // props.currentView.caseReference.ticketnumber
+ // }
currentType={props.currentType}
appealTypeID={
props.searchResultsObj.searchResultsObj.value[0]
diff --git a/pages/myportal/case/[ticketnumber].js b/pages/myportal/case/[ticketnumber].js
index fae12fcc..b989b9ca 100644
--- a/pages/myportal/case/[ticketnumber].js
+++ b/pages/myportal/case/[ticketnumber].js
@@ -68,7 +68,9 @@ const CaseHome = (props) => {
Reference:{" "}
- {props.currentView.caseReference.currentReference}{" "}
+ {props.currentView.caseReference.currentReference ||
+ props.searchResultsObj.searchResultsObj.value[0]
+ .title}{" "}
@@ -105,7 +107,8 @@ const CaseHome = (props) => {
props.currentView.caseReference.currentReference
}
ticketnumber={
- props.currentView.caseReference.ticketnumber
+ props.currentView.caseReference.ticketnumber ||
+ router.query.ticketnumber
}
currentType={props.currentType}
appealTypeID={
@@ -456,7 +459,7 @@ const mapStateToProps = (state) => {
accountDetails: state.accountDetails,
currentView: state.currentView,
search: state.search,
- searchResultsObj: state.searchResultsObj,
+ //searchResultsObj: state.searchResultsObj,
documentDetailsObj: state.searchResultsObj.documentDetailsObj,
formData: state.formData,
appealType: state.appealType,
diff --git a/pages/myportal/dns/[developmentName].js b/pages/myportal/dns/[developmentName].js
index 40a686ac..d9cc2082 100644
--- a/pages/myportal/dns/[developmentName].js
+++ b/pages/myportal/dns/[developmentName].js
@@ -44,7 +44,9 @@ const CaseHome = (props) => {
Reference:{" "}
- {props.currentView.caseReference.currentReference}{" "}
+ {props.currentView.caseReference.currentReference ||
+ props.searchResultsObj.searchResultsObj.value[0]
+ .title}{" "}
Developments of National Significance
diff --git a/pages/storageAdmin.js b/pages/storageAdmin.js
index c58ae398..9ccec358 100644
--- a/pages/storageAdmin.js
+++ b/pages/storageAdmin.js
@@ -104,14 +104,37 @@ const deleteRepItem = (containerID, caseID, repfile) => {
);
};
-const deleteCaseItem = (containerID, caseID) => {
- deleteAwaitingSubmissionsFromBlob(containerID, caseID).then((data) => {
- return data;
- });
+// const deleteCaseItem = (containerID, caseID) => {
+// deleteAwaitingSubmissionsFromBlob(containerID, caseID).then((data) => {
+// return data;
+// });
+// };
+
+const deleteCaseItem = async (containerID, caseID, setData) => {
+ const result = await deleteAwaitingSubmissionsFromBlob(containerID, caseID);
+
+ if (result) {
+ setData((prevData) =>
+ prevData.map((user) => ({
+ ...user,
+ containers: user.containers.map((c) =>
+ c.container === containerID
+ ? {
+ ...c,
+ folders: c.folders.filter(
+ (f) => f.folderPath !== caseID
+ ),
+ }
+ : c
+ ),
+ }))
+ );
+ }
};
export default function StoragePage(props) {
- const { data, userData, repCompleteCount } = props;
+ const { userData, repCompleteCount } = props;
+ const [data, setData] = useState(props.data);
const [showRepJson, setShowRepJson] = useState(true);
const [showTmpFile, setShowTmpFile] = useState(true);
const [whichTab, setWhichTab] = useState("storage");
@@ -280,12 +303,12 @@ export default function StoragePage(props) {
) &&
(deleteCaseItem(
c.container,
- folder.folderPath
+ folder.folderPath,
+ setData
),
alert(
"Temp case Deleted!"
- ),
- window.location.reload());
+ ));
}}
>
Delete