Skip to content

Commit 1decbde

Browse files
authored
Fix message only appear in loaded model (#168)
1 parent 4de5b6d commit 1decbde

File tree

4 files changed

+38
-24
lines changed

4 files changed

+38
-24
lines changed

core/apps/ame/src/app/startup.service.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export class StartupService {
4343
private fileHandlingService: FileHandlingService,
4444
private mxGraphService: MxGraphService,
4545
private translate: LanguageTranslationService,
46-
private ngZone: NgZone
46+
private ngZone: NgZone,
4747
) {}
4848

4949
listenForLoading() {
@@ -62,8 +62,8 @@ export class StartupService {
6262
}),
6363
take(1),
6464
switchMap(({isFirstWindow, model}) =>
65-
(isFirstWindow ? this.migratorService.startMigrating() : of(null)).pipe(switchMap(() => this.loadModel(model)))
66-
)
65+
(isFirstWindow ? this.migratorService.startMigrating() : of(null)).pipe(switchMap(() => this.loadModel(model))),
66+
),
6767
)
6868
.subscribe(() => {
6969
this.sidebarService.workspace.refresh();
@@ -77,7 +77,7 @@ export class StartupService {
7777
this.loadingScreenService.open({
7878
title: this.translate.language.LOADING_SCREEN_DIALOG.MODEL_LOADING,
7979
content: this.translate.language.LOADING_SCREEN_DIALOG.MODEL_LOADING_WAIT,
80-
})
80+
}),
8181
);
8282
return this.electronSignalsService.call('requestWindowData').pipe(
8383
tap(data => (options = data.options)),
@@ -90,13 +90,13 @@ export class StartupService {
9090
fromWorkspace: options?.fromWorkspace,
9191
editElementUrn: options?.editElement,
9292
})
93-
: of(this.fileHandlingService.createEmptyModel())
94-
)
93+
: of(this.fileHandlingService.createEmptyModel()),
94+
),
9595
),
9696
tap(() => {
9797
this.modelSaveTracker.updateSavedModel();
9898
this.loadingScreenService.close();
99-
})
99+
}),
100100
);
101101
}
102102
}

core/libs/instantiator/src/lib/meta-model-element-instantiator.ts

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -512,14 +512,16 @@ export class MetaModelElementInstantiator {
512512
if (this.rdfModel.getLocale(quad)) {
513513
metaModelElement.addDescription(this.rdfModel.getLocale(quad), quad.object.value);
514514
} else {
515-
this.notificationsService.error({
516-
title: this.translate.language.NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_TITLE,
517-
message: this.translate.translateService.instant('NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_DESC_MESSAGE', {
518-
subject: quad.subject.value,
519-
fileName: metaModelElement?.fileName,
520-
}),
521-
timeout: 5000,
522-
});
515+
if (this.rdfModel.loadedRdfModel) {
516+
this.notificationsService.error({
517+
title: this.translate.language.NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_TITLE,
518+
message: this.translate.translateService.instant('NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_DESC_MESSAGE', {
519+
subject: quad.subject.value,
520+
fileName: metaModelElement?.fileName,
521+
}),
522+
timeout: 5000,
523+
});
524+
}
523525
metaModelElement.addDescription('en', quad.object.value);
524526
}
525527
}
@@ -528,14 +530,17 @@ export class MetaModelElementInstantiator {
528530
if (this.rdfModel.getLocale(quad)) {
529531
metaModelElement.addPreferredName(this.rdfModel.getLocale(quad), quad.object.value);
530532
} else {
531-
this.notificationsService.error({
532-
title: this.translate.language.NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_TITLE,
533-
message: this.translate.translateService.instant('NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_PREF_MESSAGE', {
534-
subject: quad.subject.value,
535-
fileName: metaModelElement?.fileName,
536-
}),
537-
timeout: 5000,
538-
});
533+
if (this.rdfModel.loadedRdfModel) {
534+
this.notificationsService.error({
535+
title: this.translate.language.NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_TITLE,
536+
message: this.translate.translateService.instant('NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_PREF_MESSAGE', {
537+
subject: quad.subject.value,
538+
fileName: metaModelElement?.fileName,
539+
}),
540+
timeout: 5000,
541+
});
542+
}
543+
539544
metaModelElement.addPreferredName('en', quad.object.value);
540545
}
541546
}

core/libs/rdf/src/lib/services/rdf.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export class RdfService {
9191
}
9292

9393
loadModel(rdf: string, namespaceFileName?: string): Observable<RdfModel> {
94-
const rdfModel = new RdfModel();
94+
const rdfModel = new RdfModel(true);
9595
const parser = new Parser();
9696
const store: Store = new Store();
9797
const subject = new Subject<RdfModel>();

core/libs/rdf/src/lib/utils/rdf-model.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export class RdfModel {
3333
private _absoluteAspectModelFileName: string = null;
3434
private _metaModelVersion: string;
3535
private _defaultAspectModelAlias = '';
36+
private _loadedRdfModel: boolean;
3637

3738
public samm: Samm;
3839
public sammC: SammC;
@@ -44,6 +45,10 @@ export class RdfModel {
4445
public loadedFromWorkspace = false;
4546
public aspect: Quad_Subject;
4647

48+
get loadedRdfModel(): boolean {
49+
return this._loadedRdfModel;
50+
}
51+
4752
get store(): Store {
4853
return this._store;
4954
}
@@ -119,6 +124,10 @@ export class RdfModel {
119124
);
120125
}
121126

127+
constructor(loadedRdfModel = false) {
128+
this._loadedRdfModel = loadedRdfModel;
129+
}
130+
122131
public initRdfModel(store: Store, prefixes: Prefixes, mode: 'empty' | 'loaded' = 'loaded'): RdfModel {
123132
this._store = store;
124133
this._prefixes = prefixes;

0 commit comments

Comments
 (0)