Merge branch 'Development' into SIPS-Development
This commit is contained in:
+43
-32
@@ -139,10 +139,14 @@ const CaseSummary = (props) => {
|
||||
};
|
||||
|
||||
const isWatchedCase = (whichIncident) => {
|
||||
let isWatched = jsonpath(
|
||||
"$..value[?(@._pinswg_watchedcase_value=='" + whichIncident + "')]",
|
||||
watchedCases
|
||||
);
|
||||
let isWatched = jsonpath({
|
||||
path:
|
||||
"$..value[?(@._pinswg_watchedcase_value=='" +
|
||||
whichIncident +
|
||||
"')]",
|
||||
json: watchedCases,
|
||||
sandbox: {},
|
||||
});
|
||||
|
||||
return isWatched;
|
||||
};
|
||||
@@ -178,45 +182,52 @@ const CaseSummary = (props) => {
|
||||
var casesObj = {};
|
||||
|
||||
currentType == "searchResultsObj"
|
||||
? (casesObj = jsonpath(
|
||||
'$..[?(@.title=="' + caseReference + '")]',
|
||||
searchResultsObj
|
||||
))
|
||||
? (casesObj = jsonpath({
|
||||
path: '$..[?(@.title=="' + caseReference + '")]',
|
||||
json: searchResultsObj,
|
||||
sandbox: {},
|
||||
}))
|
||||
: currentType == "watchedCases"
|
||||
? (casesObj = jsonpath(
|
||||
'$..[?(@.pinswg_title=="' + caseReference + '")]',
|
||||
setCaseQueryObj
|
||||
))
|
||||
? (casesObj = jsonpath({
|
||||
path: '$..[?(@.pinswg_title=="' + caseReference + '")]',
|
||||
json: setCaseQueryObj,
|
||||
sandbox: {},
|
||||
}))
|
||||
: currentType == "myCases"
|
||||
? (casesObj = jsonpath(
|
||||
'$..[?(@.pinswg_title=="' + caseReference + '")]',
|
||||
setCaseQueryObj
|
||||
))
|
||||
? (casesObj = jsonpath({
|
||||
path: '$..[?(@.pinswg_title=="' + caseReference + '")]',
|
||||
json: setCaseQueryObj,
|
||||
sandbox: {},
|
||||
}))
|
||||
: currentType == "directResultsObj"
|
||||
? (casesObj = jsonpath(
|
||||
'$..[?(@.ticketnumber=="' + caseReference + '")]',
|
||||
setCaseQueryObj
|
||||
))
|
||||
: (casesObj = jsonpath(
|
||||
'$..[?(@.reference=="' + caseReference + '")]',
|
||||
setCaseQueryObj
|
||||
));
|
||||
? (casesObj = jsonpath({
|
||||
path: '$..[?(@.ticketnumber=="' + caseReference + '")]',
|
||||
json: setCaseQueryObj,
|
||||
sandbox: {},
|
||||
}))
|
||||
: (casesObj = jsonpath({
|
||||
path: '$..[?(@.reference=="' + caseReference + '")]',
|
||||
json: setCaseQueryObj,
|
||||
sandbox: {},
|
||||
}));
|
||||
|
||||
casesObj = Object.assign({}, ...casesObj);
|
||||
|
||||
var detailsObj = {};
|
||||
|
||||
currentType == "searchResultsObj"
|
||||
? (detailsObj = jsonpath(
|
||||
'$..[?(@.pinswg_name=="' + caseReference + '")]',
|
||||
searchDetailsObj
|
||||
))
|
||||
? (detailsObj = jsonpath({
|
||||
path: '$..[?(@.pinswg_name=="' + caseReference + '")]',
|
||||
json: searchDetailsObj,
|
||||
sandbox: {},
|
||||
}))
|
||||
: currentType == "directResultsObj"
|
||||
? (detailsObj = setCaseDetailsObj[0].value[0])
|
||||
: (detailsObj = jsonpath(
|
||||
'$..[?(@.pinswg_name=="' + caseReference + '")]',
|
||||
setCaseDetailsObj
|
||||
));
|
||||
: (detailsObj = jsonpath({
|
||||
path: '$..[?(@.pinswg_name=="' + caseReference + '")]',
|
||||
jsopn: setCaseDetailsObj,
|
||||
sandbox: {},
|
||||
}));
|
||||
|
||||
detailsObj = typeof detailsObj == "object" ? detailsObj : detailsObj[0];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user