Improve workspace error detection and refresh logic

Enhanced model dependency checking to better identify missing dependencies and workspace-loaded files. Added isLoadedInWorkspace flag to FileStatus, updated workspace refresh to clear namespace state, and improved file element loading logic for more accurate UI updates. Also improved error notification messaging for file imports.

Author: michelu89

core/libs/editor/src/lib/editor-toolbar/services/file-handling.service.ts

@@ -381,11 +381,10 @@ export class FileHandlingService {
     return this.importFiles(file).pipe(
       tap(() => this.notificationsService.success({title: this.translate.language.NOTIFICATION_SERVICE.PACKAGE_IMPORTED_SUCCESS})),
       catchError(httpError => {
-        // @TODO Temporary check until file blockage is fixed
-        !httpError.error?.error?.message?.includes('import')
-          ? this.notificationsService.error({title: this.translate.language.NOTIFICATION_SERVICE.PACKAGE_IMPORTED_ERROR})
-          : this.notificationsService.success({title: this.translate.language.NOTIFICATION_SERVICE.PACKAGE_IMPORTED_SUCCESS});
-
+        this.notificationsService.error({
+          title: this.translate.language.NOTIFICATION_SERVICE.PACKAGE_IMPORTED_ERROR,
+          message: httpError.error?.error?.message,
+        });
         return of(null);
       }),
       finalize(() => this.loadingScreenService.close()),

core/libs/editor/src/lib/model-checker.service.ts

@@ -2,7 +2,7 @@ import {ModelApiService, ModelData, WorkspaceStructure} from '@ame/api';
 import {LoadedFilesService} from '@ame/cache';
 import {RdfModelUtil} from '@ame/rdf/utils';
 import {config} from '@ame/shared';
-import {ExporterHelper, FileStatus} from '@ame/sidebar';
+import {ExporterHelper, FileStatus, SidebarStateService} from '@ame/sidebar';
 import {DestroyRef, Injectable, inject} from '@angular/core';
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 import {Samm} from '@esmf/aspect-model-loader';
@@ -15,6 +15,7 @@ export class ModelCheckerService {
   private modelApiService = inject(ModelApiService);
   private loadedFilesService = inject(LoadedFilesService);
   private modelLoader = inject(ModelLoaderService);
+  private sidebarStateService = inject(SidebarStateService);
 
   /**
    * Gets all files from workspace and process if they have any error or missing dependencies
@@ -24,22 +25,35 @@ export class ModelCheckerService {
    */
   detectWorkspaceErrors(signal?: Subject<string>): Observable<Record<string, FileStatus>> {
     let namespacesStructure: WorkspaceStructure;
+    const extractDependencies = (absoluteName: string, modelData: ModelData, modelVersion: string) => {
+      const namespaces = this.sidebarStateService.namespacesState.namespaces();
+      const chunks = RdfModelUtil.splitRdfIntoChunks(absoluteName);
+      const namespace = namespaces[`${chunks[0]}:${chunks[1]}`];
+      if (namespace?.find(n => n.name === chunks[2])?.isLoadedInWorkspace) {
+        return null;
+      }
 
-    const extractDependencies = (absoluteName: string, modelData: ModelData, modelVersion: string) =>
-      this.modelApiService.fetchAspectMetaModel(modelData.aspectModelUrn).pipe(
+      return this.modelApiService.fetchAspectMetaModel(modelData.aspectModelUrn).pipe(
         takeUntilDestroyed(this.destroyRef),
         switchMap(rdf => this.modelLoader.parseRdfModel([rdf])),
         map(rdfModel => {
           const dependencies = RdfModelUtil.resolveExternalNamespaces(rdfModel)
-            .map(external => external.replace(/urn:samm:|urn:bamm:|#/gi, ''))
+            .map(external => external.replace(/urn:samm:|#/gi, ''))
             .filter(dependency => !`urn:samm:${dependency}`.includes(Samm.BASE_URI));
 
           const missingDependencies: string[] = [];
 
           for (const dependency of dependencies) {
             const [namespace, version] = dependency.split(':');
-            if (!namespacesStructure[`${namespace}:${version}`]) missingDependencies.push(dependency);
+            const namespaceElements = namespacesStructure[namespace];
+
+            const versionExists = namespaceElements?.some(element => element.version === version);
+
+            if (!versionExists) {
+              missingDependencies.push(dependency);
+            }
           }
+
           const status = new FileStatus(modelData.model);
           const currentFile = this.loadedFilesService.currentLoadedFile;
 
@@ -56,6 +70,7 @@ export class ModelCheckerService {
           return status;
         }),
       );
+    };
 
     return this.modelApiService.loadNamespacesStructure().pipe(
       takeUntilDestroyed(this.destroyRef),
@@ -71,7 +86,11 @@ export class ModelCheckerService {
           }
         }
 
-        return Object.keys(requests).length ? forkJoin(requests) : of({});
+        const entries = Object.fromEntries(
+          Object.entries(requests).filter((entry): entry is [string, Observable<FileStatus>] => entry[1] !== null),
+        );
+
+        return Object.keys(entries).length ? forkJoin(entries) : of({} as Record<string, FileStatus>);
       }),
     );
   }

core/libs/sidebar/src/lib/sidebar-state.service.ts

@@ -72,6 +72,7 @@ export class FileStatus {
   public loaded: boolean;
   public outdated: boolean;
   public errored: boolean;
+  public isLoadedInWorkspace: boolean;
   public sammVersion: string;
   public dependencies: string[];
   public missingDependencies: string[];
@@ -154,10 +155,10 @@ export class SidebarStateService {
   }
 
   updateWorkspace(files: Record<string, FileStatus>) {
-    this.namespacesState.clear();
     let hasOutdated = false;
     for (const absolute of Object.keys(files)) {
       const fs = files[absolute];
+      fs.isLoadedInWorkspace = true;
       const [namespace, version] = RdfModelUtil.splitRdfIntoChunks(absolute);
       this.namespacesState.setFile(`${namespace}:${version}`, fs);
       hasOutdated ||= fs.outdated;

core/libs/sidebar/src/lib/workspace/workspace-file-elements/workspace-file-elements.component.ts

@@ -98,9 +98,13 @@ export class WorkspaceFileElementsComponent {
           this.searched[element] = this.elements[element].elements;
         }
 
-        if (this.loadedFilesService.getFile(`${this.selection.namespace}:${this.selection.file}`)) {
+        const namespaceFile = this.loadedFilesService.getFile(`${this.selection.namespace}:${this.selection.file}`);
+
+        if (namespaceFile?.cachedFile.getAllElements().length) {
           this.updateElements(this.loadedFilesService.getFile(`${this.selection.namespace}:${this.selection.file}`));
-        } else this.requestFile(`${this.selection.namespace}:${this.selection.file}`, this.selection.aspectModelUrn);
+        } else {
+          this.requestFile(`${this.selection.namespace}:${this.selection.file}`, this.selection.aspectModelUrn);
+        }
       }
     });
   }

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

@@ -21,7 +21,7 @@ <h2>{{ 'SIDEBAR.WORKSPACE.TITLE' | translate }}</h2>
       [class.disabled]="loading"
       [matTooltip]="loading ? ('SIDEBAR.WORKSPACE.REFRESHING' | translate) : ('SIDEBAR.WORKSPACE.REFRESH' | translate)"
       [disabled]="loading"
-      (click)="sidebarService.workspace.refresh()"
+      (click)="refreshWorkspace()"
       mat-mini-fab
     >
       <mat-icon>refresh</mat-icon>

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

@@ -82,4 +82,9 @@ export class WorkspaceComponent {
         });
     });
   }
+
+  refreshWorkspace() {
+    this.sidebarService.namespacesState.clear();
+    this.sidebarService.workspace.refresh();
+  }
 }