Merge pull request #4766 from bcgov/dev-marshal-MD-4689

Merge dev changes/updates to test-marshal
bcgov · Nov 22, 2023 · d320a67 · d320a67
2 parents 724d628 + 88773a2
commit d320a67
Show file tree

Hide file tree

Showing 25 changed files with 1,486 additions and 801 deletions.
diff --git a/.github/workflows/katalon-ci.yaml b/.github/workflows/katalon-ci.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3.0
+      uses: actions/checkout@v2
       with:
         ref: dev-automationscripts
     - name: set screen resolution
@@ -35,9 +35,9 @@ jobs:
             dir
       shell: cmd
     - name: Katalon Studio Github Action
-      uses: katalon-studio/katalon-studio-github-action@v3.0
+      uses: katalon-studio/katalon-studio-github-action@v2
       with:
-          version: '8.2.0'
+          version: '8.6.6'
           projectPath: '${{ github.workspace }}/testing/foi-qa-automation/foi-qa-automation.prj'
           args: '-noSplash -retry=0  -testSuiteCollectionPath="Test Suites/foi-test" -apiKey=${{ secrets.KATALON_API_KEY }} --config -webui.autoUpdateDrivers=true -licenseRelease=true -browserType="Chrome" -proxy.auth.option=NO_PROXY -proxy.system.option=NO_PROXY -proxy.system.applyToDesiredCapabilities=true -executionProfile="dev" '
     - name: copy reports to one folder
@@ -50,15 +50,15 @@ jobs:
             dir
       shell: cmd
     - name: Setup Node.js
-      uses: actions/setup-node@v3.0
+      uses: actions/setup-node@v2
       with:
-        node-version: '14'
+        node-version: '16'
     - name: Create collection report    
       run: |
             npm i -g xunit-viewer
             xunit-viewer -r  artifacts\JUnit_Report.xml -o artifacts\foi-test.html
     - name: Archive Katalon report
-      uses: actions/upload-artifact@v3.0
+      uses: actions/upload-artifact@v2
       with:
         name: katalon-report
         path: artifacts

