From a049ba9cc021f8e1d927a076915a9caf68adaf38 Mon Sep 17 00:00:00 2001
From: Samuel Gerard <sggerard1997@gmail.com>
Date: Wed, 4 Dec 2024 10:57:22 -0800
Subject: [PATCH] [MDS-6281] Fix bootstrap accordions (#28)

---
 .github/workflows/pr-close.yml                |   3 +-
 .github/workflows/pr-validate.yml             |   1 +
 ...ative-penalties-tab-content.component.html |   4 +-
 ...ce-prosecutions-tab-content.component.html |   4 +-
 frontend/src/app/footer/footer.component.scss |   6 +-
 .../authorizations-tab-content.component.html |   2 +-
 .../compliance-tab-content.component.html     |   2 +-
 .../documents-tab-content.component.html      |   2 +-
 .../project-list/project-list.component.html  |   2 +-
 frontend/src/assets/styles/footer.scss        | 192 ------------------
 10 files changed, 15 insertions(+), 203 deletions(-)
 delete mode 100644 frontend/src/assets/styles/footer.scss

diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
index 172709b..3d3c4f6 100644
--- 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
\ No newline at end of file
+      packages: cms frontend
+      remove_pvc: data-${{ github.event.repository.name }}-${{ github.event.number }}-bitnamijpg-0
\ No newline at end of file
diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml
index 4f36f01..b460385 100644
--- 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/.pr-validate.yml@v0.8.2
     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/frontend/src/app/enforcement-actions/administrative-penalties-tab-content/administrative-penalties-tab-content.component.html b/frontend/src/app/enforcement-actions/administrative-penalties-tab-content/administrative-penalties-tab-content.component.html
index 4565bef..2eef006 100644
--- a/frontend/src/app/enforcement-actions/administrative-penalties-tab-content/administrative-penalties-tab-content.component.html
+++ b/frontend/src/app/enforcement-actions/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/frontend/src/app/enforcement-actions/offence-prosecutions-tab-content/offence-prosecutions-tab-content.component.html b/frontend/src/app/enforcement-actions/offence-prosecutions-tab-content/offence-prosecutions-tab-content.component.html
index 65813bc..e1aef3f 100644
--- a/frontend/src/app/enforcement-actions/offence-prosecutions-tab-content/offence-prosecutions-tab-content.component.html
+++ b/frontend/src/app/enforcement-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
index cc0306c..08f9cb3 100644
--- 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/frontend/src/app/projects/project-detail/authorizations/authorizations-tab-content.component.html b/frontend/src/app/projects/project-detail/authorizations/authorizations-tab-content.component.html
index 3ebee82..8da4947 100644
--- a/frontend/src/app/projects/project-detail/authorizations/authorizations-tab-content.component.html
+++ b/frontend/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
index ee7282f..8984583 100644
--- 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
index a63d186..02e4b47 100644
--- 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
index 671dddc..c0f0ba2 100644
--- 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
deleted file mode 100644
index 2891fa1..0000000
--- a/frontend/src/assets/styles/footer.scss
+++ /dev/null
@@ -1,192 +0,0 @@
-@import "../../assets/styles/base.scss";
-
-// hide the footer when a component (e.g. the map) is shown full screen
-.full-screen {
-    + footer {
-        &.app-footer {
-            display: none;
-        }
-    }
-}
-
-footer {
-    &.app-footer {
-        border-top: 4px solid $gold;
-        background: $footer-bg;
-        color: $footer-color;
-        text-align: center;
-
-        .container {
-            padding-top: 3rem;
-            padding-bottom: 1rem;
-        }
-
-        section {
-            margin-bottom: 2rem;
-            padding-bottom: 2rem;
-            border-bottom: 1px solid $bg-dark-border-color;
-
-            &.last {
-                margin-bottom: 0;
-                padding-bottom: 0;
-                border-bottom: none;
-            }
-        }
-
-        h4 {
-            margin-bottom: 1.25rem;
-            font-size: 1rem;
-            font-weight: 600;
-            color: #FFF;
-        }
-
-        h5 {
-            padding-top: 0.25rem;
-            font-size: 0.875rem;
-            font-weight: 600;
-            text-transform: uppercase;
-            opacity: 0.5;
-        }
-
-        p {
-            font-size: 0.875rem;
-            line-height: 1.5rem;
-        }
-
-        ul {
-            padding: 0;
-            font-size: 0.875rem;
-            list-style-type: none;
-
-            &.last {
-                margin-bottom: 0;
-            }
-
-            li {
-                margin-bottom: 0.25rem;
-            }
-        }
-
-        a {
-            color: #FFF;
-            text-decoration: none;
-
-            &:focus,
-            &:hover {
-                text-decoration: underline;
-                color: $gold;
-            }
-        }
-
-        a.submit {
-            color: #FFF;
-            &:focus,
-            &:hover {
-                color: #FFF;
-            }
-        }
-
-        .btn {
-            font-size: 0.875rem;
-            font-weight: 700;
-        }
-    }
-}
-
-@media (min-width: 560px) {
-    footer {
-        &.app-footer {
-            text-align: left;
-        }
-    }
-}
-
-@media (min-width: 768px) {
-    footer {
-        &.app-footer {
-            section {
-                margin-bottom: 0;
-                padding-bottom: 0;
-                border-bottom: none;
-            }
-
-            h4 {
-                padding-bottom: 1.25rem;
-                border-bottom: 1px solid $bg-dark-border-color;
-            }
-        }
-    }
-}
-
-.footer-admin {
-    margin-top: 2rem;
-    padding-top: 1.5rem;
-    border-top: 1px solid $bg-dark-border-color;
-    text-align: center;
-
-    .gov-links {
-        margin-top: 0;
-        margin-bottom: 1rem;
-        padding: 0;
-
-        li {
-            display: inline-block;
-            margin: 0;
-            line-height: 1rem;
-
-            &:after {
-                position: relative;
-                top: -1px;
-                display: inline-block;
-                margin-left: 0.5rem;
-                margin-right: 0.25rem;
-                content: '|';
-            }
-
-            &:last-child {
-                &:after {
-                    display: none;
-                }
-            }
-        }
-    }
-
-    .connect-links {
-        margin-top: -0.5rem;
-        margin-bottom: 0;
-
-        li {
-            margin: 0.25rem;
-            display: inline-block;
-
-            img {
-                width: 2rem;
-                height: 2rem;
-            }
-        }
-    }
-}
-
-@media (min-width: 760px) {
-    .footer-admin {
-        margin-top: 3rem;
-
-        .gov-links {
-            float: left;
-            margin-bottom: 0;
-        }
-
-        .connect-links {
-            margin-right: 3.5rem;
-            float: right;
-        }
-    }
-}
-
-@media (min-width: 1200px) {
-    .footer-admin {
-        .connect-links {
-            margin-right: 0;
-        }
-    }
-}