From fcabea0ac5b5a42625c1cf1bc18184c31b5c3cae Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 10 Apr 2024 21:31:21 +0200
Subject: [PATCH] Hide the reset filters button on the home page & fixed
 spacing issue when showDiscoverFilters is disabled

---
 src/app/home-page/home-page.component.html                 | 4 ++--
 .../search/search-filters/search-filters.component.html    | 4 +++-
 src/app/shared/sidebar/page-with-sidebar.component.html    | 3 ++-
 src/app/shared/sidebar/page-with-sidebar.component.ts      | 7 ++++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html
index 44a86b0e0e..18925edbd7 100644
--- a/src/app/home-page/home-page.component.html
+++ b/src/app/home-page/home-page.component.html
@@ -1,8 +1,8 @@
 <ds-themed-home-news></ds-themed-home-news>
 <div [ngClass]="showDiscoverFilters ? 'container-fluid' : 'container'">
-  <ds-page-with-sidebar [sidebarContent]="sidebar" [sideBarWidth]="3" [class]="showDiscoverFilters ? 'row mx-3' : ''">
+  <ds-page-with-sidebar [sidebarContent]="sidebar" [sideBarWidth]="showDiscoverFilters ? 3 : 0" [class]="showDiscoverFilters ? 'row mx-3' : ''">
     <div [class.col-sm-12]="showDiscoverFilters">
-      <button *ngIf="(isXsOrSm$ | async) && sidebarService.isCollapsed" (click)="sidebarService.expand()"
+      <button *ngIf="showDiscoverFilters && (isXsOrSm$ | async) && sidebarService.isCollapsed" (click)="sidebarService.expand()"
               class="btn btn-outline-primary d-block ml-auto mb-3">
         <i class="fas fa-sliders"></i> {{ 'search.sidebar.open' | translate }}
       </button>
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index 3f70a759bc..695299686d 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -7,4 +7,6 @@
 </div>
 <ds-advanced-search *ngIf="appConfig.search.advancedFilters.enabled"
     [inPlaceSearch]="inPlaceSearch"></ds-advanced-search>
-<a class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a>
+<a *ngIf="inPlaceSearch" class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button">
+  <i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}
+</a>
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.html b/src/app/shared/sidebar/page-with-sidebar.component.html
index 853258e6dd..42f1b53819 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.html
+++ b/src/app/shared/sidebar/page-with-sidebar.component.html
@@ -2,12 +2,13 @@
   <div class="row">
     <div class="row-with-sidebar row-offcanvas row-offcanvas-left"
          [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
-      <div id="{{id}}-sidebar-content"
+      <div *ngIf="sideBarWidth > 0" id="{{id}}-sidebar-content"
            [class.invisible]="(isSidebarCollapsed$ | async) === true && (isXsOrSm$ | async) === true"
            class="col-12 col-md-{{sideBarWidth}} sidebar-content {{sidebarClasses | async}}">
         <ng-container *ngTemplateOutlet="sidebarContent"></ng-container>
       </div>
       <div class="col-12 col-md-{{12 - sideBarWidth}}"
+           [class.px-0]="sideBarWidth === 0"
            [class.invisible]="(isSidebarCollapsed$ | async) !== true && (isXsOrSm$ | async) === true">
         <ng-content></ng-content>
       </div>
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.ts b/src/app/shared/sidebar/page-with-sidebar.component.ts
index b53193d10e..d806c37f61 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.ts
@@ -1,5 +1,6 @@
 import {
   AsyncPipe,
+  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -21,7 +22,11 @@ import { SidebarService } from './sidebar.service';
   templateUrl: './page-with-sidebar.component.html',
   animations: [pushInOut],
   standalone: true,
-  imports: [NgTemplateOutlet, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    NgTemplateOutlet,
+    NgIf,
+  ],
 })
 /**
  * This component takes care of displaying the sidebar properly on all viewports. It does not