diff --git a/.gitignore b/.gitignore
@@ -19,7 +19,6 @@ request-management-api/request_api/models/__pycache__/*.*
 request-management-api/migrations/__pycache__/*.*
 request-management-api/.env
 notification-manager/env/*
-
 *.pyc
 */__pycache__/*
 request-management-api/request_api/__pycache__/*.pyc

diff --git a/.sonarcloud.properties b/.sonarcloud.properties
@@ -1,10 +1,9 @@
 sonar.projectName=foi-flow
 
 # Path to sources
-sonar.sources=request-management-api/,apps/forms-flow-ai/forms-flow-bpm,apps/forms-flow-ai/forms-flow-web
-sonar.exclusions=**/*.test.js,request-management-api/migrations/versions/*,request-management-api/tests/**/*
+#sonar.sources=request-management-api/request_api,apps/forms-flow-ai/forms-flow-bpm,forms-flow-web/src,notification-manager
+sonar.exclusions=**/*.test.js,request-management-api/migrations/versions,request-management-api/tests
 #sonar.inclusions=
-
 # Path to tests
 # sonar.tests=
 #sonar.test.exclusions=
@@ -14,4 +13,4 @@ sonar.exclusions=**/*.test.js,request-management-api/migrations/versions/*,reque
 sonar.sourceEncoding=UTF-8
 
 # Exclusions for copy-paste detection
-sonar.cpd.exclusions=**/*.test.js,request-management-api/migrations/versions/*,request-management-api/tests/**/*
+sonar.cpd.exclusions=**/*.test.js,request-management-api/migrations/versions,request-management-api/tests
diff --git a/forms-flow-web/src/components/FOI/FOIRequest/BottomButtonGroup/index.js b/forms-flow-web/src/components/FOI/FOIRequest/BottomButtonGroup/index.js
@@ -350,7 +350,7 @@ const BottomButtonGroup = React.memo(
           case StateEnum.readytoscan.name:
           case StateEnum.peerreview.name:
           case StateEnum.section5pending.name:
-          case StateEnum.onholdapplicationfee.name:
+          case StateEnum.appfeeowing.name:
             const status = Object.values(StateEnum).find(
               (statusValue) => statusValue.name === currentSelectedStatus
             );

diff --git a/forms-flow-web/src/components/FOI/FOIRequest/FOIRequest.js b/forms-flow-web/src/components/FOI/FOIRequest/FOIRequest.js
@@ -875,10 +875,9 @@ const FOIRequest = React.memo(({ userDetail }) => {
       requestState !== StateEnum.intakeinprogress.name &&
       requestState !== StateEnum.unopened.name &&
       requestState !== StateEnum.open.name &&
-      requestDetails?.requestType ===
-        FOI_COMPONENT_CONSTANTS.REQUEST_TYPE_GENERAL
-    );
-  };
+      requestState !== StateEnum.appfeeowing.name &&
+      requestDetails?.requestType === FOI_COMPONENT_CONSTANTS.REQUEST_TYPE_GENERAL)
+  }
 
   return (!isLoading &&
     requestDetails &&

diff --git a/...-flow-web/src/components/FOI/FOIRequest/MinistryReview/MinistryReviewTabbedContainer.scss b/...-flow-web/src/components/FOI/FOIRequest/MinistryReview/MinistryReviewTabbedContainer.scss
@@ -149,7 +149,7 @@
   }
 
   .foitabheadercollection {
-    width: fit-content;
+    width: 200px;
     // height: calc(100% - 96px - 67px);
     // height: 100%;
     border-radius: 0px 30px 30px 0px!important;

diff --git a/forms-flow-web/src/components/FOI/FOIRequest/TabbedContainer.scss b/forms-flow-web/src/components/FOI/FOIRequest/TabbedContainer.scss
@@ -49,7 +49,7 @@
   }
 
   .foitabheadercollection {
-    width: fit-content;
+    width: 200px;
     // height: calc(100% - 96px - 67px);
     // height: 100%;
     border-radius: 0px 30px 30px 0px!important;
@@ -69,7 +69,7 @@
     background-color: #C45303;
   }
 
-  .foitabheaderIntakeInProgressBG, .foitabheaderOnHoldApplicationFeeBG, .foitabheaderSection5Pending {
+  .foitabheaderIntakeInProgressBG, .foitabheaderAppFeeOwingBG, .foitabheaderSection5Pending {
     background-color: #8C3601;
   }
 

diff --git a/forms-flow-web/src/components/FOI/FOIRequest/utils.js b/forms-flow-web/src/components/FOI/FOIRequest/utils.js
@@ -135,8 +135,8 @@ export const getTabBG = (_tabStatus, _requestState) => {
         return "foitabheadercollection foitabheaderReadytoScanBG";
     case StateEnum.section5pending.name:
       return "foitabheadercollection foitabheaderSection5Pending";            
-    case StateEnum.onholdapplicationfee.name:
-        return "foitabheadercollection foitabheaderOnHoldApplicationFeeBG";
+    case StateEnum.appfeeowing.name:
+        return "foitabheadercollection foitabheaderAppFeeOwingBG";
 
     default:
       return "foitabheadercollection foitabheaderdefaultBG";

diff --git a/forms-flow-web/src/components/FOI/Header/FOIHeader.js b/forms-flow-web/src/components/FOI/Header/FOIHeader.js
@@ -141,7 +141,7 @@ const adminDashboard = (_e) => {
                         </li>
                       }
                       <li className="help-icon foinavitem">
-                        <a href={"https://help.foirequests.gov.bc.ca/"} target="_blank" aria-label="foi-help link">
+                        <a href={"https://help.foirequests.gov.bc.ca/help-articles"} target="_blank" aria-label="foi-help link">
                           <HelpOutlineIcon style={{fontSize: "21px", color: "white", textDecoration: "none", cursor: "pointer"}} />
                         </a>
                       </li>