Merge branch 'Development' into SIPS-Development

components/case/summary.js

@@ -76,6 +76,7 @@ const CaseSummary = (props) => {
         currentView,
         messagesObj,
         docsOffline,
+        ticketnumber,
     } = props;
 
     let appealTypeID = props.appealTypeID || router.query.appealType;
@@ -233,13 +234,13 @@ const CaseSummary = (props) => {
 
     currentType == "searchResultsObj"
         ? (casesObj = jsonpath({
-              path: '$..[?(@ && @.title=="' + caseReference + '")]',
+              path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
               json: searchResultsObj,
               eval: true,
           }))
         : currentType == "watchedCases"
         ? (casesObj = jsonpath({
-              path: '$..[?(@ && @.pinswg_title=="' + caseReference + '")]',
+              path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
               json: setCaseQueryObj,
               eval: true,
           }))
@@ -251,7 +252,7 @@ const CaseSummary = (props) => {
           }))
         : currentType == "directResultsObj"
         ? (casesObj = jsonpath({
-              path: '$..[?(@ && @.ticketnumber=="' + caseReference + '")]',
+              path: '$..[?(@ && @.ticketnumber=="' + ticketnumber + '")]',
               json: setCaseQueryObj,
               eval: true,
           }))
@@ -1867,7 +1868,10 @@ const CaseSummary = (props) => {
                             id="case-documents"
                         >
                             <Documents
-                                incidentid={props.incidentid}
+                                incidentid={
+                                    props.incidentid ||
+                                    setCaseQueryObj.value[0].incidentid
+                                }
                                 caseReference={props.caseReference}
                                 searchResultsObj={props.searchResultsObj}
                                 searchDetailsObj={props.searchDetailsObj}
@@ -1937,7 +1941,9 @@ const CaseSummary = (props) => {
         currentView,
         showMap
     ) {
-        const id = getFormCollectionByID(appealTypeID).PrimaryIdAttribute;
+        const id = getFormCollectionByID(
+            appealTypeID || setCaseQueryObj.value[0].pinswg_appealcasetype
+        ).PrimaryIdAttribute;
 
         const Component = CaseTypes[capitalizeFirstLetter(id)];
 
@@ -1955,7 +1961,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;