diff --git a/src/app/component/modal-message/modal-message.component.ts b/src/app/component/modal-message/modal-message.component.ts index ac7c35cd..bd5e3ab2 100644 --- a/src/app/component/modal-message/modal-message.component.ts +++ b/src/app/component/modal-message/modal-message.component.ts @@ -20,16 +20,7 @@ export class ModalMessageComponent implements OnInit { DSOMM_host: string = 'https://github.com/devsecopsmaturitymodel'; DSOMM_url: string = `${this.DSOMM_host}/DevSecOps-MaturityModel-data`; - meassageTemplates: Record = { - generated_yaml: new DialogInfo( - `{message}\n\n` + - `Please download the activity template \`generated.yaml\` ` + - `from [DSOMM-data](${this.DSOMM_url}) on GitHub.\n\n` + - 'The DSOMM activities are maintained and distributed ' + - 'separately from the software.', - 'DSOMM startup problems' - ), - }; + meassageTemplates: Record = {}; constructor( public dialog: MatDialog, diff --git a/src/app/service/loader/data-loader.service.ts b/src/app/service/loader/data-loader.service.ts index 79c49ddc..9dc41801 100644 --- a/src/app/service/loader/data-loader.service.ts +++ b/src/app/service/loader/data-loader.service.ts @@ -148,14 +148,12 @@ export class LoaderService { private async loadActivities(meta: MetaStore): Promise { const activityStore = new ActivityStore(); const errors: string[] = []; - let usingLegacyYamlFile = false; if (meta.activityFiles.length == 0) { throw new MissingModelError('No `activityFiles` are specified in `meta.yaml`.'); } for (let filename of meta.activityFiles) { if (this.debug) console.log(`${perfNow()}s: Loading activity file: ${filename}`); - usingLegacyYamlFile ||= filename.endsWith('generated/generated.yaml'); const response: ActivityFile = await this.loadActivityFile(filename); @@ -173,16 +171,12 @@ export class LoaderService { // Handle validation errors if (errors.length > 0) { errors.forEach(error => console.error(error)); - - // Legacy generated.yaml has several data validation problems. Do not report these - if (!usingLegacyYamlFile) { - throw new DataValidationError( - 'Data validation error after loading: ' + - filename + - '\n\n----\n\n' + - errors.join('\n\n') - ); - } + throw new DataValidationError( + 'Data validation error after loading: ' + + filename + + '\n\n----\n\n' + + errors.join('\n\n') + ); } } return activityStore; diff --git a/src/assets/YAML/meta.yaml b/src/assets/YAML/meta.yaml index f655a1d9..088862a1 100644 --- a/src/assets/YAML/meta.yaml +++ b/src/assets/YAML/meta.yaml @@ -26,8 +26,7 @@ teamGroups: $ref: 'default/teams.yaml#/teamGroups' activityFiles: - # - generated/generated.yaml # Old structure - No longer used - - default/model.yaml + - default/model.yaml # - custom/custom-activities.yaml # For customizing your own activities