diff --git a/src/portal/src/app/base/left-side-nav/config/config.component.spec.ts b/src/portal/src/app/base/left-side-nav/config/config.component.spec.ts index 4746f78a2..3c32de88d 100644 --- a/src/portal/src/app/base/left-side-nav/config/config.component.spec.ts +++ b/src/portal/src/app/base/left-side-nav/config/config.component.spec.ts @@ -19,7 +19,6 @@ describe('ConfigurationComponent', () => { return false; }, updateConfig() {}, - initConfig() {}, }; let initSpy: jasmine.Spy; beforeEach(() => { @@ -34,7 +33,7 @@ describe('ConfigurationComponent', () => { }); beforeEach(() => { - initSpy = spyOn(fakeConfigService, 'initConfig').and.returnValue( + initSpy = spyOn(fakeConfigService, 'updateConfig').and.returnValue( undefined ); fixture = TestBed.createComponent(ConfigurationComponent); diff --git a/src/portal/src/app/base/left-side-nav/config/config.component.ts b/src/portal/src/app/base/left-side-nav/config/config.component.ts index 732df4878..7ef6c971a 100644 --- a/src/portal/src/app/base/left-side-nav/config/config.component.ts +++ b/src/portal/src/app/base/left-side-nav/config/config.component.ts @@ -27,7 +27,7 @@ export class ConfigurationComponent implements OnInit { constructor(private conf: ConfigService) {} ngOnInit(): void { - // First load - this.conf.initConfig(); + // Refresh config every time when entering the configuration page + this.conf.updateConfig(); } } diff --git a/src/portal/src/app/base/left-side-nav/config/config.service.spec.ts b/src/portal/src/app/base/left-side-nav/config/config.service.spec.ts index 53a6f055d..5e2f1796a 100644 --- a/src/portal/src/app/base/left-side-nav/config/config.service.spec.ts +++ b/src/portal/src/app/base/left-side-nav/config/config.service.spec.ts @@ -33,15 +33,15 @@ describe('ConfigService', () => { } )); - it('should init config', inject( + it('should update config', inject( [ConfigService], (service: ConfigService) => { expect(getConfigSpy.calls.count()).toEqual(0); - service.initConfig(); - expect(getConfigSpy.calls.count()).toEqual(1); - // only init once - service.initConfig(); + service.updateConfig(); expect(getConfigSpy.calls.count()).toEqual(1); + // update again + service.updateConfig(); + expect(getConfigSpy.calls.count()).toEqual(2); expect(service).toBeTruthy(); } )); diff --git a/src/portal/src/app/base/left-side-nav/config/config.service.ts b/src/portal/src/app/base/left-side-nav/config/config.service.ts index a21d5ca86..2ce862b97 100644 --- a/src/portal/src/app/base/left-side-nav/config/config.service.ts +++ b/src/portal/src/app/base/left-side-nav/config/config.service.ts @@ -17,7 +17,6 @@ const fakePass = 'aWpLOSYkIzJTTU4wMDkx'; @Injectable() export class ConfigService { private _loadingConfig: boolean = false; - private _hasInit: boolean = false; private _confirmSub: Subscription; private _currentConfig: Configuration = new Configuration(); private _originalConfig: Configuration; @@ -59,13 +58,6 @@ export class ConfigService { return this._loadingConfig; } - initConfig() { - if (!this._hasInit) { - this.updateConfig(); - this._hasInit = true; - } - } - updateConfig() { this._loadingConfig = true; this.configureService @@ -92,6 +84,8 @@ export class ConfigService { // Handle read only if (this._originalConfig?.read_only?.value) { this.msgHandler.handleReadOnly(); + } else { + this.msgHandler.clear(); } }, error => {