Merge branch 'main' into feature/dev-2379-eu-view-a-data-model

* main: refactor: remove unused code in ontology component (#1472) fix: image region comment field validation removed(DEV-3315) (#1487) chore(main): release 11.6.5 (#1486) fix: submit button on upload resource does not load indefinitely (#1485) chore(main): release 11.6.4 (#1482) # Conflicts: # apps/dsp-app/src/app/project/ontology/ontology.component.html # apps/dsp-app/src/app/project/ontology/ontology.component.ts
dasch-swiss · Feb 28, 2024 · 4926dac · 4926dac
2 parents c23dc54 + bae7609
commit 4926dac
Show file tree

Hide file tree

Showing 9 changed files with 144 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [11.6.5](https://github.com/dasch-swiss/dsp-das/compare/v11.6.4...v11.6.5) (2024-02-27)
+
+
+### Bug Fixes
+
+* submit button on upload resource does not load indefinitely  ([#1485](https://github.com/dasch-swiss/dsp-das/issues/1485)) ([e1a51b5](https://github.com/dasch-swiss/dsp-das/commit/e1a51b5a224bf532f3a3f0ff8e6b4a49c9b42bd2))
+
+## [11.6.4](https://github.com/dasch-swiss/dsp-das/compare/v11.6.3...v11.6.4) (2024-02-23)
+
+
+### Bug Fixes
+
+* new list node field error is not displayed ([#1481](https://github.com/dasch-swiss/dsp-das/issues/1481)) ([1ef0823](https://github.com/dasch-swiss/dsp-das/commit/1ef082364c13ead5a537bc32a734372744f1cbda))
+* ontology initialisation (DEV-3317) ([#1483](https://github.com/dasch-swiss/dsp-das/issues/1483)) ([be6ec9a](https://github.com/dasch-swiss/dsp-das/commit/be6ec9a5f4b16f4992b79ee69754da74f8b71178))
+
 ## [11.6.3](https://github.com/dasch-swiss/dsp-das/compare/v11.6.2...v11.6.3) (2024-02-23)
 
 

diff --git a/apps/dsp-app/src/app/project/ontology/ontology.component.html b/apps/dsp-app/src/app/project/ontology/ontology.component.html
@@ -11,14 +11,14 @@
             class="mat-headline-6"
             [matTooltip]="(currentOntology$ | async).label + ((currentOntology$ | async).comment ? ' &mdash; ' + (currentOntology$ | async).comment : '')"
             matTooltipPosition="above">
-            {{(currentOntology$ | async)?.label}}
+            {{ (currentOntology$ | async)?.label }}
           </h3>
           <p
             class="mat-caption"
             [matTooltip]="'Last modification date: ' + (lastModificationDate$ | async)"
             matTooltipPosition="above">
             <span *ngIf="(lastModificationDate$ | async); else noModificationDate">
-              Updated on: {{(lastModificationDate$ | async) | date:'medium'}}
+              Updated on: {{ (lastModificationDate$ | async) | date:'medium' }}
             </span>
             <ng-template #noModificationDate>
               <span class="note warning">
@@ -53,7 +53,7 @@
               mat-button
               *ngIf="(currentOntology$ | async) as currentOntology"
               [disabled]="((lastModificationDate$ | async | isFalsy) || (currentOntologyCanBeDeleted$ | async) === false) || ((isAdmin$ | async) === false)"
-              (click)="$event.stopPropagation(); delete('Ontology', {iri: currentOntology.id, label: currentOntology.label})">
+              (click)="$event.stopPropagation(); deleteOntology()">
               <mat-icon>delete</mat-icon>
               Delete
             </button>
@@ -63,7 +63,6 @@
     </mat-toolbar>
 
     <mat-sidenav-container
-      #ontologyEditor
       *ngIf="(isLoading$ | async) === false && (view === 'classes' || view === 'properties')"
       class="ontology-editor-container">
       <mat-sidenav class="ontology-editor-sidenav" mode="side" position="end" opened>
@@ -74,8 +73,8 @@
               mat-button
               (click)="expandClasses = !expandClasses"
               [disabled]="!ontoClasses || !ontoClasses.length">
-              <mat-icon>{{expandClasses ? 'compress' : 'expand'}}</mat-icon>
-              {{expandClasses ? "Collapse all" : "Expand all"}}
+              <mat-icon>{{ expandClasses ? 'compress' : 'expand' }}</mat-icon>
+              {{ expandClasses ? "Collapse all" : "Expand all" }}
             </button>
             <span
               mat-list-item
@@ -96,7 +95,8 @@
                   mat-menu-item
                   *ngFor="let type of defaultClasses; trackBy: trackByDefaultClassFn"
                   (click)="createResourceClass(type)">
-                  <mat-icon>{{type.icons[0]}}</mat-icon> {{ type.label }}
+                  <mat-icon>{{ type.icons[0] }}</mat-icon>
+                  {{ type.label }}
                 </button>
               </mat-menu>
             </span>
@@ -126,7 +126,9 @@
             </button>
             <mat-menu #addPropertyMenu="matMenu" xPosition="before" class="switch-nested-menu">
               <ng-container *ngFor="let type of defaultProperties; trackBy: trackByPropertyCategoryFn">
-                <button mat-menu-item [matMenuTriggerFor]="sub_menu" [attr.data-cy]="type.group">{{type.group}}</button>
+                <button mat-menu-item [matMenuTriggerFor]="sub_menu" [attr.data-cy]="type.group">
+                  {{ type.group }}
+                </button>
                 <mat-menu #sub_menu="matMenu" class="switch-nested-sub-menu">
                   <button
                     mat-menu-item
@@ -136,7 +138,8 @@
                     [matTooltip]="ele.description"
                     matTooltipPosition="before"
                     (click)="openPropertyForm('createProperty', {propType: ele})">
-                    <mat-icon>{{ele.icon}}</mat-icon> {{ele.label}}
+                    <mat-icon>{{ ele.icon }}</mat-icon>
+                    {{ ele.label }}
                   </button>
                 </mat-menu>
               </ng-container>
@@ -156,8 +159,8 @@
             [expanded]="expandClasses"
             [userCanEdit]="isAdmin$ | async"
             (editResourceClass)="updateResourceClass($event)"
-            (deleteResourceClass)="delete('ResourceClass', $event)"
-            (updatePropertyAssignment)="onUpdatePropertyAssignment()"
+            (deleteResourceClass)="deleteResourceClass($event.iri)"
+            (updatePropertyAssignment)="initOntologiesList()"
             [updatePropertyAssignment$]="updatePropertyAssignment$">
           </app-resource-class-info>
         </div>
@@ -169,16 +172,16 @@
               *ngFor="let prop of ontoProperties?.properties; trackBy: trackByPropertyDefinitionFn; let odd = odd"
               [class.odd]="odd">
               <!-- display only properties with guiOrder and if they exist in list of properties;
-                                 if objectType is a linkValue hide it (otherwise we have the property twice) -->
+                                                                                                                     if objectType is a linkValue hide it (otherwise we have the property twice) -->
               <app-property-info
                 [propDef]="(currentOntology$ | async)?.properties[prop.id]"
                 [projectUuid]="projectUuid"
                 [projectStatus]="(project$ | async)?.status"
                 [lastModificationDate]="lastModificationDate$ | async"
-                (lastModificationDate)="onLastModificationDateChange($event)"
+                (lastModificationDate)="onLastModificationDateChange()"
                 [userCanEdit]="isAdmin$ | async"
                 (editResourceProperty)="openPropertyForm('editProperty', $event)"
-                (deleteResourceProperty)="delete('Property', $event)">
+                (deleteResourceProperty)="deleteProperty($event.iri)">
               </app-property-info>
             </mat-list-item>
           </mat-list>