diff --git a/sharedComponents/input/input.component.ts b/sharedComponents/input/input.component.ts index 775a3b63..55acecd8 100644 --- a/sharedComponents/input/input.component.ts +++ b/sharedComponents/input/input.component.ts @@ -530,8 +530,10 @@ export class InputComponent implements OnInit, OnDestroy, AfterViewInit, OnChang ?this.getFormByName(this.yearRange.from.control).errors:this.getFormByName(this.yearRange.to.control).errors)); } else if(this.formAsControl) { return this.formAsControl.errors; - } else { + } else if(this.searchControl) { return this.searchControl.errors; + } else { + return null; } } diff --git a/utils/properties/env-properties.ts b/utils/properties/env-properties.ts index 74d01ddf..af367504 100644 --- a/utils/properties/env-properties.ts +++ b/utils/properties/env-properties.ts @@ -1,5 +1,5 @@ export type Environment = "development" | "test" | "beta" | "production"; -export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "client-management-portal"; +export type Dashboard = "explore" | "connect" | "monitor" | "aggregator" | "eosc" | "developers"; export type PortalType = "explore" | "connect" | "community" | "monitor" | "funder" | "ri" | "project" | "organization" | "aggregator" | "eosc"; export interface EnvProperties { @@ -65,7 +65,7 @@ export interface EnvProperties { registryUrl?: string; logoutUrl?: string; userInfoUrl?: string; - clientManagementUrl?: string, + developersApiUrl?: string, cookieDomain?: string; feedbackmail?: string; feedbackmailForMissingEntities?: string; diff --git a/utils/string-utils.class.ts b/utils/string-utils.class.ts index 143b15bb..c21fa9f1 100644 --- a/utils/string-utils.class.ts +++ b/utils/string-utils.class.ts @@ -332,7 +332,6 @@ export class StringUtils { return (control: AbstractControl): ValidationErrors | null => { if(control.value) { let test = control.getRawValue().replace(/\\["\\\/bfnrtu]/g, '@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').replace(/(?:^|:|,)(?:\s*\[)+/g, ''); - console.log('test') if(!new RegExp(this.jsonRegex).test(test)) { return {error: 'Please provide a valid JSON.' + error} }