fix(search): prevent keyword search from bypassing document sets (#6015)

Author: alvesfc

forms-flow-web/src/components/FOI/Dashboard/IAO/KeywordSearch/DataGridKeywordSearch.js

@@ -9,7 +9,7 @@ import {
   updateSortModel,
   getFullName,
   LightTooltip,
-  pagecountcellTooltipRender, 
+  pagecountcellTooltipRender,
   getClosedDate,
   formatRequestType
 } from "../../utils";
@@ -57,7 +57,7 @@ const DataGridKeywordSearch = ({ userDetail }) => {
 
   const hyperlinkTooltipRenderCell = (params) => {
     let link;
-    if (params.row.ministryrequestid) { 
+    if (params.row.ministryrequestid) {
       link = "./foirequests/" + params.row.id + "/ministryrequest/" + params.row.ministryrequestid;
     } else {
       link = "./reviewrequest/" + params.row.id;
@@ -81,7 +81,7 @@ const DataGridKeywordSearch = ({ userDetail }) => {
 
   const hyperlinkRenderCell = (params) => {
     let link;
-    if (params.row.ministryrequestid) { 
+    if (params.row.ministryrequestid) {
       link = "./foirequests/" + params.row.id + "/ministryrequest/" + params.row.ministryrequestid;
     } else {
       link = "./reviewrequest/" + params.row.id;
@@ -94,33 +94,43 @@ const DataGridKeywordSearch = ({ userDetail }) => {
   };
 
   const goToRecordsRenderCell = (params) => {
+    if (!params?.row?.ministryrequestid) return null;
+
+    const searchParams = new URLSearchParams();
+
     const keywordSearchParam = keywordSearchParamsRef.current;
-    let link;
-    if (params.row.ministryrequestid && keywordSearchParam?.keywords?.length > 0) {
+    if (keywordSearchParam?.keywords?.length > 0) {
       const keywords = keywordSearchParam.keywords
-      .filter(keyword => keyword.category.toUpperCase() !== "NOT")
-      .map(keyword => `"${keyword.text}"`)
-      .join(" ");
-      let queryString= {"query": keywords };
-      const queryStringParam = new URLSearchParams(queryString).toString();
-      const formattedQueryString = queryStringParam.replace(/\+/g, '%20');
-      link = `${DOC_REVIEWER_WEB_URL}/foi/${params.row.ministryrequestid}?${formattedQueryString}`;
+        .filter(k => k.category?.toUpperCase() !== "NOT")
+        .map(k => `"${k.text}"`)
+        .join(" ");
+
+      searchParams.set("query", keywords);
     }
+
+    const setId = Number(params?.row?.documentsetid);
+    if (Number.isInteger(setId) && setId > 0) {
+      searchParams.set("documentsetid", setId.toString());
+    }
+
+    const href = `${DOC_REVIEWER_WEB_URL}/foi/${params.row.ministryrequestid}?${searchParams
+      .toString()
+      .replace(/\+/g, "%20")}`;
+
     return (
       <Link
-        href={link}
+        href={href}
         target="_blank"
         rel="noopener noreferrer"
-        onClick={(e) => {
-          e.stopPropagation();
-        }}
+        onClick={(e) => e.stopPropagation()}
       >
         <div className="MuiDataGrid-cellContent">Go to records</div>
       </Link>
     );
   };
 
 
+
   const IAOColumns = [
     {
       field: "applicantName",
@@ -149,7 +159,7 @@ const DataGridKeywordSearch = ({ userDetail }) => {
       cellClassName: 'foi-advanced-search-result-cell',
       valueGetter: (params) => params.row.requestnumber,
       width: 160,
-    },  
+    },
     {
       field: "requeststatus",
       headerName: "CURRENT STATE",
@@ -185,7 +195,7 @@ const DataGridKeywordSearch = ({ userDetail }) => {
       flex: 1,
     },
   ];
-    
+
   const defaultTableInfo = {
     columns: IAOColumns,
     sort: [
@@ -198,7 +208,7 @@ const DataGridKeywordSearch = ({ userDetail }) => {
   };
 
   const tableInfo = defaultTableInfo;
-  
+
   const classes = useStyles();
 
   const defaultRowsState = { page: 0, pageSize: 10 };
@@ -224,7 +234,7 @@ const DataGridKeywordSearch = ({ userDetail }) => {
       // });
 
     }
-    
+
   }, [rowsState, sortModel]);
 
   const columnsRef = React.useRef(tableInfo?.columns || []);

request-management-api/request_api/models/FOIMinistryRequests.py

@@ -1626,6 +1626,7 @@ def getrequestsdetailsforsearch(cls,requestnumbers):
                     ,FMR.description
                     ,PA.iaocode AS programareacode
                     ,FR.requesttype
+                    ,FRRG.document_set_id
                     FROM public."FOIMinistryRequests" FMR INNER JOIN (
                         SELECT 
                         DISTINCT FMR.foiministryrequestid as ministryrequestid
@@ -1638,6 +1639,8 @@ def getrequestsdetailsforsearch(cls,requestnumbers):
                     JOIN public."FOIRequestApplicantMappings" FRAM ON FRAM.foirequest_id=MaxRequestVersions.requestid
                     JOIN public."FOIRequestApplicants" FRA ON FRA.foirequestapplicantid=FRAM.foirequestapplicantid
                     LEFT JOIN public."ProgramAreas" PA	ON FMR.programareaid = PA.programareaid
+                    LEFT JOIN public."FOIRequestRecordGroup" FRRG	ON FRRG.ministry_request_id = FMR.foiministryrequestid
+                                                                         AND FRRG.request_id = FMR.foirequest_id
    	                JOIN public."FOIRequests" FR ON FMR.foirequest_id = FR.foirequestid AND FMR.version = FR.version"""            
             result = db.session.execute(text(query),{"csvrequestnumbers":csvrequestnumbers})        
             rows = result.fetchall()            
@@ -1666,6 +1669,7 @@ def getrequestsdetailsforsearch(cls,requestnumbers):
                 requestdetail["description"]=row["description"]
                 requestdetail["requestType"]=row["requesttype"]
                 requestdetail["bcgovcode"]=row["programareacode"]
+                requestdetail["documentsetid"]=row["document_set_id"]
                 requestdetails.append(requestdetail)
 
         except Exception as ex: