opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/devel' into devel

Browse Source
This commit is contained in:
serge-rider
2020-10-21 23:22:59 +03:00
parent 971d05a8a5 e00525da1f
commit aab25602ab
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/packages/core-administration/src/AdministrationScreen/AdministrationScreenService.ts
+17 -4
View File
@@ -124,8 +124,12 @@ export class AdministrationScreenService {
}
getItemState<T>(name: string): T | undefined
getItemState<T>(name: string, defaultState: () => T, update?: boolean): T
getItemState<T>(name: string, defaultState?: () => T, update?: boolean): T | undefined {
getItemState<T>(name: string, defaultState: () => T, update?: boolean, validate?: (state: T) => boolean): T
getItemState<T>(
name: string, defaultState?: () => T,
update?: boolean,
validate?: (state: T) => boolean
): T | undefined {
if (!this.serverConfigResource.isLoaded()) {
throw new Error('Administration screen getItemState can be used only after server configuration loaded');
}
@@ -133,8 +137,17 @@ export class AdministrationScreenService {
this.clearItemsState();
this.info.mode = this.isConfigurationMode;
}
if ((!this.itemState.has(name) || update) && defaultState) {
this.itemState.set(name, defaultState());
if (defaultState) {
if (!this.itemState.has(name) || update) {
this.itemState.set(name, defaultState());
} else if (validate) {
const state = this.itemState.get(name)!;
if (!validate(state)) {
this.itemState.set(name, defaultState());
}
}
}
return this.itemState.get(name);