Bugfix/fix getting encoding (#150)

* fix defultEncodingConstraint

* fix lint problems

---------

Co-authored-by: Michele Santoro <[email protected]>

Author: larisaVasile

core/libs/aspect-exporter/src/lib/rdf-node/rdf-node.service.ts

@@ -24,10 +24,7 @@ import {BasePropertiesInterface, LocaleInterface} from './interfaces';
   providedIn: 'root',
 })
 export class RdfNodeService {
-  constructor(
-    public loggerService: LogService,
-    public modelService: ModelService,
-  ) {}
+  constructor(public loggerService: LogService, public modelService: ModelService) {}
 
   /**
    * Removes the quads corresponding to the given properties of an element.
@@ -49,8 +46,8 @@ export class RdfNodeService {
               DataFactory.namedNode(metaModelElement.aspectModelUrn),
               DataFactory.namedNode(rdfModel.SAMM().getAspectModelUrn(property)),
               null,
-              null,
-            )?.[0],
+              null
+            )?.[0]
         )
         .filter(quad => quad); // filter null/undefined
     }
@@ -73,7 +70,7 @@ export class RdfNodeService {
       const newElement = DataFactory.triple(
         DataFactory.namedNode(metaModelElement.aspectModelUrn),
         rdfModel.SAMM().RdfType(),
-        DataFactory.namedNode(RdfModelUtil.getFullQualifiedModelName(metaModelElement)),
+        DataFactory.namedNode(RdfModelUtil.getFullQualifiedModelName(metaModelElement))
       );
       rdfModel.store.addQuad(newElement);
     }
@@ -87,7 +84,7 @@ export class RdfNodeService {
         DataFactory.namedNode(metaModelElement.aspectModelUrn),
         DataFactory.namedNode(rdfModel.SAMM().getAspectModelUrn(key)),
         null,
-        null,
+        null
       );
 
       if (outdatedQuad?.length) {
@@ -111,13 +108,16 @@ export class RdfNodeService {
         case PropertyEnum.See:
           this.updateArrayField(metaModelElement, properties, key, samm.getAspectModelUrn(key));
           break;
-        case metaModelElement instanceof DefaultEncodingConstraint && PropertyEnum.Value:
+        case metaModelElement instanceof DefaultEncodingConstraint && PropertyEnum.Value: {
+          const propKey = properties[key].substring(properties[key].indexOf('#') + 1);
+          const encodingsList = samm.getEncodingList();
           this.addDatatype(
             metaModelElement,
             samm.getAspectModelUrn(key),
-            samm.getEncodingList().find(enc => enc.value === properties[key]).isDefinedBy,
+            encodingsList.find((el: any) => el.value === propKey).isDefinedBy
           );
           break;
+        }
         case PropertyEnum.NumericConversionFactor:
           this.addQuad(metaModelElement, properties[key], samm.getAspectModelUrn(key));
           break;
@@ -168,8 +168,8 @@ export class RdfNodeService {
               DataFactory.triple(
                 DataFactory.namedNode(metaModelElement.aspectModelUrn),
                 DataFactory.namedNode(rdfModel.SAMM().getAspectModelUrn(key)),
-                DataFactory.literal(localeValue.value, localeValue.language),
-              ),
+                DataFactory.literal(localeValue.value, localeValue.language)
+              )
             );
           });
           break;
@@ -202,8 +202,8 @@ export class RdfNodeService {
         DataFactory.triple(
           DataFactory.namedNode(metaModelElement.aspectModelUrn),
           DataFactory.namedNode(rdfModel.SAMM().getAspectModelUrn(key)),
-          DataFactory.literal(localeValue.value, localeValue.language),
-        ),
+          DataFactory.literal(localeValue.value, localeValue.language)
+        )
       );
     });
   }
@@ -212,7 +212,7 @@ export class RdfNodeService {
     metaModelElement: BaseMetaModelElement,
     properties: BasePropertiesInterface,
     key: string,
-    aspectModelUrn: string,
+    aspectModelUrn: string
   ) {
     const arrayProperty: string[] = properties[key];
     arrayProperty.forEach(property => {
@@ -224,7 +224,7 @@ export class RdfNodeService {
     metaModelElement: BaseMetaModelElement,
     aspectModelUrn: string,
     value: string | number | boolean,
-    encodeUrn?: boolean,
+    encodeUrn?: boolean
   ) {
     if (!value && value !== 0) {
       return;
@@ -235,16 +235,16 @@ export class RdfNodeService {
       DataFactory.triple(
         DataFactory.namedNode(metaModelElement.aspectModelUrn),
         DataFactory.namedNode(aspectModelUrn),
-        DataFactory.namedNode(encodeUrn ? encodeURIComponent(`${value}`) : `${value}`),
-      ),
+        DataFactory.namedNode(encodeUrn ? encodeURIComponent(`${value}`) : `${value}`)
+      )
     );
   }
 
   private addQuad(
     metaModelElement: BaseMetaModelElement,
     value: string | number | boolean,
     aspectModelUrn: string,
-    characteristicType?: Type,
+    characteristicType?: Type
   ) {
     if (!value && value !== 0) {
       return;
@@ -255,8 +255,8 @@ export class RdfNodeService {
       DataFactory.triple(
         DataFactory.namedNode(metaModelElement.aspectModelUrn),
         DataFactory.namedNode(aspectModelUrn),
-        DataFactory.literal(`${value}`, RdfModelUtil.resolveAccurateType(metaModelElement, aspectModelUrn, rdfModel, characteristicType)),
-      ),
+        DataFactory.literal(`${value}`, RdfModelUtil.resolveAccurateType(metaModelElement, aspectModelUrn, rdfModel, characteristicType))
+      )
     );
   }
 }

core/libs/sidebar/src/lib/workspace/workspace.component.ts

@@ -12,7 +12,7 @@
  */
 
 import {ChangeDetectorRef, Component, inject, OnDestroy, OnInit} from '@angular/core';
-import {finalize, Subscription, tap} from 'rxjs';
+import {finalize, Subscription} from 'rxjs';
 import {SidebarStateService} from '@ame/sidebar';
 
 @Component({
@@ -44,7 +44,7 @@ export class WorkspaceComponent implements OnInit, OnDestroy {
           finalize(() => {
             this.loading = false;
             this.changeDetector.detectChanges();
-          }),
+          })
         )
         .subscribe();
       this.subscription.add(refreshing$);