inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3191] Not able to login only to BPM or ECM (#3478)

Browse Source 
* disable random test

* host setting component reset JS-API

* reload api after user prefrence change

* remove replicate reset

* missing semicolon

* deprecate provider property

* remove trailing space

* check new value before to set
This commit is contained in:
Eugenio Romano
2018-06-13 16:05:35 +01:00
committed by GitHub
parent d41e3d5b9c
commit afdedf02d1
12 changed files with 68 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/core/settings/host-settings.component.ts
View File

@@ -62,7 +62,7 @@ export class HostSettingsComponent implements OnInit {
bpmHostChange = new EventEmitter<string>();
constructor(private formBuilder: FormBuilder,
private userPreference: UserPreferencesService) {
private userPreferencesService: UserPreferencesService) {
}
ngOnInit() {
@@ -70,16 +70,16 @@ export class HostSettingsComponent implements OnInit {
this.showSelectProviders = false;
}
let providerSelected = this.userPreference.providers;
let providerSelected = this.userPreferencesService.providers;
this.form = this.formBuilder.group({
providersControl: [providerSelected, Validators.required],
authType: this.userPreference.authType
authType: this.userPreferencesService.authType
});
this.addFormGroups();
if (this.userPreference.authType === 'OAUTH') {
if (this.userPreferencesService.authType === 'OAUTH') {
this.addOAuthFormGroup();
}
@@ -127,7 +127,7 @@ export class HostSettingsComponent implements OnInit {
}
private createOAuthFormGroup(): AbstractControl {
const oAuthConfig: any = this.userPreference.oauthConfig ? this.userPreference.oauthConfig : {};
const oAuthConfig: any = this.userPreferencesService.oauthConfig ? this.userPreferencesService.oauthConfig : {};
return this.formBuilder.group({
host: [oAuthConfig.host, [Validators.required, Validators.pattern(this.HOST_REGEX)]],
clientId: [oAuthConfig.clientId, Validators.required],
@@ -140,11 +140,11 @@ export class HostSettingsComponent implements OnInit {
}
private createBPMFormControl(): AbstractControl {
return new FormControl(this.userPreference.bpmHost, [Validators.required, Validators.pattern(this.HOST_REGEX)]);
return new FormControl(this.userPreferencesService.bpmHost, [Validators.required, Validators.pattern(this.HOST_REGEX)]);
}
private createECMFormControl(): AbstractControl {
return new FormControl(this.userPreference.ecmHost, [Validators.required, Validators.pattern(this.HOST_REGEX)]);
return new FormControl(this.userPreferencesService.ecmHost, [Validators.required, Validators.pattern(this.HOST_REGEX)]);
}
onCancel() {
@@ -152,7 +152,7 @@ export class HostSettingsComponent implements OnInit {
}
onSubmit(values: any) {
this.userPreference.providers = values.providersControl;
this.userPreferencesService.providers = values.providersControl;
if (this.isBPM()) {
this.saveBPMValues(values);
@@ -167,21 +167,21 @@ export class HostSettingsComponent implements OnInit {
this.saveOAuthValues(values);
}
this.userPreference.authType = values.authType;
this.userPreferencesService.authType = values.authType;
this.success.emit(true);
}
private saveOAuthValues(values: any) {
this.userPreference.oauthConfig = values.oauthConfig;
this.userPreferencesService.oauthConfig = values.oauthConfig;
}
private saveBPMValues(values: any) {
this.userPreference.bpmHost = values.bpmHost;
this.userPreferencesService.bpmHost = values.bpmHost;
}
private saveECMValues(values: any) {
this.userPreference.ecmHost = values.ecmHost;
this.userPreferencesService.ecmHost = values.ecmHost;
}
isBPM(): boolean {