From 0a60dd3202b814de660a16cb023e13a90e4febc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Marie=CC=81thoz?= Date: Tue, 7 Jan 2025 14:46:29 +0100 Subject: [PATCH] primeng: admin entities MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-by: Johnny Mariéthoz Co-Authored-by: Bertrand Zuchuat --- projects/admin/src/app/app.component.html | 88 +++++++-------- .../app/menu/menu-app/menu-app.component.html | 4 +- .../menu-dashboard.component.html | 16 ++- .../entities-local-detail-view.component.html | 34 +++--- .../local/entities-local-global.component.ts | 2 +- ...al-organisation-detail-view.component.html | 4 +- .../local-page-detail.component.html | 37 ++++--- .../local-person-detail-view.component.html | 2 +- .../local-place-detail-view.component.html | 2 +- .../local-topic-detail-view.component.html | 6 +- ...entities-remote-detail-view.component.html | 102 +++++++++--------- ...entities-remote-detail-view.component.scss | 5 + ...es-organisation-detail-view.component.html | 6 +- .../remote-page-detail.component.html | 28 ++--- ...entities-person-detail-view.component.html | 6 +- .../remote-topic-detail-view.component.html | 24 +++-- .../document-record-search.component.html | 1 - projects/admin/src/app/scss/styles.scss | 5 + .../core/brief-view/brief-view.component.html | 16 ++- .../entity-brief-view.component.ts | 4 +- 20 files changed, 207 insertions(+), 185 deletions(-) create mode 100644 projects/admin/src/app/record/detail-view/entities-detail-view/remote/entities-remote-detail-view.component.scss diff --git a/projects/admin/src/app/app.component.html b/projects/admin/src/app/app.component.html index 39310c5bd..5bd039d85 100644 --- a/projects/admin/src/app/app.component.html +++ b/projects/admin/src/app/app.component.html @@ -14,62 +14,52 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> - +

