ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4614 from FinnStutzenstein/verboseErrorOnMissingConfigs

Browse Source 
verbose error message on missing configs
This commit is contained in:
Emanuel Schütze 2019-04-24 15:23:53 +02:00 committed by GitHub
commit c04c59b666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/src/app/core/repositories/config/config-repository.service.ts
View File

@ -109,7 +109,7 @@ export class ConfigRepositoryService extends BaseRepository<ViewConfig, Config>
this.constantsService.get('ConfigVariables').subscribe(constant => { this.constantsService.get('ConfigVariables').subscribe(constant => {
this.createConfigStructure(constant); this.createConfigStructure(constant);
this.updateConfigStructure(...Object.values(this.viewModelStore)); this.updateConfigStructure(true, ...Object.values(this.viewModelStore));
this.updateConfigListObservable(); this.updateConfigListObservable();
}); });
} }
@ -157,7 +157,7 @@ export class ConfigRepositoryService extends BaseRepository<ViewConfig, Config>
this.DS.getAll(Config).forEach((config: Config) => { this.DS.getAll(Config).forEach((config: Config) => {
this.viewModelStore[config.id] = this.createViewModel(config); this.viewModelStore[config.id] = this.createViewModel(config);
this.updateConfigStructure(this.viewModelStore[config.id]); this.updateConfigStructure(false, this.viewModelStore[config.id]);
}); });
this.updateConfigListObservable(); this.updateConfigListObservable();
@ -166,7 +166,7 @@ export class ConfigRepositoryService extends BaseRepository<ViewConfig, Config>
this.DS.changeObservable.subscribe(model => { this.DS.changeObservable.subscribe(model => {
if (model instanceof Config) { if (model instanceof Config) {
this.viewModelStore[model.id] = this.createViewModel(model as Config); this.viewModelStore[model.id] = this.createViewModel(model as Config);
this.updateConfigStructure(this.viewModelStore[model.id]); this.updateConfigStructure(false, this.viewModelStore[model.id]);
this.updateConfigListObservable(); this.updateConfigListObservable();
} }
}); });
@ -197,9 +197,11 @@ export class ConfigRepositoryService extends BaseRepository<ViewConfig, Config>
/** /**
* With a given (and maybe partially filled) config structure, all given view configs are put into it. * With a given (and maybe partially filled) config structure, all given view configs are put into it.
* @param check Whether to check, if all given configs are there (according to the config structure).
* If check is true and one viewConfig is missing, the user will get an error message.
* @param viewConfigs All view configs to put into the structure * @param viewConfigs All view configs to put into the structure
*/ */
protected updateConfigStructure(...viewConfigs: ViewConfig[]): void { protected updateConfigStructure(check: boolean, ...viewConfigs: ViewConfig[]): void {
if (!this.configs) { if (!this.configs) {
return; return;
} }
@ -217,6 +219,12 @@ export class ConfigRepositoryService extends BaseRepository<ViewConfig, Config>
if (keyConfigMap[item.key]) { if (keyConfigMap[item.key]) {
keyConfigMap[item.key].setConstantsInfo(item.data); keyConfigMap[item.key].setConstantsInfo(item.data);
item.config = keyConfigMap[item.key]; item.config = keyConfigMap[item.key];
} else if (check) {
throw new Error(
`No config variable found for "${
item.key
}". Please migrate the database or rebuild the servercache.`
);
} }
} }
} }
@ -224,6 +232,12 @@ export class ConfigRepositoryService extends BaseRepository<ViewConfig, Config>
if (keyConfigMap[item.key]) { if (keyConfigMap[item.key]) {
keyConfigMap[item.key].setConstantsInfo(item.data); keyConfigMap[item.key].setConstantsInfo(item.data);
item.config = keyConfigMap[item.key]; item.config = keyConfigMap[item.key];
} else if (check) {
throw new Error(
`No config variable found for "${
item.key
}". Please migrate the database or rebuild the servercache.`
);
} }
} }
} }