[MDS-6281] Fix bootstrap accordions (#28)

bcgov · Dec 4, 2024 · a049ba9 · a049ba9
1 parent 4b3dae9
commit a049ba9
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 203 deletions.
diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
@@ -18,4 +18,5 @@ jobs:
       oc_token: ${{ secrets.OC_TOKEN }}
     with:
       cleanup: helm
-      packages: cms frontend
+      packages: cms frontend
+      remove_pvc: data-${{ github.event.repository.name }}-${{ github.event.number }}-bitnamijpg-0
diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
@@ -14,6 +14,7 @@ jobs:
     if: (! github.event.pull_request.draft)
     uses: bcgov/quickstart-openshift-helpers/.github/workflows/[email protected]
     with:
+      conventional_commits: false
       markdown_links: |
         - [Frontend](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.silver.devops.gov.bc.ca)
         - [CMS](https://${{ github.event.repository.name }}-${{ github.event.number }}-frontend.apps.silver.devops.gov.bc.ca/api)

diff --git a/.../administrative-penalties-tab-content/administrative-penalties-tab-content.component.html b/.../administrative-penalties-tab-content/administrative-penalties-tab-content.component.html
@@ -23,14 +23,14 @@
           <div class="accordion__collapse-header" id="accordHead" role="tab">
             <a
               class="accordion__collapse-header--column toggle collapsed"
-              data-toggle="collapse"
+              data-bs-toggle="collapse"
               href="#accordCollapse{{ item._id }}"
             >
               <i class="material-icons open-icon">add</i>
               <i class="material-icons close-icon">remove</i>
             </a>
             <span class="accordion__collapse-header--column enforcements-table__name-col">
-              <a data-toggle="collapse" href="#accordCollapse{{ item._id }}">
+              <a data-bs-toggle="collapse" href="#accordCollapse{{ item._id }}">
                 {{ item.issuedTo ? item.issuedTo : 'N/A' }}
               </a>
             </span>

diff --git a/...-actions/offence-prosecutions-tab-content/offence-prosecutions-tab-content.component.html b/...-actions/offence-prosecutions-tab-content/offence-prosecutions-tab-content.component.html
@@ -25,14 +25,14 @@
           <div class="accordion__collapse-header" id="accordHead" role="tab">
             <a
               class="accordion__collapse-header--column toggle collapsed"
-              data-toggle="collapse"
+              data-bs-toggle="collapse"
               href="#accordCollapse{{ item._id }}"
             >
               <i class="material-icons open-icon">add</i>
               <i class="material-icons close-icon">remove</i>
             </a>
             <span class="accordion__collapse-header--column enforcements-table__name-col">
-              <a data-toggle="collapse" href="#accordCollapse{{ item._id }}">
+              <a data-bs-toggle="collapse" href="#accordCollapse{{ item._id }}">
                 {{ item.issuedTo ? item.issuedTo : 'N/A' }}
               </a>
             </span>

diff --git a/frontend/src/app/footer/footer.component.scss b/frontend/src/app/footer/footer.component.scss
@@ -3,8 +3,10 @@
 
 // Hide the footer when a component (e.g., the map) is shown full screen
 .full-screen {
-    footer.app-footer {
-        display: none;
+    + app-footer {
+        .app-footer {
+            display: none;
+        }
     }
 }
 

diff --git a/.../src/app/projects/project-detail/authorizations/authorizations-tab-content.component.html b/.../src/app/projects/project-detail/authorizations/authorizations-tab-content.component.html
@@ -17,7 +17,7 @@ <h3>{{agency.act}} <span>{{agency.name}}</span></h3>
       <div class="accordion authorizations-list" id="{{agency.htmlId}}" role="tablist" aria-multiselectable="false">
         <div class="accordion__collapse-item" *ngFor="let c of collections[agency.id].items">
           <div class="accordion__collapse-header" role="tab" id="heading-{{c._id}}">
-            <a class="accordion__collapse-header--column toggle collapsed" data-ng-if="c.documents" data-toggle="collapse" href="#collapse-{{c._id}}"
+            <a class="accordion__collapse-header--column toggle collapsed" data-ng-if="c.documents" data-bs-toggle="collapse" href="#collapse-{{c._id}}"
               aria-expanded="true" aria-controls="collapseOne">
               <i class="material-icons open-icon">add</i>
               <i class="material-icons close-icon">remove</i>

diff --git a/frontend/src/app/projects/project-detail/compliance/compliance-tab-content.component.html b/frontend/src/app/projects/project-detail/compliance/compliance-tab-content.component.html
@@ -52,7 +52,7 @@ <h3>Inspections &amp; Orders</h3>
         <div class="accordion mt-0">
           <div class="accordion__collapse-item" *ngFor="let c of collections.items | orderBy: {property: sortField, direction: sortDirection}">
             <div class="accordion__collapse-header" role="tab" id="heading-{{c._id}}">
-              <a class="accordion__collapse-header--column toggle collapsed" data-toggle="collapse" href="#collapse-{{c._id}}" aria-expanded="true" aria-controls="collapseOne">
+              <a class="accordion__collapse-header--column toggle collapsed" data-bs-toggle="collapse" href="#collapse-{{c._id}}" aria-expanded="true" aria-controls="collapseOne">
                 <i class="material-icons open-icon">add</i>
                 <i class="material-icons close-icon">remove</i>
               </a>

diff --git a/frontend/src/app/projects/project-detail/documents/documents-tab-content.component.html b/frontend/src/app/projects/project-detail/documents/documents-tab-content.component.html
@@ -38,7 +38,7 @@
 
         <div class="accordion__collapse-item" *ngFor="let item of collections.items | orderBy: {property: sortField, direction: sortDirection}">
           <div class="accordion__collapse-header" role="tab" id="heading-{{item._id}}">
-            <a class="accordion__collapse-header--column toggle collapsed" data-toggle="collapse" href="#collapse-{{item._id}}" aria-expanded="true" aria-controls="collapseOne">
+            <a class="accordion__collapse-header--column toggle collapsed" data-bs-toggle="collapse" href="#collapse-{{item._id}}" aria-expanded="true" aria-controls="collapseOne">
               <i class="material-icons open-icon">add</i>
               <i class="material-icons close-icon">remove</i>
             </a>

diff --git a/frontend/src/app/projects/project-list/project-list.component.html b/frontend/src/app/projects/project-list/project-list.component.html
@@ -89,7 +89,7 @@ <h2>Major Mines in British Columbia</h2>
           <tr *ngFor="let item of projects | objectFilter: filter | operatorFilter: operatorfilter | projectTypeFilter: typefilter | orderBy: {property: column, direction: direction} | paginate: pagination">
             <td class="accordion__collapse-item p-0" colspan="4">
               <div class="accordion__collapse-header" id="accordHead" role="tab">
-                <a class="accordion__collapse-header--column toggle collapsed" data-toggle="collapse" href="#accordCollapse{{item._id}}">
+                <a class="accordion__collapse-header--column toggle collapsed" data-bs-toggle="collapse" href="#accordCollapse{{item._id}}">
                   <i class="material-icons open-icon">add</i>
                   <i class="material-icons close-icon">remove</i>
                 </a>

diff --git a/frontend/src/assets/styles/footer.scss b/frontend/src/assets/styles/footer.scss