Loading…

 -@if (user) { -
-
+@if (user?.hasAdminUiAccess) { +
+ +
+
+ + +
+
+ {{ message.summary }}
- - - - -
- } @else { - -
-

Permission required

- {{ 'You do not have sufficient permissions to view this page' | translate }} -
- } - - +

+
+ + + + + +} @else { +
+

Permission required

+ {{ 'You do not have sufficient permissions to view this page' | translate }} +
} - - + diff --git a/projects/admin/src/app/menu/menu-app/menu-app.component.html b/projects/admin/src/app/menu/menu-app/menu-app.component.html index d28df2b90..325ca7539 100644 --- a/projects/admin/src/app/menu/menu-app/menu-app.component.html +++ b/projects/admin/src/app/menu/menu-app/menu-app.component.html @@ -27,11 +27,11 @@ @if (item.icon) { } - {{ item.label }} + {{ item.label }} @if (item.shortcut) { {{ item.shortcut }} - + } @if (item.items) { diff --git a/projects/admin/src/app/menu/menu-dashboard/menu-dashboard.component.html b/projects/admin/src/app/menu/menu-dashboard/menu-dashboard.component.html index 3e9cc7d19..94218d58e 100644 --- a/projects/admin/src/app/menu/menu-dashboard/menu-dashboard.component.html +++ b/projects/admin/src/app/menu/menu-dashboard/menu-dashboard.component.html @@ -14,20 +14,19 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> -
+
@for (item of items; track item) { -
- + -
+
@if (item.icon) { - + } - {{ item.label }} + {{ item.label }}
@for (menuItem of item.items; track menuItem) { - + } - {{ item.label }} + {{ item.label }} @if (item.shortcut) { {{ item.shortcut }} @@ -54,6 +53,5 @@ } -
}
diff --git a/projects/admin/src/app/record/detail-view/entities-detail-view/local/entities-local-detail-view.component.html b/projects/admin/src/app/record/detail-view/entities-detail-view/local/entities-local-detail-view.component.html index 703f41b5a..263d5eaed 100644 --- a/projects/admin/src/app/record/detail-view/entities-detail-view/local/entities-local-detail-view.component.html +++ b/projects/admin/src/app/record/detail-view/entities-detail-view/local/entities-local-detail-view.component.html @@ -16,43 +16,45 @@ along with this program. If not, see . --> @if (record$ | async; as record) { -

- +

+ {{ $any(record).metadata.authorized_access_point }}

{{ 'Local ID' | translate }}: {{ $any(record).metadata.pid }} - Local + -
-
- {{ 'local' | translate | uppercase }} -
-
+ + + +
{{ 'local' | translate | uppercase }}
+ +
@switch ($any(record).metadata.type) { @case (entityType.ORGANISATION) { - + } @case (entityType.PERSON) { - + } @case (entityType.PLACE) { - + } @case (entityType.TEMPORAL) { - + } @case (entityType.TOPIC) { - + } @case (entityType.WORK) { - + } @default { {{ 'Missing template for this entity type:' | translate }} {{ $any(record).metadata.type }} } } -
-
+
+ + } diff --git a/projects/admin/src/app/record/detail-view/entities-detail-view/local/entities-local-global.component.ts b/projects/admin/src/app/record/detail-view/entities-detail-view/local/entities-local-global.component.ts index 655dcdee0..1f31771b0 100644 --- a/projects/admin/src/app/record/detail-view/entities-detail-view/local/entities-local-global.component.ts +++ b/projects/admin/src/app/record/detail-view/entities-detail-view/local/entities-local-global.component.ts @@ -20,7 +20,7 @@ import { Component, Input } from '@angular/core'; @Component({ selector: 'admin-entities-local-global', template: ` -
+
@if (record.source_catalog) {
Source catalog
diff --git a/projects/admin/src/app/record/detail-view/entities-detail-view/local/local-organisation-detail-view/local-organisation-detail-view.component.html b/projects/admin/src/app/record/detail-view/entities-detail-view/local/local-organisation-detail-view/local-organisation-detail-view.component.html index 71005ca37..70d7aa782 100644 --- a/projects/admin/src/app/record/detail-view/entities-detail-view/local/local-organisation-detail-view/local-organisation-detail-view.component.html +++ b/projects/admin/src/app/record/detail-view/entities-detail-view/local/local-organisation-detail-view/local-organisation-detail-view.component.html @@ -26,7 +26,7 @@ @if (record.subordinate_unit) {
Subordinate unit
-
+ + } + } diff --git a/projects/admin/src/app/record/detail-view/entities-detail-view/remote/entities-remote-detail-view.component.scss b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/entities-remote-detail-view.component.scss new file mode 100644 index 000000000..5f03076b8 --- /dev/null +++ b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/entities-remote-detail-view.component.scss @@ -0,0 +1,5 @@ +admin-remote-entities-remote-detail-view { + dl.metadata { + @extend .p-0; + } +} diff --git a/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-organisation-detail-view/remote-entities-organisation-detail-view.component.html b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-organisation-detail-view/remote-entities-organisation-detail-view.component.html index f10d16463..fd1f763dd 100644 --- a/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-organisation-detail-view/remote-entities-organisation-detail-view.component.html +++ b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-organisation-detail-view/remote-entities-organisation-detail-view.component.html @@ -15,6 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> +
@if (record.authorized_access_point) {
Authorized access point
@@ -35,7 +36,7 @@ @if (record.language) {
Language
-
    +
      @for (language of record.language; track language) {
    • {{ ('lang_' + language) | translate }}
      • } @@ -52,10 +53,11 @@ @if (record.variant_access_point) {
      Variant name
      -
        +
          @for (variant_name of record.variant_access_point; track variant_name) {
        • {{ variant_name }}
          • }
      } +
diff --git a/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-page-detail/remote-page-detail.component.html b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-page-detail/remote-page-detail.component.html index bd01ebd25..b0acbe15a 100644 --- a/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-page-detail/remote-page-detail.component.html +++ b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-page-detail/remote-page-detail.component.html @@ -14,9 +14,8 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> -
- @if (record) { - - + - } - @if (error) { - - } - -
+} + +@if (error) { + +} + + diff --git a/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-person-detail-view/remote-entities-person-detail-view.component.html b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-person-detail-view/remote-entities-person-detail-view.component.html index 69328a0bc..d59512e5f 100644 --- a/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-person-detail-view/remote-entities-person-detail-view.component.html +++ b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-person-detail-view/remote-entities-person-detail-view.component.html @@ -15,6 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> +
@if (record.authorized_access_point) {
Authorized access point
@@ -34,7 +35,7 @@ @if (record.language) {
Language
-
    +
      @for (language of record.language; track language) {
    • {{ ('lang_' + language) | translate }}
      • } @@ -60,10 +61,11 @@ @if (record.variant_access_point) {
      Variant name
      -
        +
          @for (variant_name of record.variant_access_point; track variant_name) {
        • {{ variant_name }}
          • }
      } +
diff --git a/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-topic-detail-view/remote-topic-detail-view.component.html b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-topic-detail-view/remote-topic-detail-view.component.html index c03beb4c2..e31d7ede6 100644 --- a/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-topic-detail-view/remote-topic-detail-view.component.html +++ b/projects/admin/src/app/record/detail-view/entities-detail-view/remote/remote-topic-detail-view/remote-topic-detail-view.component.html @@ -15,6 +15,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> +
@if (record.authorized_access_point) {
Authorized access point
@@ -29,7 +30,7 @@ @if (record.variant_access_point) {
Variant access point
-
    +
      @for (variant_access_point of record.variant_access_point; track variant_access_point) {
    • {{ variant_access_point }}
      • } @@ -40,7 +41,7 @@ @if (record.broader) {
      Broader
      -
        +
          @for (broader of record.broader; track broader) {
        • {{ broader.authorized_access_point }}
          • } @@ -51,7 +52,7 @@ @if (record.narrower) {
          Narrower
          -
            +
              @for (narrower of record.narrower; track narrower) {
            • {{ narrower.authorized_access_point }}
              • } @@ -62,7 +63,7 @@ @if (record.related) {
              Related
              -
                +
                  @for (related of record.related; track related) {
                • {{ related.authorized_access_point }}
                  • } @@ -74,17 +75,17 @@ @if (record.classification) {
                  Classification
                  -
                    +
                      @for (classification of record.classification; track classification) { -
                    • +
                    • @if (classification.classificationPortion) { - {{ classification.classificationPortion }} + {{ classification.classificationPortion }} } @if (classification.name) { - {{ classification.name }} + {{ classification.name }} } @if (classification.type) { - {{ classification.type | translate }} + }
                      • } @@ -105,11 +106,12 @@ [ngTemplateOutletContext]="{ item: {match: closeMatch, title: 'Close match' | translate } }" > } +
{{ item.title }}
-
    +
      @if (item.match) { @for(match of item.match; track match) {
    • @@ -126,4 +128,4 @@ }
- \ No newline at end of file + diff --git a/projects/admin/src/app/record/search-view/document-record-search/document-record-search.component.html b/projects/admin/src/app/record/search-view/document-record-search/document-record-search.component.html index 06fdc2ec8..fd862cf66 100644 --- a/projects/admin/src/app/record/search-view/document-record-search/document-record-search.component.html +++ b/projects/admin/src/app/record/search-view/document-record-search/document-record-search.component.html @@ -15,7 +15,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> - @if (iconTemplate) {
- +
}
@if (titleTemplate) { - + } @else {
@if (link) { @@ -42,16 +45,19 @@
@if (contentTemplate) {
- +
}
@if (tagsTemplate) { - + } @else { @if (tags) { @for (tag of tags; track tag) { - + } } } diff --git a/projects/shared/src/lib/component/entities/entity-brief-view/entity-brief-view.component.ts b/projects/shared/src/lib/component/entities/entity-brief-view/entity-brief-view.component.ts index 87c9fb002..77afaa7ed 100644 --- a/projects/shared/src/lib/component/entities/entity-brief-view/entity-brief-view.component.ts +++ b/projects/shared/src/lib/component/entities/entity-brief-view/entity-brief-view.component.ts @@ -118,8 +118,10 @@ export class EntityBriefViewComponent implements ResultItem, OnInit, AfterViewIn this.routerLink = ['/records', 'local_entities', 'detail', this.record.metadata.pid]; this.tags = [ {label: this.record.metadata.resource_type, type: 'local'}, - {label: this.record.metadata?.source_catalog} ]; + if (this.record.metadata.source_catalog) { + this.tags.push({label: this.record.metadata.source_catalog}); + } } this.entityTitle = this.record.metadata.authorized_access_point; }