Fixing problem when no language is set to desc or pref (#162)

* Fixing problem when no language is set to desc or pref

* Add shortcuts for linux and windows

* Fix loading on open new window

* Adjust shortcuts for win and mac

Author: michelu89

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

@@ -53,7 +53,7 @@ export class StartupService {
         switchMap(() => this.electronTunnelService.startUpData$.asObservable()),
         sample(this.mxGraphService.graphInitialized$.pipe(filter(Boolean))),
         filter(data => {
-          if (data) {
+          if (data?.model) {
             return true;
           } else {
             this.fileHandlingService.createEmptyModel();

core/apps/ame/src/assets/i18n/en.json

@@ -89,7 +89,10 @@
     "ASPECT_MISSING_TITLE": "Aspect Model is missing",
     "ASPECT_MISSING_CONTENT": "To start modelling, please create a new or load an existing model first. After that you can add new node types",
     "LOAD_MODEL_INFO_TITLE": "Load a Model to Continue",
-    "LOAD_MODEL_INFO_MESSAGE": "To view the file contents, please load a model first."
+    "LOAD_MODEL_INFO_MESSAGE": "To view the file contents, please load a model first.",
+    "FALLBACK_TO_DEFAULT_LANGUAGE_TITLE": "Fallback to Default Language.",
+    "FALLBACK_TO_DEFAULT_LANGUAGE_DESC_MESSAGE": "The specified language for {{subject}}'s description was not found in {{fileName}}. Proceeding with the default language settings.",
+    "FALLBACK_TO_DEFAULT_LANGUAGE_PREF_MESSAGE": "The specified language for {{subject}}'s preferred name was not found in {{fileName}}. Proceeding with the default language settings."
   },
   "TOOLBAR": {
     "NEW_LOAD": "New/Load",

core/electron-libs/app-menu.js

@@ -48,7 +48,7 @@ const {
   SIGNAL_ZOOM_OUT,
   SIGNAL_LOAD_FROM_TEXT,
 } = require('./events');
-const {icons, models, inDevMode} = require('./consts');
+const {icons, paths, inDevMode} = require('./consts');
 const {isMac} = require('./os-checker');
 const path = require('path');
 
@@ -117,7 +117,7 @@ const fileSubmenu = [
         label: 'SimpleAspect.ttl',
         icon: getIcon(icons.LOAD_DEFAULT_EXAMPLE.enabled),
         click: (menuItem, browserWindow, _) => {
-          return getFileInfo(path.join(models, 'SimpleAspect.ttl'))
+          return getFileInfo(path.join(paths.models, 'SimpleAspect.ttl'))
             .then(fileInfo => browserWindow.webContents.send(SIGNAL_LOAD_SPECIFIC_FILE, fileInfo))
             .catch(error => console.error(error));
         },
@@ -127,7 +127,7 @@ const fileSubmenu = [
         label: 'Movement.ttl',
         icon: getIcon(icons.LOAD_MOVEMENT_EXAMPLE.enabled),
         click: (menuItem, browserWindow, _) => {
-          return getFileInfo(path.join(models, 'Movement.ttl'))
+          return getFileInfo(path.join(paths.models, 'Movement.ttl'))
             .then(fileInfo => browserWindow.webContents.send(SIGNAL_LOAD_SPECIFIC_FILE, fileInfo))
             .catch(error => console.error(error));
         },

core/electron-libs/mac/shortcuts.js

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH
+ *
+ * See the AUTHORS file(s) distributed with this work for
+ * additional information regarding authorship.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+const {app, globalShortcut, BrowserWindow, Menu, nativeTheme} = require('electron');
+const platformData = require('./os-checker');
+
+function registerGlobalShortcuts() {
+  const shortcutsGlobal = [
+    {key: 'CommandOrControl+W', action: () => BrowserWindow.getFocusedWindow()?.close()},
+    {key: 'CommandOrControl+M', action: () => BrowserWindow.getFocusedWindow()?.minimize()},
+    {key: 'CommandOrControl+Shift+M', action: () => BrowserWindow.getFocusedWindow()?.maximize()},
+    {key: 'CommandOrControl+Shift+F', action: () => BrowserWindow.getFocusedWindow()?.setFullScreen(true)},
+    {key: 'CommandOrControl+Shift+G', action: () => BrowserWindow.getFocusedWindow()?.setFullScreen(false)},
+  ];
+
+  const shortcutsMac = [
+    {key: 'CommandOrControl+Q', action: () => (BrowserWindow.getFocusedWindow() ? app.quit() : null)},
+    {key: 'Command+Option+I', action: () => BrowserWindow.getFocusedWindow().webContents.openDevTools()},
+    {key: 'CommandOrControl+R', action: () => BrowserWindow.getFocusedWindow()?.reload()},
+    {
+      key: 'CommandOrControl+Shift+R',
+      action: () => BrowserWindow.getFocusedWindow()?.webContents.reloadIgnoringCache(),
+    },
+  ];
+
+  const shortcutsWin = [{key: 'Control+Shift+I', action: () => BrowserWindow.getFocusedWindow().webContents.openDevTools()}];
+
+  shortcutsGlobal.forEach(({key, action}) => {
+    globalShortcut.register(key, action);
+  });
+
+  if (platformData.isMac) {
+    shortcutsMac.forEach(({key, action}) => {
+      globalShortcut.register(key, action);
+    });
+  }
+
+  if (platformData.isWin) {
+    shortcutsWin.forEach(({key, action}) => {
+      globalShortcut.register(key, action);
+    });
+  }
+}
+
+function unregisterGlobalShortcuts() {
+  globalShortcut.unregisterAll();
+}
+
+module.exports = {
+  registerGlobalShortcuts,
+  unregisterGlobalShortcuts,
+};

core/electron-libs/shortcuts.js

@@ -80,10 +80,6 @@ export class EditorToolbarComponent implements AfterViewInit, OnInit, OnDestroy
     clearInterval(this.checkChangesInterval);
   }
 
-  openWindow() {
-    this.electronSignalsService.call('openWindow', null);
-  }
-
   // Deactivates the bug where the shape can not be removed
   blurActiveButton() {
     requestAnimationFrame(() => {

core/libs/editor/src/lib/editor-toolbar/editor-toolbar.component.ts

@@ -30,6 +30,7 @@ import {RdfService} from '@ame/rdf/services';
 import {RdfModel, RdfModelUtil} from '@ame/rdf/utils';
 import {NotificationsService} from '@ame/shared';
 import {AbstractEntityInstantiator} from './instantiators/abstract-entity-instantiator';
+import {LanguageTranslationService} from '@ame/translation';
 
 @Injectable({
   providedIn: 'root',
@@ -39,6 +40,7 @@ export class InstantiatorService {
     private namespaceCacheService: NamespacesCacheService,
     public rdfService: RdfService,
     public notificationsService: NotificationsService,
+    public translate: LanguageTranslationService,
   ) {}
 
   public instantiateFile(rdfModel: RdfModel, cachedFile: CachedFile, fileName: string): CachedFile {
@@ -56,6 +58,7 @@ export class InstantiatorService {
       this.namespaceCacheService,
       new Map<string, Array<BaseMetaModelElement>>(),
       this.notificationsService,
+      this.translate,
     );
 
     if (aspect) {

core/libs/instantiator/src/lib/instantiator.service.ts

@@ -50,6 +50,7 @@ import {
   LocaleConstraintInstantiator,
   MeasurementCharacteristicInstantiator,
   OperationInstantiator,
+  PredefinedEntityInstantiator,
   PredefinedPropertyInstantiator,
   PropertyInstantiator,
   QuantifiableCharacteristicInstantiator,
@@ -67,11 +68,11 @@ import {
 import {CachedFile, NamespacesCacheService} from '@ame/cache';
 import {RdfModel, RdfModelUtil} from '@ame/rdf/utils';
 import {GeneralConfig, NotificationsService} from '@ame/shared';
-import {PredefinedEntityInstantiator} from './instantiators';
 import {syncElementWithChildren} from './helpers';
 import {Samm, SammC, SammE, SammU} from '@ame/vocabulary';
 import {setUniqueElementName} from '@ame/utils';
 import {InstantiatorListElement} from '@ame/rdf/models';
+import {LanguageTranslationService} from '@ame/translation';
 
 export class MetaModelElementInstantiator {
   private characteristicInstantiator: CharacteristicInstantiator;
@@ -92,6 +93,7 @@ export class MetaModelElementInstantiator {
     public namespaceCacheService?: NamespacesCacheService,
     public recursiveModelElements?: Map<string, Array<BaseMetaModelElement>>,
     public notificationsService?: NotificationsService,
+    public translate?: LanguageTranslationService,
   ) {
     this.samm = this.rdfModel.samm;
     this.sammC = this.rdfModel.sammC;
@@ -454,7 +456,13 @@ export class MetaModelElementInstantiator {
    * @param skipSetExternal - skip the external reference
    * @returns the external rdfModel and the instantiated model
    */
-  getExternalElement<T>(quad: NamedNode | Quad_Object, skipSetExternal = false): {externalRdfModel: RdfModel; externalReference: T} {
+  getExternalElement<T>(
+    quad: NamedNode | Quad_Object,
+    skipSetExternal = false,
+  ): {
+    externalRdfModel: RdfModel;
+    externalReference: T;
+  } {
     let externalReference = this.namespaceCacheService.findElementOnExtReference<T>(quad.value);
     const externalRdfModel = this.getRdfModelByElement(quad);
 
@@ -504,6 +512,14 @@ export class MetaModelElementInstantiator {
     if (this.rdfModel.getLocale(quad)) {
       metaModelElement.addDescription(this.rdfModel.getLocale(quad), quad.object.value);
     } else {
+      this.notificationsService.error({
+        title: this.translate.language.NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_TITLE,
+        message: this.translate.translateService.instant('NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_DESC_MESSAGE', {
+          subject: quad.subject.value,
+          fileName: metaModelElement?.fileName,
+        }),
+        timeout: 5000,
+      });
       metaModelElement.addDescription('en', quad.object.value);
     }
   }
@@ -512,6 +528,14 @@ export class MetaModelElementInstantiator {
     if (this.rdfModel.getLocale(quad)) {
       metaModelElement.addPreferredName(this.rdfModel.getLocale(quad), quad.object.value);
     } else {
+      this.notificationsService.error({
+        title: this.translate.language.NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_TITLE,
+        message: this.translate.translateService.instant('NOTIFICATION_SERVICE.FALLBACK_TO_DEFAULT_LANGUAGE_PREF_MESSAGE', {
+          subject: quad.subject.value,
+          fileName: metaModelElement?.fileName,
+        }),
+        timeout: 5000,
+      });
       metaModelElement.addPreferredName('en', quad.object.value);
     }
   }

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

@@ -251,7 +251,7 @@ export class RdfModel {
   }
 
   getLocale(quad: Quad): string {
-    return quad ? locale.getByTag(quad.object['language']).tag : null;
+    return quad?.object?.['language'] ? locale.getByTag(quad.object['language']).tag : null;
   }
 
   public resolveRecursiveBlankNodes(uri: string, writer: Writer): Quad[] {

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

@@ -560,6 +560,9 @@ export interface NotificationService {
   ASPECT_MISSING_CONTENT: string;
   LOAD_MODEL_INFO_TITLE: string;
   LOAD_MODEL_INFO_MESSAGE: string;
+  FALLBACK_TO_DEFAULT_LANGUAGE_TITLE: string;
+  FALLBACK_TO_DEFAULT_LANGUAGE_DESC_MESSAGE: string;
+  FALLBACK_TO_DEFAULT_LANGUAGE_PREF_MESSAGE: string;
 }
 export interface SammMigration {
   CHECK_WORKSPACE: string;