Merge pull request #280 from Alfresco/dev-wabson-195

Prevent error message when not enough alphanum characters in term

ng2-components/ng2-alfresco-search/src/components/alfresco-search-control.component.ts

@@ -19,6 +19,7 @@ import { Control, Validators } from '@angular/common';
 import { Component, Input, Output, ElementRef, EventEmitter, AfterViewInit, ViewChild } from '@angular/core';
 import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core';
 import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component';
+import { SearchTermValidator } from './../forms/search-term-validator';
 
 declare let __moduleName: string;
 declare var componentHandler: any;
@@ -71,7 +72,7 @@ export class AlfrescoSearchControlComponent implements AfterViewInit {
 
         this.searchControl = new Control(
             this.searchTerm,
-            Validators.compose([Validators.required, Validators.minLength(3)])
+            Validators.compose([Validators.required, SearchTermValidator.minAlphanumericChars(3)])
         );
 
         this.searchControl.valueChanges.map(value => this.searchControl.valid ? value : '')

ng2-components/ng2-alfresco-search/src/forms/search-term-validator.spec.ts

@@ -0,0 +1,44 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Control } from '@angular/common';
+import { SearchTermValidator } from './search-term-validator';
+
+describe('Search term validator', () => {
+
+    it('should pass validation for a value with the specified required number of alphanumeric characters', () => {
+        const control = new Control('ab', SearchTermValidator.minAlphanumericChars(2));
+        expect(control.valid).toBe(true);
+    });
+
+    it('should pass validation for a value with more than the specified required number of alphanumeric characters', () => {
+        const control = new Control('abc', SearchTermValidator.minAlphanumericChars(2));
+        expect(control.valid).toBe(true);
+    });
+
+    it('should fail validation for a value with less than the specified required number of alphanumeric characters', () => {
+        const control = new Control('a', SearchTermValidator.minAlphanumericChars(2));
+        expect(control.valid).toBe(false);
+    });
+
+    /* tslint:disable:max-line-length */
+    it('should fail validation for a value with less than the specified required number of alphanumeric characters but with other non-alphanumeric characters', () => {
+        const control = new Control('a ._-?b', SearchTermValidator.minAlphanumericChars(3));
+        expect(control.valid).toBe(false);
+    });
+
+});

ng2-components/ng2-alfresco-search/src/forms/search-term-validator.ts

@@ -0,0 +1,30 @@
+/*!
+ * @license
+ * Copyright 2016 Alfresco Software, Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Control } from '@angular/common';
+
+export class SearchTermValidator {
+
+    static minAlphanumericChars(minChars: number) {
+        return (control: Control) => {
+            return ('' + control.value).replace(/[^0-9a-zA-Z]+/g, '').length >= minChars ? null : {
+                hasMinAlphanumericChars: false
+            };
+        };
+    }
+
+}