facets: fix date range facet

* Removes some useless styling classNames. * Fixes known date filters parameters. Co-authored-by: Renaud Michotte <renaud.michotte@gmail.com>
rero · Jun 10, 2022 · d159279 · d159279
1 parent 0e0b808
commit d159279
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/projects/rero/ng-core/src/lib/record/search/aggregation/date-range/date-range.component.html b/projects/rero/ng-core/src/lib/record/search/aggregation/date-range/date-range.component.html
@@ -16,21 +16,19 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<div class="row mt-3">
-    <div class="col-12 form-group">
-        <div class="input-group">
-            <div class="input-group-prepend">
-                <span class="input-group-text"><i class="fa fa-calendar"></i></span>
-            </div>
-            <input class="form-control"
-                   [(ngModel)]="dateRangeModel"
-                   [bsValue]="dateRangeModel"
-                   [bsConfig]="bsConfig"
-                   bsDaterangepicker>
+<div class="form-group">
+    <div class="input-group">
+        <div class="input-group-prepend">
+            <span class="input-group-text"><i class="fa fa-calendar"></i></span>
         </div>
+        <input class="form-control"
+               [(ngModel)]="dateRangeModel"
+               [bsValue]="dateRangeModel"
+               [bsConfig]="bsConfig"
+               bsDaterangepicker>
     </div>
 </div>
-<div class="text-center mt-2">
+<div class="text-center">
     <small>
         <a href class="mx-3" (click)="$event.preventDefault(); updateFilter()" translate>Filter</a>
         <a href class="mx-3" (click)="$event.preventDefault(); clearFilter()" *ngIf="hasQueryParam" translate>Clear filter</a>

diff --git a/projects/rero/ng-core/src/lib/record/search/aggregation/date-range/date-range.component.ts b/projects/rero/ng-core/src/lib/record/search/aggregation/date-range/date-range.component.ts
@@ -91,16 +91,11 @@ export class AggregationDateRangeComponent implements OnInit, OnDestroy {
       if (!filters) {
         return;
       }
-      let filter = filters.find((element: any) => element.key === this.key);
-      if (filter) {
-        filter = filter.values[0].split('--').map((item: string) => {
-          return new Date(+item);
-        });
-        this.hasQueryParam = true;
-        this.dateRangeModel = filter;
-      } else {
-        this.dateRangeModel = [];
-      }
+      const filter = filters.find((element: any) => element.key === this.key);
+      this.hasQueryParam = filter !== undefined;
+      this.dateRangeModel = (filter)
+        ? filter.values[0].split('--').map((item: string) => new Date(+item))  // split filter data and transform each part into Date
+        : [];
     });
   }