From 3de6caf6017db961df7b4330daad95ad2b6edf5c Mon Sep 17 00:00:00 2001 From: Julien Schneider Date: Mon, 27 Jan 2025 14:57:47 +0100 Subject: [PATCH] fix: 5th change --- .../list-item-element.component.ts | 3 +-- .../list/src/lib/list-page.component.html | 3 +-- .../src/lib/multiple-viewer.component.ts | 3 +-- .../src/lib/ontology-classes.component.ts | 3 ++- .../ontology-form.component.html | 3 +-- .../ontology/src/lib/ontology.component.html | 8 +++---- .../resource-class-info-element.component.ts | 5 ++--- .../resource-class-info.component.html | 4 +--- .../src/lib/project/project.component.html | 3 +-- .../reusable-project-form.component.ts | 3 +-- .../advanced-search.component.html | 3 +-- ...ty-form-link-match-property.component.html | 3 +-- .../property-form.component.html | 6 ++--- .../fulltext-search.component.spec.ts | 3 +-- .../search-panel/search-panel.component.html | 3 +-- .../erase-project-dialog.component.html | 3 +-- .../projects-list.component.html | 3 +-- .../src/lib/projects/projects.component.html | 3 +-- .../sort-button/sort-button.component.spec.ts | 5 ++--- .../users-list/users-list.component.html | 6 ++--- .../image-settings.component.html | 6 ++--- .../password-form.component.html | 3 +-- .../lib/user-form/user-form.component.html | 3 +-- .../src/lib/archive/archive.component.html | 5 ++--- .../src/lib/document/document.component.html | 5 ++--- .../lib/resource-representation.component.ts | 22 +++++++------------ .../src/lib/property-value.component.ts | 3 +-- .../src/lib/header/header.component.html | 7 +++--- .../date-value-handler.component.html | 3 +-- .../date-value-handler.component.spec.ts | 3 +-- 30 files changed, 49 insertions(+), 87 deletions(-) diff --git a/libs/vre/pages/ontology/list/src/lib/list-item-element/list-item-element.component.ts b/libs/vre/pages/ontology/list/src/lib/list-item-element/list-item-element.component.ts index 017cead928..085f5420b7 100644 --- a/libs/vre/pages/ontology/list/src/lib/list-item-element/list-item-element.component.ts +++ b/libs/vre/pages/ontology/list/src/lib/list-item-element/list-item-element.component.ts @@ -27,8 +27,7 @@ import { ListItemService } from '../list-item/list-item.service'; *ngIf="showChildren" [projectUuid]="listItemService.projectInfos.projectIri" [rootNodeIri]="node.id" - [isAdmin]="isAdmin"> - + [isAdmin]="isAdmin" /> `, diff --git a/libs/vre/pages/ontology/list/src/lib/list-page.component.html b/libs/vre/pages/ontology/list/src/lib/list-page.component.html index 5c62802128..f837fcef10 100644 --- a/libs/vre/pages/ontology/list/src/lib/list-page.component.html +++ b/libs/vre/pages/ontology/list/src/lib/list-page.component.html @@ -57,8 +57,7 @@ *ngIf="((isListsLoading$ | async) === false) && (projectBaseService.project$ | async) as project" [rootNodeIri]="list.id" [projectUuid]="project.id" - [isAdmin]="projectBaseService.isAdmin$ | async"> - + [isAdmin]="projectBaseService.isAdmin$ | async" /> diff --git a/libs/vre/pages/ontology/ontology-classes/src/lib/multiple-viewer.component.ts b/libs/vre/pages/ontology/ontology-classes/src/lib/multiple-viewer.component.ts index 74cc797758..2e8f2855ad 100644 --- a/libs/vre/pages/ontology/ontology-classes/src/lib/multiple-viewer.component.ts +++ b/libs/vre/pages/ontology/ontology-classes/src/lib/multiple-viewer.component.ts @@ -11,8 +11,7 @@ import { SplitSize } from './split-size.interface'; - + (selectedResources)="openSelectedResources($event)" />
diff --git a/libs/vre/pages/ontology/ontology-classes/src/lib/ontology-classes.component.ts b/libs/vre/pages/ontology/ontology-classes/src/lib/ontology-classes.component.ts index ee2adb8caf..b23f9a8110 100644 --- a/libs/vre/pages/ontology/ontology-classes/src/lib/ontology-classes.component.ts +++ b/libs/vre/pages/ontology/ontology-classes/src/lib/ontology-classes.component.ts @@ -7,13 +7,14 @@ import { OntologyClassService, SortingService } from '@dasch-swiss/vre/shared/ap selector: 'app-ontology-classes', template: `
- +
`, }) export class OntologyClassesComponent { @Input({ required: true }) resClasses!: ClassDefinition[]; @Input({ required: true }) projectMember!: boolean; + get classesToDisplay(): ClassDefinition[] { const classesToDisplay = OntologyClassService.GetClassesToDisplay(this.resClasses); return this._sortingService.keySortByAlphabetical(classesToDisplay, 'label'); diff --git a/libs/vre/pages/ontology/ontology/src/lib/ontology-form/ontology-form.component.html b/libs/vre/pages/ontology/ontology/src/lib/ontology-form/ontology-form.component.html index 3d9079b09f..bbbd33c0db 100644 --- a/libs/vre/pages/ontology/ontology/src/lib/ontology-form/ontology-form.component.html +++ b/libs/vre/pages/ontology/ontology/src/lib/ontology-form/ontology-form.component.html @@ -1,7 +1,6 @@ - + [subtitle]="ontologyName ? ('form.ontology.title.edit' | translate) : ''" />
- + [updatePropertyAssignment$]="updatePropertyAssignment$" />
@@ -137,7 +136,7 @@ *ngFor="let prop of ontoProperties?.properties; trackBy: trackByPropertyDefinitionFn; let odd = odd" [class.odd]="odd"> + if objectType is a linkValue hide it (otherwise we have the property twice) --> - + (deleteResourceProperty)="deleteProperty($event.iri)" />
diff --git a/libs/vre/pages/ontology/ontology/src/lib/resource-class-info/resource-class-info-element.component.ts b/libs/vre/pages/ontology/ontology/src/lib/resource-class-info/resource-class-info-element.component.ts index bddc69ec4b..ca03a1b492 100644 --- a/libs/vre/pages/ontology/ontology/src/lib/resource-class-info/resource-class-info-element.component.ts +++ b/libs/vre/pages/ontology/ontology/src/lib/resource-class-info/resource-class-info-element.component.ts @@ -22,7 +22,7 @@ import { map, takeUntil } from 'rxjs/operators'; + objectType is not a linkValue (otherwise we have the property twice) --> - + (removePropertyFromClass)="removePropertyFromClass.emit($event)" /> `, diff --git a/libs/vre/pages/ontology/ontology/src/lib/resource-class-info/resource-class-info.component.html b/libs/vre/pages/ontology/ontology/src/lib/resource-class-info/resource-class-info.component.html index da0abe2581..c3c6f5ad90 100644 --- a/libs/vre/pages/ontology/ontology/src/lib/resource-class-info/resource-class-info.component.html +++ b/libs/vre/pages/ontology/ontology/src/lib/resource-class-info/resource-class-info.component.html @@ -51,9 +51,7 @@ [resourceClass]="resourceClass" [userCanEdit]="userCanEdit" [i]="i" - (removePropertyFromClass)="removeProperty($event, currentOntologyPropertiesToDisplay)"> - > - + (removePropertyFromClass)="removeProperty($event, currentOntologyPropertiesToDisplay)" /> - + [projectMember]="(isAdmin$ | async) || (isMember$ | async)" /> diff --git a/libs/vre/pages/project/project/src/lib/reusable-project-form/reusable-project-form.component.ts b/libs/vre/pages/project/project/src/lib/reusable-project-form/reusable-project-form.component.ts index e915058a15..2c4bda9237 100644 --- a/libs/vre/pages/project/project/src/lib/reusable-project-form/reusable-project-form.component.ts +++ b/libs/vre/pages/project/project/src/lib/reusable-project-form/reusable-project-form.component.ts @@ -41,8 +41,7 @@ import { shortcodeExistsValidator } from './shortcode-exists.validator'; - + [validators]="keywordsValidators" /> `, }) diff --git a/libs/vre/pages/search/advanced-search/src/lib/feature/advanced-search/advanced-search.component.html b/libs/vre/pages/search/advanced-search/src/lib/feature/advanced-search/advanced-search.component.html index e63a3b55d6..3ecbb0855b 100644 --- a/libs/vre/pages/search/advanced-search/src/lib/feature/advanced-search/advanced-search.component.html +++ b/libs/vre/pages/search/advanced-search/src/lib/feature/advanced-search/advanced-search.component.html @@ -33,8 +33,7 @@ - + (emitPropertyOrderByChanged)="handlePropertyOrderByChanged($event)" /> - + (emitValueChanged)="onValueChanged($event, i)" /> - + (emitValueChanged)="onValueChanged($event)" /> - + " /> diff --git a/libs/vre/pages/search/search/src/lib/fulltext-search/fulltext-search.component.spec.ts b/libs/vre/pages/search/search/src/lib/fulltext-search/fulltext-search.component.spec.ts index effaaf085c..94517f2414 100644 --- a/libs/vre/pages/search/search/src/lib/fulltext-search/fulltext-search.component.spec.ts +++ b/libs/vre/pages/search/search/src/lib/fulltext-search/fulltext-search.component.spec.ts @@ -29,8 +29,7 @@ import { FulltextSearchComponent } from './fulltext-search.component'; #fulltextSearch [projectfilter]="projectfilter" [limitToProject]="limitToProject" - (search)="emitSearch($event)"> - + (search)="emitSearch($event)" /> `, }) class TestHostFulltextSearchComponent implements OnInit { diff --git a/libs/vre/pages/search/search/src/lib/search-panel/search-panel.component.html b/libs/vre/pages/search/search/src/lib/search-panel/search-panel.component.html index fa67017211..39da42f66d 100644 --- a/libs/vre/pages/search/search/src/lib/search-panel/search-panel.component.html +++ b/libs/vre/pages/search/search/src/lib/search-panel/search-panel.component.html @@ -2,8 +2,7 @@ - + (search)="emitSearch($event)" />
diff --git a/libs/vre/pages/system/system/src/lib/projects/projects-list/erase-project-dialog/erase-project-dialog.component.html b/libs/vre/pages/system/system/src/lib/projects/projects-list/erase-project-dialog/erase-project-dialog.component.html index f7aaebdae4..727fe93382 100644 --- a/libs/vre/pages/system/system/src/lib/projects/projects-list/erase-project-dialog/erase-project-dialog.component.html +++ b/libs/vre/pages/system/system/src/lib/projects/projects-list/erase-project-dialog/erase-project-dialog.component.html @@ -1,7 +1,6 @@ - + [subtitle]="'projects.list.eraseConfirmationDialog.subtitle' | translate" />
{{ 'projects.list.eraseConfirmationDialog.warning' | translate }}
diff --git a/libs/vre/pages/system/system/src/lib/projects/projects-list/projects-list.component.html b/libs/vre/pages/system/system/src/lib/projects/projects-list/projects-list.component.html index 259cd97932..a711f13c08 100644 --- a/libs/vre/pages/system/system/src/lib/projects/projects-list/projects-list.component.html +++ b/libs/vre/pages/system/system/src/lib/projects/projects-list/projects-list.component.html @@ -17,8 +17,7 @@

[icon]="'sort_by_alpha'" [sortProps]="sortProps" [activeKey]="sortBy" - (sortKeyChange)="sortList($event)"> - + (sortKeyChange)="sortList($event)" />

{{ list.length | i18nPlural : itemPluralMapping['project'] }}

diff --git a/libs/vre/pages/system/system/src/lib/projects/projects.component.html b/libs/vre/pages/system/system/src/lib/projects/projects.component.html index 01fe12f5dc..a1856acde3 100644 --- a/libs/vre/pages/system/system/src/lib/projects/projects.component.html +++ b/libs/vre/pages/system/system/src/lib/projects/projects.component.html @@ -7,8 +7,7 @@ (refreshParent)="refresh()" [createNew]="true" [isUsersProjects]="isUsersProjects" - data-cy="active-projects-section"> - + data-cy="active-projects-section" /> - +
  • {{ item.firstname }} diff --git a/libs/vre/pages/system/system/src/lib/users/users-list/users-list.component.html b/libs/vre/pages/system/system/src/lib/users/users-list/users-list.component.html index ca99a083ae..188aefad02 100644 --- a/libs/vre/pages/system/system/src/lib/users/users-list/users-list.component.html +++ b/libs/vre/pages/system/system/src/lib/users/users-list/users-list.component.html @@ -17,8 +17,7 @@

    [icon]="'sort_by_alpha'" [sortProps]="sortProps" [activeKey]="sortBy" - (sortKeyChange)="sortList($event)"> - + (sortKeyChange)="sortList($event)" />

    {{ list.length | i18nPlural : itemPluralMapping['member'] }} @@ -72,8 +71,7 @@

    user.permissions.groupsPerProject[(project$ | async)?.id] " [disabled]="!status" - (groupChange)="updateGroupsMembership(user.id, $event)"> - + (groupChange)="updateGroupsMembership(user.id, $event)" /> diff --git a/libs/vre/pages/user-settings/settings/src/lib/image-settings/image-settings.component.html b/libs/vre/pages/user-settings/settings/src/lib/image-settings/image-settings.component.html index f14323a653..71956a5d85 100644 --- a/libs/vre/pages/user-settings/settings/src/lib/image-settings/image-settings.component.html +++ b/libs/vre/pages/user-settings/settings/src/lib/image-settings/image-settings.component.html @@ -44,10 +44,8 @@ x {{ fixedWidth }} Px
- - - - + +
diff --git a/libs/vre/pages/user-settings/user/src/lib/user-form/password-form/password-form.component.html b/libs/vre/pages/user-settings/user/src/lib/user-form/password-form/password-form.component.html index 886e3b21a2..4d0226f4e0 100644 --- a/libs/vre/pages/user-settings/user/src/lib/user-form/password-form/password-form.component.html +++ b/libs/vre/pages/user-settings/user/src/lib/user-form/password-form/password-form.component.html @@ -138,8 +138,7 @@

As system admin, please enter your password before up

diff --git a/libs/vre/pages/user-settings/user/src/lib/user-form/user-form.component.html b/libs/vre/pages/user-settings/user/src/lib/user-form/user-form.component.html index 984fbae4d3..684508d38b 100644 --- a/libs/vre/pages/user-settings/user/src/lib/user-form/user-form.component.html +++ b/libs/vre/pages/user-settings/user/src/lib/user-form/user-form.component.html @@ -1,7 +1,6 @@ - + [subtitle]="editExistingUser ? ('form.user.title.edit' | translate) : ('form.user.title.new' | translate)" />
- - +
- description + description

{{ originalFilename }}

diff --git a/libs/vre/resource-editor/representations/src/lib/document/document.component.html b/libs/vre/resource-editor/representations/src/lib/document/document.component.html index 23ffef2d38..108ccb2ffc 100644 --- a/libs/vre/resource-editor/representations/src/lib/document/document.component.html +++ b/libs/vre/resource-editor/representations/src/lib/document/document.component.html @@ -1,7 +1,6 @@
- - +
- text_snippet + text_snippet

{{ originalFilename }}

diff --git a/libs/vre/resource-editor/resource-editor/src/lib/resource-representation.component.ts b/libs/vre/resource-editor/resource-editor/src/lib/resource-representation.component.ts index 222ba49695..fc9779bbbb 100644 --- a/libs/vre/resource-editor/resource-editor/src/lib/resource-representation.component.ts +++ b/libs/vre/resource-editor/resource-editor/src/lib/resource-representation.component.ts @@ -1,15 +1,14 @@ import { Component, Input, OnChanges } from '@angular/core'; -import { ReadProject } from '@dasch-swiss/dsp-js'; -import { ResourceSelectors, UserSelectors } from '@dasch-swiss/vre/core/state'; +import { UserSelectors } from '@dasch-swiss/vre/core/state'; import { FileRepresentation, - RepresentationConstants, getFileValue, + RepresentationConstants, } from '@dasch-swiss/vre/resource-editor/representations'; import { DspResource } from '@dasch-swiss/vre/shared/app-common'; import { ProjectService } from '@dasch-swiss/vre/shared/app-helper-services'; import { Store } from '@ngxs/store'; -import { Observable, combineLatest } from 'rxjs'; +import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @Component({ @@ -34,8 +33,7 @@ import { map } from 'rxjs/operators'; [class.pdf]="representationToDisplay.fileValue.filename.split('.').pop() === 'pdf'" *ngSwitchCase="representationConstants.document" [src]="representationToDisplay" - [parentResource]="resource.res"> - + [parentResource]="resource.res" /> - + [isAdmin]="isAdmin$ | async" /> - + [isAdmin]="isAdmin$ | async" /> - + [parentResource]="resource.res" /> - + [parentResource]="resource.res" />
`, }) export class ResourceRepresentationComponent implements OnChanges { diff --git a/libs/vre/resource-editor/resource-properties/src/lib/property-value.component.ts b/libs/vre/resource-editor/resource-properties/src/lib/property-value.component.ts index 01867bd700..50a8b0fa61 100644 --- a/libs/vre/resource-editor/resource-properties/src/lib/property-value.component.ts +++ b/libs/vre/resource-editor/resource-properties/src/lib/property-value.component.ts @@ -49,8 +49,7 @@ import { propertiesTypeMapping } from './resource-payloads-mapping'; - - +
@@ -19,8 +19,7 @@ - - + @@ -33,4 +32,4 @@ - + diff --git a/libs/vre/ui/date-picker/src/lib/date-value-handler/date-value-handler.component.html b/libs/vre/ui/date-picker/src/lib/date-value-handler/date-value-handler.component.html index 650c9bbae6..817f173397 100644 --- a/libs/vre/ui/date-picker/src/lib/date-value-handler/date-value-handler.component.html +++ b/libs/vre/ui/date-picker/src/lib/date-value-handler/date-value-handler.component.html @@ -22,8 +22,7 @@ class="end-date" [formControlName]="'endDate'" [disableCalendarSelector]="true" - [calendar]="startDate.value.calendar"> - + [calendar]="startDate.value.calendar" />
diff --git a/libs/vre/ui/date-picker/src/lib/date-value-handler/date-value-handler.component.spec.ts b/libs/vre/ui/date-picker/src/lib/date-value-handler/date-value-handler.component.spec.ts index 2795908d54..6f0245001b 100644 --- a/libs/vre/ui/date-picker/src/lib/date-value-handler/date-value-handler.component.spec.ts +++ b/libs/vre/ui/date-picker/src/lib/date-value-handler/date-value-handler.component.spec.ts @@ -51,8 +51,7 @@ class TestHostComponent implements OnInit { */ @Component({ template: `
- - +
`, }) class NoValueRequiredTestHostComponent implements OnInit {