From 5d877254273d36fc43d4503624f7197ac0252003 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 19 Dec 2023 13:14:03 -0800 Subject: [PATCH] Re-apply control flow changes after merge of `dev` --- .../preview-popup.component.html | 44 +- .../saved-view-widget.component.html | 101 ++-- .../document-detail.component.html | 501 ++++++++++-------- .../document-card-large.component.html | 202 +++---- 4 files changed, 469 insertions(+), 379 deletions(-) diff --git a/src-ui/src/app/components/common/preview-popup/preview-popup.component.html b/src-ui/src/app/components/common/preview-popup/preview-popup.component.html index 71c3faf1b..a35029a2e 100644 --- a/src-ui/src/app/components/common/preview-popup/preview-popup.component.html +++ b/src-ui/src/app/components/common/preview-popup/preview-popup.component.html @@ -1,22 +1,28 @@
-
-

Error loading preview

+ @if (error) { +
+

Error loading preview

- - - -
- - - -
- - - - + } @else { + @if (renderAsObject) { + + } @else { + @if (requiresPassword) { +
+ + + +
+ } + @if (!requiresPassword) { + + + } + } + }
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index 5c1eb6864..9102800f4 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -3,54 +3,63 @@ [title]="savedView.name" [loading]="loading" [draggable]="savedView" -> + > - Show all + @if (documents.length) { + Show all + } - - - - - - - - - - - - - - - - - -
CreatedTitleTagsCorrespondent
{{doc.created_date | customDate}} - {{doc.title | documentTitle}} - - - - {{(doc.correspondent$ | async)?.name}} -
- - - - - - - - - - - - - -
-
- - + @if (documents.length) { + + + + + + + + + + + @for (doc of documents; track doc) { + + + + + + + } + +
CreatedTitleTagsCorrespondent
{{doc.created_date | customDate}} + {{doc.title | documentTitle}} + + @for (t of doc.tags$ | async; track t) { + + } + + @if (doc.correspondent !== null) { + {{(doc.correspondent$ | async)?.name}} + } +
+ + + + + + + + + + + + + +
+
+ } @else {

No documents

- + } + diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index 3211e60ed..3cd12201a 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -1,43 +1,47 @@ - -
-
Page
- -
of {{previewNumPages}}
-
-
- - - -
- + @if (getContentType() === 'application/pdf' && !useNativePdfViewer) { +
+
Page
+ +
of {{previewNumPages}}
+
+
+ + + +
+ } -
- - - - Download + + + + Download -
+ @if (metadata?.has_archive_version) { +
- Download original + Download original
-
-
+
+ } +
-
+
+ - -
-
+ + More like this + +
+ - - + + - - + + -
-
+
+
-
+ -
+
- - - + + +
-
+
-
    +
    • - Details - -
      - - - - - - - - -
      - - - - - - - - -
      -       + Details + +
      + + + + + + + + @for (fieldInstance of document?.custom_fields; track fieldInstance; let i = $index) { +
      + @switch (getCustomFieldFromInstance(fieldInstance)?.data_type) { + @case (PaperlessCustomFieldDataType.String) { + + } + @case (PaperlessCustomFieldDataType.Date) { + + } + @case (PaperlessCustomFieldDataType.Integer) { + + } + @case (PaperlessCustomFieldDataType.Float) { + + } + @case (PaperlessCustomFieldDataType.Monetary) { + + } + @case (PaperlessCustomFieldDataType.Boolean) { + + } + @case (PaperlessCustomFieldDataType.Url) { + + } + @case (PaperlessCustomFieldDataType.DocumentLink) { + + } + }
      + } +
      -
      - -
      -       +
      + +
      +
    • - Content - -
      - -
      -       + Content + +
      + +
      +
    • - Metadata - + Metadata + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      Date modified{{document.modified | customDate}}
      Date added{{document.added | customDate}}
      Media filename{{metadata?.media_filename}}
      Original filename{{metadata?.original_filename}}
      Original MD5 checksum{{metadata?.original_checksum}}
      Original file size{{metadata?.original_size | fileSize}}
      Original mime type{{metadata?.original_mime_type}}
      Archive MD5 checksum{{metadata?.archive_checksum}}
      Archive file size{{metadata?.archive_size | fileSize}}
      + @if (document) { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @if (metadata?.has_archive_version) { + + + + + } + @if (metadata?.has_archive_version) { + + + + + } + +
      Date modified{{document.modified | customDate}}
      Date added{{document.added | customDate}}
      Media filename{{metadata?.media_filename}}
      Original filename{{metadata?.original_filename}}
      Original MD5 checksum{{metadata?.original_checksum}}
      Original file size{{metadata?.original_size | fileSize}}
      Original mime type{{metadata?.original_mime_type}}
      Archive MD5 checksum{{metadata?.archive_checksum}}
      Archive file size{{metadata?.archive_size | fileSize}}
      + } - - + @if (metadata?.original_metadata?.length > 0) { + + } + @if (metadata?.archive_metadata?.length > 0) { + + } -       +
    • - Preview - - - -
      • - -
    • - Notes {{document.notes.length}} + Preview + @if (!pdfPreview.offsetParent) { - + + }
      • -
    • + @if (notesEnabled) { +
    • + Notes @if (document?.notes.length) { +{{document.notes.length}} +} + + + +
      • + } + + @if (showPermissions) { +
    • Permissions -
      - -
      +
      + +
      -
      • -
    + + } +
-
+
-
-
- -
- - -
- -
-
-
+
+ +
+ + @if (renderAsPlainText) { +
+ } + @if (requiresPassword) { +
+
+ +
+
+ } +
+
-
-
+ +
+ + + @if (hasNext()) { + + } + @if (!hasNext()) { + + } + + +
+ - -
- - - - - - -
- - - -
-
- - Loading... -
-
- -
- - -
- - - - - -
- -
-
- -
-
- + + @if (!metadata) { +
+
+ + Loading... +
+
+ } + @if (getContentType() === 'application/pdf') { + @if (!useNativePdfViewer ) { +
+ + +
+ } @else { + + } + } + @if (renderAsPlainText) { +
+ } + @if (showPasswordField) { +
+
+ +
+
+ } + 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 b59c934f2..ae25938c7 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,85 +53,97 @@ -  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.__search_hit__?.score) { +
+ Score: + +
+ } +
+
+
- -
- - - - {{document.created_date | customDate:'mediumDate'}} -
-
- - - - {{document.owner | username}} -
-
- Score: -
- - - - -