Merge pull request #5501 from bcgov/test-rook-NK-AH-FOIMOD-3583

Release 14.0 (OpenInfo) Local (Test-Rook) to Dev-Rook Merge

.gitignore

@@ -120,3 +120,10 @@ datamigrations/FOIMOD.CFD.ConsoleApp.DocMigration/FOIMOD.CFD.DocMigration.OCR.Te
 datamigrations/FOIMOD.CFD.ConsoleApp.DocMigration/FOIMOD.CFD.DocMigration.OCR.Tests/bin/*
 /datamigrations/FOIMOD.CFD.ConsoleApp.DocMigration/FOIMOD.CFD.DocMigration.Utils.UnitTests/appsettings.dev.json
 historical-search-api/env/*
+datamigrations/FOIMOD.AXIS.DocumentMigration/FOIMOD.HistoricalDocMigration.Utils/obj/*
+datamigrations/FOIMOD.AXIS.DocumentMigration/FOIMOD.HistoricalDocMigration.Utils/bin/*
+datamigrations/FOIMOD.AXIS.DocumentMigration/*/obj/*
+datamigrations/FOIMOD.AXIS.DocumentMigration/*/bin/*
+datamigrations/FOIMOD.AXIS.DocumentMigration/.vs/*
+*.locenv
+*.locenv

docker-compose.yml

@@ -117,6 +117,7 @@ services:
       - UNOPENED_REPORT_EMAIL_RECIPIENT=${UNOPENED_REPORT_EMAIL_RECIPIENT}
       - AXIS_API_URL=${AXIS_API_URL}
       - AXIS_SYNC_BATCHSIZE=${AXIS_SYNC_BATCHSIZE}
+      - SKIP_OPENINFO_MINISTRIES=${SKIP_OPENINFO_MINISTRIES}
       #- LOG_ROOT=${LOG_ROOT}
       #- LOG_BASIC=${LOG_BASIC}
       #- LOG_TRACING=${LOG_TRACING}

forms-flow-web/Dockerfile

@@ -72,6 +72,7 @@ ENV REACT_APP_SESSION_SECURITY_KEY ${REACT_APP_SESSION_SECURITY_KEY}
 ENV REACT_APP_SOCKETIO_CONNECT_NONCE ${REACT_APP_SOCKETIO_CONNECT_NONCE}
 ENV REACT_APP_RECORD_DOWNLOAD_LIMIT ${REACT_APP_RECORD_DOWNLOAD_LIMIT}
 ENV REACT_APP_RECORD_DOWNLOAD_SIZE_LIMIT ${REACT_APP_RECORD_DOWNLOAD_SIZE_LIMIT}
+ENV REACT_APP_SKIP_OPENINFO_MINISTRIES ${REACT_APP_SKIP_OPENINFO_MINISTRIES}
 # add `/app/node_modules/.bin` to $PATH
 ENV PATH /forms-flow-web/app/node_modules/.bin:$PATH
 

forms-flow-web/Dockerfile.local

@@ -65,6 +65,11 @@ ENV REACT_APP_DISABLE_GATHERINGRECORDS_TAB ${REACT_APP_DISABLE_GATHERINGRECORDS_
 ENV REACT_APP_RECORD_DOWNLOAD_LIMIT ${REACT_APP_RECORD_DOWNLOAD_LIMIT}
 ENV REACT_APP_RECORD_DOWNLOAD_SIZE_LIMIT ${REACT_APP_RECORD_DOWNLOAD_SIZE_LIMIT}
 ENV REACT_APP_SESSION_SECURITY_KEY ${REACT_APP_SESSION_SECURITY_KEY}
+
+ENV REACT_APP_SOCKETIO_CONNECT_NONCE ${REACT_APP_SOCKETIO_CONNECT_NONCE}
+ENV REACT_APP_RECORD_DOWNLOAD_LIMIT ${REACT_APP_RECORD_DOWNLOAD_LIMIT}
+ENV REACT_APP_RECORD_DOWNLOAD_SIZE_LIMIT ${REACT_APP_RECORD_DOWNLOAD_SIZE_LIMIT}
+ENV REACT_APP_SKIP_OPENINFO_MINISTRIES ${REACT_APP_SKIP_OPENINFO_MINISTRIES}
 # add `/app/node_modules/.bin` to $PATH
 ENV PATH /forms-flow-web/app/node_modules/.bin:$PATH
 

forms-flow-web/src/actions/FOI/foiActionConstants.js

@@ -107,10 +107,17 @@ const FOI_ACTION_CONSTANTS = {
   OIPC_REVIEWTYPES: "OIPC_REVIEWTYPES",
   OIPC_INQUIRYOUTCOMES:  "OIPC_INQUIRYOUTCOMES",
 
+  OI_EXEMPTIONS: "OI_EXEMPTIONS",
+  OI_PUBLICATIONSTATUSES: "OI_PUBLICATIONSTATUSES",
+  OI_STATUSES: "OI_STATUSES",
+  FOI_OPENINFO_REQUEST: "FOI_OPENINFO_REQUEST",
   FOI_ADVANCED_SEARCH_FILTER: "FOI_ADVANCED_SEARCH_FILTER",
   FOI_HISTORIC_SEARCH_PARAMS: "FOI_HISTORIC_SEARCH_PARAMS",
 
   FOI_COMMENT_TYPES: "FOI_COMMENT_TYPES",
+  FOI_OPENINFO_ADDITIONAL_FILES: "FOI_OPENINFO_ADDITIONAL_FILES",
+  FOI_PDF_STITCHED_OI_PACKAGE: "FOI_PDF_STITCHED_OI_PACKAGE",
+  FOI_PDF_STITCHED_STATUS_FOR_OI_PACKAGE:"FOI_PDF_STITCHED_STATUS_FOR_OI_PACKAGE"
 };
 
 export default FOI_ACTION_CONSTANTS;

forms-flow-web/src/actions/FOI/foiRequestActions.js

@@ -153,6 +153,13 @@ export const setFOIPDFStitchedRecordForResponsePackage =
       payload: data,
     });
   };
+export const setFOIPDFStitchedOIPackage =
+  (data) => (dispatch) => {
+    dispatch({
+      type: FOI_ACTION_CONSTANTS.FOI_PDF_STITCHED_OI_PACKAGE,
+      payload: data,
+    });
+  };
 export const setFOIPDFStitchedRecordForOipcRedlineReview = (data) => (dispatch) => {
   dispatch({
     type: FOI_ACTION_CONSTANTS.FOI_PDF_STITCHED_RECORD_FOR_OIPCREDLINEREVIEW,
@@ -190,6 +197,12 @@ export const setFOIPDFStitchStatusForResponsePackage = (data) => (dispatch) => {
     payload: data,
   });
 };
+export const setFOIPDFStitchStatusForOIPackage = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.FOI_PDF_STITCHED_STATUS_FOR_OI_PACKAGE,
+    payload: data,
+  });
+};
 export const setFOIPDFStitchStatusForOipcRedlineReview = (data) => (dispatch) => {
   dispatch({
     type: FOI_ACTION_CONSTANTS.FOI_PDF_STITCHED_STATUS_FOR_OIPCREDLINEREVIEW,
@@ -514,6 +527,34 @@ export const setOIPCInquiryoutcomes = (data) => (dispatch) => {
   });
 };
 
+export const setOIExemptions = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.OI_EXEMPTIONS,
+    payload: data,
+  });
+};
+
+export const setOIPublicationStatuses = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.OI_PUBLICATIONSTATUSES,
+    payload: data,
+  });
+};
+
+export const setOIStatuses = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.OI_STATUSES,
+    payload: data,
+  });
+};
+
+export const setFOIOpenInfoRequest = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.FOI_OPENINFO_REQUEST,
+    payload: data,
+  });
+};
+
 export const setAdvancedSearchFilter = (data) => (dispatch) => {
   dispatch({
     type: FOI_ACTION_CONSTANTS.FOI_ADVANCED_SEARCH_FILTER,
@@ -533,4 +574,11 @@ export const setFOICommentTypes = (data) => (dispatch) => {
     type: FOI_ACTION_CONSTANTS.FOI_COMMENT_TYPES,
     payload: data,
   });
+};
+
+export const setFOIOpenInfoAdditionalFiles = (data) => (dispatch) => {
+  dispatch({
+    type: FOI_ACTION_CONSTANTS.FOI_OPENINFO_ADDITIONAL_FILES,
+    payload: data,
+  });
 };

forms-flow-web/src/apiManager/endpoints/index.js

@@ -10,6 +10,7 @@ const API = {
   FOI_GET_MINISTRY_REQUESTS_API: `${FOI_BASE_API_URL}/api/dashboard/ministry`,
   FOI_GET_REQUESTS_PAGE_API: `${FOI_BASE_API_URL}/api/dashboardpagination`,
   FOI_GET_MINISTRY_REQUESTS_PAGE_API: `${FOI_BASE_API_URL}/api/dashboardpagination/ministry`,
+  FOI_GET_OI_REQUESTS_PAGE_API: `${FOI_BASE_API_URL}/api/dashboardpagination/oi`,
   FOI_GET_CATEGORIES_API: `${FOI_BASE_API_URL}/api/foiflow/applicantcategories`,
   FOI_GET_PROGRAMAREAS_API: `${FOI_BASE_API_URL}/api/foiflow/programareas`,
   FOI_GET_PROGRAMAREAS_FORUSER_API: `${FOI_BASE_API_URL}/api/foiflow/programareasforuser`,
@@ -153,6 +154,9 @@ const API = {
   FOI_DOWNLOAD_RECORDS_FOR_RESPONSEPACKAGE: `${FOI_BASE_API_URL}/api/foirecord/<requestid>/ministryrequest/<ministryrequestid>/download/responsepackage`,
   FOI_PDF_STITCH_STATUS_FOR_RESPONSEPACKAGE: `${FOI_BASE_API_URL}/api/foirecord/<requestid>/ministryrequest/<ministryrequestid>/responsepackage/pdfstitchjobstatus`,
 
+  FOI_PDF_STITCH_STATUS: `${FOI_BASE_API_URL}/api/foirecord/<requestid>/ministryrequest/<ministryrequestid>/<packagename>/pdfstitchjobstatus`,
+  FOI_DOWNLOAD_ZIPPED_PACKAGE: `${FOI_BASE_API_URL}/api/foirecord/<requestid>/ministryrequest/<ministryrequestid>/download`,
+
   FOI_DOWNLOAD_RECORDS_FOR_OIPCREDLINEREVIEW: `${FOI_BASE_API_URL}/api/foirecord/<requestid>/ministryrequest/<ministryrequestid>/download/oipcreviewredline`,
   FOI_PDF_STITCH_STATUS_FOR_OIPCREDLINEREVIEW: `${FOI_BASE_API_URL}/api/foirecord/<requestid>/ministryrequest/<ministryrequestid>/oipcreviewredline/pdfstitchjobstatus`,
   FOI_DOWNLOAD_RECORDS_FOR_OIPCREDLINE: `${FOI_BASE_API_URL}/api/foirecord/<requestid>/ministryrequest/<ministryrequestid>/download/oipcredline`,
@@ -165,6 +169,14 @@ const API = {
   FOI_GET_OIPC_STATUSES: `${FOI_BASE_API_URL}/api/foiflow/oipc/statuses`,
   FOI_GET_OIPC_REVIEWTYPES: `${FOI_BASE_API_URL}/api/foiflow/oipc/reviewtypes`,
   FOI_GET_OIPC_INQUIRYOUTCOMES: `${FOI_BASE_API_URL}/api/foiflow/oipc/inquiryoutcomes`,
+
+  FOI_GET_OI_PUBLICATIONSTATUSES: `${FOI_BASE_API_URL}/api/foiflow/openinfo/publicationstatuses`,
+  FOI_GET_OI_EXEMPTIONS: `${FOI_BASE_API_URL}/api/foiflow/openinfo/exemptions`,
+  FOI_GET_OI_STATUSES: `${FOI_BASE_API_URL}/api/foiflow/openinfo/statuses`,
+  FOI_GET_OPENINFO_REQUEST: `${FOI_BASE_API_URL}/api/foiopeninfo/ministryrequest/<ministryrequestid>`,
+  FOI_POST_OPENINFO_REQUEST: `${FOI_BASE_API_URL}/api/foiopeninfo/foirequest/<foirequestid>/ministryrequest/<foiministryrequestid>`,
   FOI_GET_COMMENT_TYPES: `${FOI_BASE_API_URL}/api/foiflow/commenttypes`,
+  FOI_OPENINFO_ADDITIONAL_FILES: `${FOI_BASE_API_URL}/api/foiopeninfoadditionalfiles/foirequest/<foirequestid>/ministryrequest/<foiministryrequestid>`,
+  FOI_DELETE_OPENINFO_ADDITIONAL_FILES: `${FOI_BASE_API_URL}/api/foiopeninfoadditionalfiles/foirequest/<foirequestid>/ministryrequest/<foiministryrequestid>/delete`
 };
 export default API;

forms-flow-web/src/apiManager/services/FOI/foiHistoricalSearchServices.js

@@ -33,7 +33,7 @@ export const fetchHistoricalSearchData = ({
       size: size,
       sortingitem: sort[0]['field'],
       sortingorder: sort[0]['sort'],
-      search: search,
+      search: (keywords.length === 1 && keywords[0] === "") ? null : search,
       keywords: keywords,
       requestType: requestType,
       requestFlags: requestFlags,

forms-flow-web/src/apiManager/services/FOI/foiMasterDataServices.js

@@ -29,6 +29,9 @@ import {
     setOIPCStatuses,
     setOIPCReviewtypes,
     setOIPCInquiryoutcomes,
+    setOIExemptions,
+    setOIPublicationStatuses,
+    setOIStatuses,
     setFOICommentTypes
   } from "../../../actions/FOI/foiRequestActions";
   import { fnDone, catchError } from "./foiServicesUtil";
@@ -692,6 +695,72 @@ import {
     };
   };
 
+  export const fetchOpenInfoPublicationStatuses = () => {
+    return (dispatch) => {
+      httpGETRequest(API.FOI_GET_OI_PUBLICATIONSTATUSES, {}, UserService.getToken())
+        .then((res) => {
+          if (res.data) {
+            const oiPublicationStatuses = res.data;
+            dispatch(setOIPublicationStatuses(oiPublicationStatuses));
+            dispatch(setFOILoader(false));
+          } else {
+            console.log("Error while fetching OI publication statuses master data", res);
+            dispatch(serviceActionError(res));
+            dispatch(setFOILoader(false));
+          }
+        })
+        .catch((error) => {
+          console.log("Error while fetching OI publication statuses master data", error);
+          dispatch(serviceActionError(error));
+          dispatch(setFOILoader(false));
+        });
+    };
+  }
+
+  export const fetchOpenInfoExemptions = () => {
+    return (dispatch) => {
+      httpGETRequest(API.FOI_GET_OI_EXEMPTIONS, {}, UserService.getToken())
+        .then((res) => {
+          if (res.data) {
+            const oiExemptions = res.data;
+            oiExemptions.unshift({name: "Select Reason", oiexemptionid: 0, isactive: true})
+            dispatch(setOIExemptions(oiExemptions));
+            dispatch(setFOILoader(false));
+          } else {
+            console.log("Error while fetching OI exemptions master data", res);
+            dispatch(serviceActionError(res));
+            dispatch(setFOILoader(false));
+          }
+        })
+        .catch((error) => {
+          console.log("Error while fetching OI exemptions master data", error);
+          dispatch(serviceActionError(error));
+          dispatch(setFOILoader(false));
+        });
+    };
+  }
+
+  export const fetchOpenInfoStatuses = () => {
+    return (dispatch) => {
+      httpGETRequest(API.FOI_GET_OI_STATUSES, {}, UserService.getToken())
+        .then((res) => {
+          if (res.data) {
+            const oiStatuses = res.data;
+            dispatch(setOIStatuses(oiStatuses));
+            dispatch(setFOILoader(false));
+          } else {
+            console.log("Error while fetching OI statuses master data", res);
+            dispatch(serviceActionError(res));
+            dispatch(setFOILoader(false));
+          }
+        })
+        .catch((error) => {
+          console.log("Error while fetching OI statuses master data", error);
+          dispatch(serviceActionError(error));
+          dispatch(setFOILoader(false));
+        });
+    };
+  }
   export const fetchFOICommentTypes = () => {
     return (dispatch) => {
       httpGETRequest(API.FOI_GET_COMMENT_TYPES, {}, UserService.getToken())
@@ -716,4 +785,6 @@ import {
         });
     };
   };
-
+
+
+