From 8cc07f5816d1d183779f7739e55cdc8c68d30f56 Mon Sep 17 00:00:00 2001
From: bbcodrin <bobucodrin@gmail.com>
Date: Wed, 27 Jun 2018 11:38:57 +0300
Subject: [PATCH] [ADF-3238] content size min error added (#3532)

* content size min error added

* clean code
---
 .../search-number-range/search-number-range.component.html  | 4 ++--
 .../search-number-range.component.spec.ts                   | 6 ++++++
 .../search-number-range/search-number-range.component.ts    | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/content-services/search/components/search-number-range/search-number-range.component.html b/lib/content-services/search/components/search-number-range/search-number-range.component.html
index a6f47f8688..a747d767e2 100644
--- a/lib/content-services/search/components/search-number-range/search-number-range.component.html
+++ b/lib/content-services/search/components/search-number-range/search-number-range.component.html
@@ -5,7 +5,7 @@
             matInput [formControl]="from" [errorStateMatcher]="matcher"
             placeholder="{{ 'SEARCH.FILTER.RANGE.FROM' | translate }}"
             autocomplete="off">
-        <mat-error *ngIf="from.hasError('pattern')">
+        <mat-error *ngIf="from.hasError('pattern') || from.hasError('min')">
             {{ 'SEARCH.FILTER.VALIDATION.INVALID-FORMAT' | translate }}
         </mat-error>
         <mat-error *ngIf="from.hasError('required')">
@@ -18,7 +18,7 @@
             matInput [formControl]="to" [errorStateMatcher]="matcher"
             placeholder="{{ 'SEARCH.FILTER.RANGE.TO' | translate }}"
             autocomplete="off">
-        <mat-error *ngIf="to.hasError('pattern')">
+        <mat-error *ngIf="to.hasError('pattern') || to.hasError('min')">
             {{ 'SEARCH.FILTER.VALIDATION.INVALID-FORMAT' | translate }}
         </mat-error>
         <mat-error *ngIf="to.hasError('required')">
diff --git a/lib/content-services/search/components/search-number-range/search-number-range.component.spec.ts b/lib/content-services/search/components/search-number-range/search-number-range.component.spec.ts
index defa51af13..68399f33f7 100644
--- a/lib/content-services/search/components/search-number-range/search-number-range.component.spec.ts
+++ b/lib/content-services/search/components/search-number-range/search-number-range.component.spec.ts
@@ -160,4 +160,10 @@ describe('SearchNumberRangeComponent', () => {
         component.from = new FormControl(123, component.validators);
         expect(component.from.hasError('required')).toBe(false);
     });
+
+    it('should throw error if "from" value is a negative value', () => {
+        component.ngOnInit();
+        component.from = new FormControl(-100, component.validators);
+        expect(component.from.hasError('min')).toBe(true);
+    });
 });
diff --git a/lib/content-services/search/components/search-number-range/search-number-range.component.ts b/lib/content-services/search/components/search-number-range/search-number-range.component.ts
index c6f754a2c0..1c79cccdc1 100644
--- a/lib/content-services/search/components/search-number-range/search-number-range.component.ts
+++ b/lib/content-services/search/components/search-number-range/search-number-range.component.ts
@@ -55,7 +55,8 @@ export class SearchNumberRangeComponent implements SearchWidget, OnInit {
 
         this.validators = Validators.compose([
             Validators.required,
-            Validators.pattern(/^-?(0|[1-9]\d*)?$/)
+            Validators.pattern(/^-?(0|[1-9]\d*)?$/),
+            Validators.min(0)
         ]);
 
         this.from = new FormControl('', this.validators);
@@ -78,9 +79,8 @@ export class SearchNumberRangeComponent implements SearchWidget, OnInit {
             map.set('TO', model.to);
 
             const value = this.formatString(this.format, map);
-            const query = `${this.field}:${value}`;
 
-            this.context.queryFragments[this.id] = query;
+            this.context.queryFragments[this.id] = `${this.field}:${value}`;
             this.context.update();
         }
     }