diff --git a/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
index 4107ebfd3..7af0c8b0d 100644
--- a/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
+++ b/ui/src/app/schema-form/widget/filter-target/filter-target.component.ts
@@ -2,8 +2,8 @@ import { Component, OnDestroy, AfterViewInit } from '@angular/core';
import { FormControl, Validators, AbstractControl, ValidatorFn } from '@angular/forms';
import { ObjectWidget } from 'ngx-schema-form';
import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, skipWhile, map } from 'rxjs/operators';
+import { Observable, Subject } from 'rxjs';
+import { distinctUntilChanged, skipWhile, takeUntil, map } from 'rxjs/operators';
import * as fromRoot from '../../../app.reducer';
import * as fromFilters from '../../../metadata/filter/reducer';
@@ -17,7 +17,7 @@ import { QueryEntityIds, ClearSearch } from '../../../metadata/filter/action/sea
styleUrls: ['./filter-target.component.scss']
})
export class FilterTargetComponent extends ObjectWidget implements OnDestroy, AfterViewInit {
-
+ private ngUnsubscribe: Subject
= new Subject();
ids$: Observable;
ids: string[];
@@ -32,6 +32,9 @@ export class FilterTargetComponent extends ObjectWidget implements OnDestroy, Af
[Validators.required]
);
+ errors$: Observable;
+ hasErrors$: Observable;
+
constructor(
private store: Store
) {
@@ -42,6 +45,7 @@ export class FilterTargetComponent extends ObjectWidget implements OnDestroy, Af
this.search
.valueChanges
.pipe(
+ takeUntil(this.ngUnsubscribe),
distinctUntilChanged()
)
.subscribe(query => this.searchEntityIds(query));
@@ -49,6 +53,7 @@ export class FilterTargetComponent extends ObjectWidget implements OnDestroy, Af
this.script
.valueChanges
.pipe(
+ takeUntil(this.ngUnsubscribe),
distinctUntilChanged(),
skipWhile(() => this.targetType === 'ENTITY')
)
@@ -61,6 +66,31 @@ export class FilterTargetComponent extends ObjectWidget implements OnDestroy, Af
super.ngAfterViewInit();
this.script.setValue(this.targets[0]);
this.search.setValidators(this.unique());
+
+ this.errors$ = this.formProperty.errorsChanges.pipe(
+ map(errors =>
+ errors && errors.length > 1 ?
+ Array
+ .from(new Set(errors.filter(e => e.code !== 'ARRAY_LENGTH_SHORT').map(e => e.code)))
+ .map(id => ({ ...errors.find(e => e.code === id) }))
+ : []
+ ));
+
+ this.errors$
+ .pipe(
+ takeUntil(this.ngUnsubscribe),
+ map(errors => errors.reduce((collection, e) => ({ ...collection, [e.code]: e.message }), {})),
+ map(errors => Object.keys(errors).length > 0 ? errors : null)
+ )
+ .subscribe(errors => this.script.setErrors(
+ errors,
+ {
+ emitEvent: true
+ }
+ )
+ );
+
+ this.hasErrors$ = this.errors$.pipe(map(e => e && e.length > 0));
}
unique(): ValidatorFn {
@@ -138,5 +168,7 @@ export class FilterTargetComponent extends ObjectWidget implements OnDestroy, Af
ngOnDestroy(): void {
this.store.dispatch(new ClearSearch());
+ this.ngUnsubscribe.next();
+ this.ngUnsubscribe.complete();
}
}
diff --git a/ui/src/app/shared/memo.spec.ts b/ui/src/app/shared/memo.spec.ts
new file mode 100644
index 000000000..01fcd9898
--- /dev/null
+++ b/ui/src/app/shared/memo.spec.ts
@@ -0,0 +1,21 @@
+import { memoize } from './memo';
+
+const fns = {
+ square(n) {
+ return n * n;
+ }
+};
+
+describe('memoize function', () => {
+ it('should return a memoized function', () => {
+ spyOn(fns, 'square').and.callThrough();
+ const memoized = memoize(fns.square);
+ const call1 = memoized(1);
+ const call2 = memoized(2);
+ const call3 = memoized(2);
+ expect(call1).toBe(1);
+ expect(call2).toBe(4);
+ expect(call3).toBe(4);
+ expect(fns.square).toHaveBeenCalledTimes(2);
+ });
+});
diff --git a/ui/src/app/shared/memo.ts b/ui/src/app/shared/memo.ts
new file mode 100644
index 000000000..3f719142a
--- /dev/null
+++ b/ui/src/app/shared/memo.ts
@@ -0,0 +1,15 @@
+export function memoize(func) {
+ const cache = {};
+ return function (...args: any[]) {
+ const key = JSON.stringify(args);
+ if (cache[key]) {
+ return cache[key];
+ } else {
+ const val = func.apply(null, args);
+ cache[key] = val;
+ return val;
+ }
+ };
+}
+
+export default { memoize };
diff --git a/ui/src/app/shared/validation/regex.validator.spec.ts b/ui/src/app/shared/validation/regex.validator.spec.ts
new file mode 100644
index 000000000..ce8af17ee
--- /dev/null
+++ b/ui/src/app/shared/validation/regex.validator.spec.ts
@@ -0,0 +1,18 @@
+import { RegexValidator } from './regex.validator';
+
+describe('RegexValidator', () => {
+ describe('isValidRegex method', () => {
+ it('should return true if no error is thrown', () => {
+ expect(RegexValidator.isValidRegex('/abc/')).toBe(true);
+ expect(RegexValidator.isValidRegex('/*123/')).toBe(true);
+ });
+
+ it('should return false if an error is thrown trying to construct a regex', () => {
+ expect(RegexValidator.isValidRegex(')')).toBe(false);
+ });
+
+ it('should return false if the regex doesnt begin and end with slashes', () => {
+ expect(RegexValidator.isValidRegex('abc')).toBe(false);
+ });
+ });
+});
diff --git a/ui/src/app/shared/validation/regex.validator.ts b/ui/src/app/shared/validation/regex.validator.ts
new file mode 100644
index 000000000..be567a0f4
--- /dev/null
+++ b/ui/src/app/shared/validation/regex.validator.ts
@@ -0,0 +1,18 @@
+const regexChecker = new RegExp('^\/|\/$', 'g');
+
+export class RegexValidator {
+ static isValidRegex(pattern: string): boolean {
+ if (!pattern) {
+ return true;
+ }
+ let regex;
+ try {
+ regex = new RegExp(pattern);
+ } catch (err) {
+ return false;
+ }
+ return regexChecker.test(pattern);
+ }
+}
+
+export default RegexValidator;