From adcb0e84f8e811a01a2339d523c6ea3341bef0ce Mon Sep 17 00:00:00 2001
From: sboursen-scinote <soufiane@scinote.net>
Date: Thu, 26 Jan 2023 08:41:33 +0100
Subject: [PATCH] Add close button [SCI-7585]

---
 app/assets/stylesheets/repository/filters.scss      | 2 +-
 app/javascript/packs/vue/repository_filter.js       | 3 +++
 app/javascript/vue/repository_filter/container.vue  | 3 +++
 app/views/repositories/_repository_filters.html.erb | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/repository/filters.scss b/app/assets/stylesheets/repository/filters.scss
index c1819ff52..89418de3a 100644
--- a/app/assets/stylesheets/repository/filters.scss
+++ b/app/assets/stylesheets/repository/filters.scss
@@ -278,7 +278,7 @@
 
         .clear-filters-btn {
           margin-left: 0;
-          margin-top: 0.5em;
+          margin-top: .5em;
           padding-left: 38px;
           padding-right: 38px;
         }
diff --git a/app/javascript/packs/vue/repository_filter.js b/app/javascript/packs/vue/repository_filter.js
index 732fcaf2a..a05fbaab3 100644
--- a/app/javascript/packs/vue/repository_filter.js
+++ b/app/javascript/packs/vue/repository_filter.js
@@ -131,6 +131,9 @@ window.initRepositoryFilter = () => {
       },
       updateCurrentFilterName(name) {
         this.filterName = name;
+      },
+      hideModal() {
+        $('#filtersDropdownButton').removeClass('open');
       }
     }
   });
diff --git a/app/javascript/vue/repository_filter/container.vue b/app/javascript/vue/repository_filter/container.vue
index 5eca8482a..0c435c438 100644
--- a/app/javascript/vue/repository_filter/container.vue
+++ b/app/javascript/vue/repository_filter/container.vue
@@ -19,6 +19,9 @@
           />
         </div>
       </div>
+      <button type="button" class="close" @click="$emit('hide-modal')" aria-label="<%= t('general.close') %>">
+        <span aria-hidden="true">&times;</span>
+      </button>
     </div>
     <FiltersList 
       :filters="filters" 
diff --git a/app/views/repositories/_repository_filters.html.erb b/app/views/repositories/_repository_filters.html.erb
index de1668c0f..e7068ba2f 100644
--- a/app/views/repositories/_repository_filters.html.erb
+++ b/app/views/repositories/_repository_filters.html.erb
@@ -33,6 +33,7 @@
           @filters:apply="applyFilters"
           @filters:clear="clearFilters"
           @filters:update="updateFilters"
+          @hide-modal="hideModal"
         />
       </div>
     </div>