Merge pull request #440 from vbakke/v4-patch-2

fix: Issues related to release of v4

Author: wurstbrot

src/app/app.component.ts

@@ -10,7 +10,7 @@ import { TitleService } from './service/title.service';
 })
 export class AppComponent implements OnInit, OnDestroy {
   title = '';
-  defaultTitle = 'DSOMM beta edition';
+  defaultTitle = '';
   subtitle = '';
   menuIsOpen: boolean = true;
 

src/app/model/activity-store.ts

@@ -4,7 +4,7 @@ import { MarkdownText } from './markdown-text';
 
 export class ActivityFileMeta {
   static DSOMM_PUBLISHER: string =
-    'https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data/';
+    'https://github.com/devsecopsmaturitymodel/DevSecOps-MaturityModel-data';
 
   version: string | null = null;
   released: Date | null = null;
@@ -20,7 +20,7 @@ export class ActivityFileMeta {
 
   getDsommVersion(): string | null {
     if (this.publisher && this.publisher.startsWith(ActivityFileMeta.DSOMM_PUBLISHER)) {
-      return this.version;
+      return this.version?.startsWith('v') ? this.version : `v${this.version}`;
     }
     return null;
   }

src/app/service/loader/data-loader.service.ts

@@ -40,7 +40,7 @@ export class LoaderService {
     private githubService: GithubService,
     private notificationService: NotificationService
   ) {
-    this.DSOMM_MODEL_URL = this.githubService.getDsommModelUrl();
+    this.DSOMM_MODEL_URL = this.githubService.getDsommModelUrl() + '/tree/main/generated';
   }
 
   get datastore(): DataStore | null {
@@ -91,7 +91,11 @@ export class LoaderService {
       if (err instanceof FileNotFoundError) {
         console.error(`${perfNow()}: Missing model file: ${err?.filename || err}`);
         if (err.filename && err.filename.endsWith('default/model.yaml')) {
-          this.notificationService.notify('Loading error', `No DSOMM model found.\n\nPlease download \`model.yaml\` from [GitHub](${this.DSOMM_MODEL_URL}).`); // eslint-disable-line
+          let msg: string =
+            `No DSOMM Model file found.\n\n` +
+            `Please download \`model.yaml\` from [DSOMM-data](${this.DSOMM_MODEL_URL}) on GitHub, \\\n` +
+            `and place it in the \`src\\assets\\default\` folder.`;
+          this.notificationService.notify('Loading error', msg);
         } else {
           this.notificationService.notify('Loading error', err.message + ': ' + err.filename);
         }