From e50e98c18ee31f02b4e90dc3dad3475fefb579c9 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:31:12 -0800 Subject: [PATCH] Re-apply control flow changes after merge of `dev`, again --- ...permissions-filter-dropdown.component.html | 190 ++++++++------- .../document-card-large.component.html | 216 ++++++++++-------- .../document-card-small.component.html | 110 +++++---- 3 files changed, 286 insertions(+), 230 deletions(-) diff --git a/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html b/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html index cae7fc712..4573d916b 100644 --- a/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html +++ b/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.html @@ -1,92 +1,106 @@
- -
-
- - - - - - -
-
- - -
-
+ +
+
+ + + + + + + @if (selectionModel.ownerFilter === OwnerFilterType.NONE || selectionModel.ownerFilter === OwnerFilterType.NOT_SELF) { +
+
+ + +
+
+ }
+
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index 8897f9b0b..ea2327cdd 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -16,23 +16,35 @@
- - {{(document.correspondent$ | async)?.name}} - {{(document.correspondent$ | async)?.name}}: - + @if (document.correspondent) { + @if (clickCorrespondent.observers.length ) { + {{(document.correspondent$ | async)?.name}} + } @else { + {{(document.correspondent$ | async)?.name}} + } + : + } {{document.title | documentTitle}} - + @for (t of document.tags$ | async; track t) { + + }

- - - - - - - - {{contentTrimmed}} + @if (document.__search_hit__ && document.__search_hit__.highlights) { + + } + @for (highlight of searchNoteHighlights; track highlight) { + + + + + + + } + @if (!document.__search_hit__) { + {{contentTrimmed}} + }

@@ -41,91 +53,105 @@ -  More like this - - - - -  Edit - - - - -  View - - - - - - - -  Download - -
+  More like this + + + + +  Edit + + + + +  View + + + + + + + +  Download + +
-
- - - -
- - - - #{{document.archive_serial_number}} -
- -
- Created: {{ document.created | customDate }} - Added: {{ document.added | customDate }} - Modified: {{ document.modified | customDate }} +
+ @if (notesEnabled && document.notes.length) { + + } + @if (document.document_type) { + + } + @if (document.storage_path) { + + } + @if (document.archive_serial_number | isNumber) { +
+ + + + #{{document.archive_serial_number}} +
+ } + +
+ Created: {{ document.created | customDate }} + Added: {{ document.added | customDate }} + Modified: {{ document.modified | customDate }} +
+ +
+ + + + {{document.created_date | customDate:'mediumDate'}} +
+ @if (document.owner && document.owner !== settingsService.currentUser.id) { +
+ + + + {{document.owner | username}} +
+ } + @if (document.is_shared_by_requester) { +
+ + + + Shared +
+ } + @if (document.__search_hit__?.score) { +
+ Score: + +
+ } +
+
+
- -
- - - - {{document.created_date | customDate:'mediumDate'}} -
-
- - - - {{document.owner | username}} -
-
- - - - Shared -
-
- Score: -
- - - - - diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 0cd9d593c..15290f672 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -11,45 +11,55 @@
- -
- + {{moreTags}} -
+ @for (t of getTagsLimited$() | async; track t) { + + } + @if (moreTags) { +
+ + {{moreTags}} +
+ }
- - - - - - {{document.notes.length}} - + @if (notesEnabled && document.notes.length) { + + + + + + {{document.notes.length}} + + }

- + @if (document.correspondent) { {{(document.correspondent$ | async)?.name ?? privateName}}: - + } {{document.title | documentTitle}}

- - + @if (document.document_type) { + + } + @if (document.storage_path) { + + }
@@ -65,24 +75,30 @@ {{document.created_date | customDate:'mediumDate'}}
-
- - - - #{{document.archive_serial_number}} -
-
- - - - {{document.owner | username}} -
-
- - - - Shared -
+ @if (document.archive_serial_number | isNumber) { +
+ + + + #{{document.archive_serial_number}} +
+ } + @if (document.owner && document.owner !== settingsService.currentUser.id) { +
+ + + + {{document.owner | username}} +
+ } + @if (document.is_shared_by_requester) { +
+ + + + Shared +
+ }
@@ -92,8 +108,8 @@ + [ngbPopover]="previewContent" [popoverTitle]="document.title | documentTitle" + autoClose="true" popoverClass="shadow popover-preview" (mouseenter)="mouseEnterPreview()" (mouseleave)="mouseLeavePreview()" #popover="ngbPopover">