Merge pull request #5622 from bcgov/main

16.0 Main to Dev

Author: JieunSon96

.github/workflows/request-management-api-cd.yml

@@ -25,10 +25,15 @@ env:
 
 jobs:
   request-management-api-cd-by-push:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     if: github.event_name == 'push' && github.repository == 'bcgov/foi-flow'
     steps:
+      - name: Install oc
+        uses: redhat-actions/oc-installer@v1
+        with:
+          oc_version: '4.6'
+
       - uses: actions/checkout@v2
       - name: Set ENV variables
         id: set-variable

forms-flow-web/src/components/FOI/FOIRequest/AxisDetails/AxisDetails.js

@@ -73,6 +73,8 @@ const AxisDetails = React.memo(({
           updateValidation(helperText);
           if (isValid) {
             checkDuplicatedAxisID(inputValue);
+          }else {
+            handleAxisDetailsValue("", FOI_COMPONENT_CONSTANTS.AXIS_REQUEST_ID); 
           }
       } else {
         updateValidation("");
@@ -90,6 +92,7 @@ const AxisDetails = React.memo(({
         if (!err) {
           if (data && data.indexOf("Axis Id exists") >= 0) {
             updateValidation("Request already exists");
+            handleAxisDetailsValue("", FOI_COMPONENT_CONSTANTS.AXIS_REQUEST_ID);
           } else {
             updateValidation("");
             handleAxisDetailsValue(inputValue, FOI_COMPONENT_CONSTANTS.AXIS_REQUEST_ID);
@@ -100,7 +103,7 @@ const AxisDetails = React.memo(({
           updateValidation("Error checking request ID");
         }
       }));
-    }, 500);
+    }, 300);
 
     const syncWithAxis = () => {
         dispatch(checkDuplicateAndFetchRequestDataFromAxis(axisRequestId, false, saveRequestObject,(err, data) => {

forms-flow-web/src/components/FOI/FOIRequest/MinistryReview/RequestHeader.js

@@ -115,6 +115,7 @@ const RequestHeader = React.memo(({
               type="consult"
               requestDetails={requestDetails}
               isActive={requestDetails.isconsultflag}
+              showFlag={requestDetails.isconsultflag === true}
               isDisabled={true}
             />
             {/* <RequestFlag

request-management-api/request_api/services/__init__.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 """Exposes all of the Services used in the API."""
 
-from .fee_service import FeeService
+from .fee_service import FeeService