From 0d7474d4afb32d1794ffc8916f6643a98a63cd59 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 13 Dec 2023 23:28:08 -0800 Subject: [PATCH] Update Angular control flow --- src-ui/angular.json | 6 +- src-ui/src/app/app.component.html | 52 +- .../components/admin/logs/logs.component.html | 42 +- .../admin/settings/settings.component.html | 346 ++++++------ .../admin/tasks/tasks.component.html | 266 +++++---- .../users-groups/users-groups.component.html | 169 +++--- .../app-frame/app-frame.component.html | 529 +++++++++--------- .../clearable-badge.component.html | 18 +- .../confirm-dialog.component.html | 52 +- .../date-dropdown.component.html | 82 +-- ...mption-template-edit-dialog.component.html | 154 ++--- .../correspondent-edit-dialog.component.html | 8 +- .../custom-field-edit-dialog.component.html | 4 +- .../document-type-edit-dialog.component.html | 46 +- .../mail-account-edit-dialog.component.html | 8 +- .../mail-rule-edit-dialog.component.html | 12 +- .../storage-path-edit-dialog.component.html | 8 +- .../tag-edit-dialog.component.html | 52 +- .../filterable-dropdown.component.html | 76 +-- .../toggleable-dropdown-button.component.html | 23 +- .../common/input/check/check.component.html | 36 +- .../common/input/color/color.component.html | 40 +- .../common/input/date/date.component.html | 68 ++- .../document-link.component.html | 62 +- .../common/input/number/number.component.html | 34 +- .../input/password/password.component.html | 16 +- .../permissions-form.component.html | 106 ++-- .../common/input/select/select.component.html | 112 ++-- .../common/input/select/select.component.ts | 2 +- .../common/input/tags/tags.component.html | 50 +- .../common/input/text/text.component.html | 28 +- .../common/input/url/url.component.html | 18 +- .../page-header/page-header.component.html | 4 +- .../permissions-dialog.component.html | 38 +- ...permissions-filter-dropdown.component.html | 168 +++--- .../permissions-select.component.html | 32 +- .../profile-edit-dialog.component.html | 92 +-- .../share-links-dropdown.component.html | 124 ++-- .../components/common/tag/tag.component.html | 24 +- .../common/toasts/toasts.component.html | 99 ++-- .../common/toasts/toasts.component.ts | 2 +- .../dashboard/dashboard.component.html | 38 +- .../saved-view-widget.component.html | 101 ++-- .../statistics-widget.component.html | 104 ++-- .../upload-file-widget.component.html | 78 ++- .../widget-frame/widget-frame.component.html | 16 +- .../document-detail.component.html | 487 ++++++++-------- .../metadata-collapse.component.html | 28 +- .../bulk-editor/bulk-editor.component.html | 254 ++++----- .../document-card-large.component.html | 202 ++++--- .../document-card-small.component.html | 96 ++-- .../document-list.component.html | 368 ++++++------ .../filter-editor.component.html | 46 +- .../save-view-config-dialog.component.html | 12 +- .../document-notes.component.html | 42 +- .../consumption-templates.component.html | 76 +-- .../custom-fields.component.html | 72 +-- .../manage/mail/mail.component.html | 184 +++--- .../management-list.component.html | 217 +++---- 59 files changed, 3028 insertions(+), 2501 deletions(-) diff --git a/src-ui/angular.json b/src-ui/angular.json index 9a73922c7..ad328c072 100644 --- a/src-ui/angular.json +++ b/src-ui/angular.json @@ -125,18 +125,18 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "paperless-ui:build:en-US" + "buildTarget": "paperless-ui:build:en-US" }, "configurations": { "production": { - "browserTarget": "paperless-ui:build:production" + "buildTarget": "paperless-ui:build:production" } } }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "paperless-ui:build" + "buildTarget": "paperless-ui:build" } }, "test": { diff --git a/src-ui/src/app/app.component.html b/src-ui/src/app/app.component.html index ef2addf2c..5ffe4aebe 100644 --- a/src-ui/src/app/app.component.html +++ b/src-ui/src/app/app.component.html @@ -1,32 +1,36 @@ - - - + + + - -

-
-
- {{ tourService.steps?.indexOf(step) + 1 }} / {{ tourService.steps?.length }} - + +

+
+
+ {{ tourService.steps?.indexOf(step) + 1 }} / {{ tourService.steps?.length }} + +
+ diff --git a/src-ui/src/app/components/admin/logs/logs.component.html b/src-ui/src/app/components/admin/logs/logs.component.html index 628886c62..bf100b19c 100644 --- a/src-ui/src/app/components/admin/logs/logs.component.html +++ b/src-ui/src/app/components/admin/logs/logs.component.html @@ -6,25 +6,35 @@
    -
  • - - {{logFile}}.log - -
    • -
    - - Loading... -
    + @for (logFile of logFiles; track logFile) { +
  • + + {{logFile}}.log + +
    • + } + @if (isLoading || !logFiles.length) { +
    + + @if (!logFiles.length) { + Loading... + } +
    + }
-
- - Loading... -
-

{{log}}

+ @if (isLoading && logFiles.length) { +
+ + Loading... +
+ } + @for (log of logs; track log) { +

{{log}}

+ }
diff --git a/src-ui/src/app/components/admin/settings/settings.component.html b/src-ui/src/app/components/admin/settings/settings.component.html index 7d09a8b61..07b062a00 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.html +++ b/src-ui/src/app/components/admin/settings/settings.component.html @@ -1,10 +1,10 @@ - Open Django Admin - - - + Open Django Admin + + + @@ -24,10 +24,16 @@
- You need to reload the page after applying a new language. + @if (displayLanguageIsDirty) { + You need to reload the page after applying a new language. + }
@@ -39,7 +45,11 @@
@@ -127,198 +137,202 @@ + Reset + + - -

Update checking

+

Update checking

-
-
-

+

+
+

Update checking works by pinging the public GitHub API for the latest release to determine whether a new version is available.
Actual updating of the app must still be performed manually.

-

+

No tracking data is collected by the app in any way.

- + +
-
-

Bulk editing

+

Bulk editing

-
-
- - +
+
+ + +
-
-

Notes

+

Notes

-
-
- +
+
+ +
-
- - + + -
  • - Permissions - +
  • + Permissions + -

    Default Permissions

    +

    Default Permissions

    -
    -
    -

    +

    +
    +

    Settings apply to this user account for objects (Tags, Mail Rules, etc.) created via the web UI

    -
    -
    -
    -
    - Default Owner -
    -
    - - Objects without an owner can be viewed and edited by all users -
    -
    -
    -
    - Default View Permissions -
    -
    -
    -
    - Users: -
    -
    - - - -
    -
    -
    -
    - Groups: -
    -
    - - - -
    -
    -
    -
    - Default Edit Permissions -
    -
    -
    -
    - Users: -
    -
    - - - -
    +
    +
    + Default Owner
    -
    -
    - Groups: -
    -
    - - - -
    -
    -
    - Edit permissions also grant viewing permissions +
    + + Objects without an owner can be viewed and edited by all users
    -
    - -
    • - -
  • - Notifications - - -

    Document processing

    - -
    -
    - - - - -
    -
    - -     -
    • - -
  • - Saved views - - -

    Settings

    -
    -
    - -
    -
    - -

    Views

    -
    - -
    -
    - - -
    - -
    - -
    - - +
    +
    + Default View Permissions +
    +
    +
    +
    + Users:
    -
    - - +
    + + +
    - -
    - - +
    +
    + Groups: +
    +
    + + + +
    - -
    No saved views defined.
    - -
    - - +
    +
    +
    + Default Edit Permissions
    +
    +
    +
    + Users: +
    +
    + + + +
    +
    +
    +
    + Groups: +
    +
    + + + +
    +
    +
    + Edit permissions also grant viewing permissions +
    +
    +
    + +
    • -
    +
  • + Notifications + - -
    • - +

    Document processing

    -
    +
    +
    + + + + +
    +
    - - + + + +
  • + Saved views + + +

    Settings

    +
    +
    + +
    +
    + +

    Views

    +
    + + @for (view of savedViews; track view) { +
    +
    + + +
    +
    + +
    + + +
    +
    + + +
    +
    +
    + + +
    +
    + } + + @if (savedViews && savedViews.length === 0) { +
    No saved views defined.
    + } + + @if (!savedViews) { +
    + + +
    + } + +
    + +     +
    • + + +
    + + + diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.html b/src-ui/src/app/components/admin/tasks/tasks.component.html index 7e0ac4cae..6531f146a 100644 --- a/src-ui/src/app/components/admin/tasks/tasks.component.html +++ b/src-ui/src/app/components/admin/tasks/tasks.component.html @@ -3,127 +3,153 @@ - -
    - - -
    -
    - +  Clear selection + + +
    + + +
    +
    + - - - - + @if (!tasksService.completedFileTasks && tasksService.loading) { + + + } - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - -
    -     		NameCreatedResultsInfoActions
    -
    - - -
    -     		{{ task.task_file_name }}{{ task.date_created | customDate:'short' }} -
    - {{ task.result | slice:0:50 }}… -
    - {{ task.result }} - - 
    {{ task.result | slice:0:300 }}…
    -
    (click for full output)     -     -     		- - -
    - - - - -
    -
    - 
    {{ task.result }}
    -
    + + + + + + + + @if (activeTab !== 'started' && activeTab !== 'queued') { + + } + + + + + + @for (task of tasks | slice: (page-1) * pageSize : page * pageSize; track task) { + + + + + @if (activeTab !== 'started' && activeTab !== 'queued') { + + } + + + + + + + } + +
    +
    + + +
    +     		NameCreatedResultsInfoActions
    +
    + + +
    +     		{{ task.task_file_name }}{{ task.date_created | customDate:'short' }} + @if (task.result?.length > 50) { +
    + {{ task.result | slice:0:50 }}… +
    + } + @if (task.result?.length <= 50) { + {{ task.result }} + } + + 
    {{ task.result | slice:0:300 }}@if (task.result.length > 300) {
+                      …
+                    }
    + @if (task.result?.length > 300) { +
    (click for full output) + } +     +     		+ + +
    + + + @if (task.related_document) { + + } + +
    +
    + 
    {{ task.result }}
    +
    -
    -
    {tasks.length, plural, =1 {One {{this.activeTabLocalized}} task} other {{{tasks.length || 0}} total {{this.activeTabLocalized}} tasks}}
    - -
    -     +
    + @if (tasks.length > 0) { +
    {tasks.length, plural, =1 {One {{this.activeTabLocalized}} task} other {{{tasks.length || 0}} total {{this.activeTabLocalized}} tasks}}
    + } + @if (tasks.length > pageSize) { + + } +
    +     - -
    + +
    diff --git a/src-ui/src/app/components/admin/users-groups/users-groups.component.html b/src-ui/src/app/components/admin/users-groups/users-groups.component.html index 66dc35d89..ce794f873 100644 --- a/src-ui/src/app/components/admin/users-groups/users-groups.component.html +++ b/src-ui/src/app/components/admin/users-groups/users-groups.component.html @@ -1,97 +1,104 @@ - -

    - Users - -

    -
      -
    • +@if (users) { +

      + Users + +

      +
        +
      • +
        +
        Username
        +
        Name
        +
        Groups
        +
        Actions
        +
        +
        • + @for (user of users; track user) { +
      • -
        Username
        -
        Name
        -
        Groups
        -
        Actions
        -
        -
        • - -
      • -
        -
        -
        {{user.first_name}} {{user.last_name}}
        -
        {{user.groups?.map(getGroupName, this).join(', ')}}
        -
        +
        +
        {{user.first_name}} {{user.last_name}}
        +
        {{user.groups?.map(getGroupName, this).join(', ')}}
        +
        - + +
        +
        -
        - -
        • -
      - +
      • + } +
    + } - -

    + @if (groups) { +

    Groups -

    -
      -
    • -
      -
      Name
      -
      -
      -
      Actions
      -
      -
      • - -
    • -
      -
      -
      -
      -
      -
      -
      +
      +
      +
      +
      + - -
      -
      -
      -
      • -
    • No groups defined
      • -
    +  Edit + + + + + + + } + @if (groups.length === 0) { +
  • No groups defined
    • + } + + } + } -     - -
    - - -
    + @if (!users || !groups) { +
    + + +
    + } diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 556252670..dc34fef8c 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -17,11 +17,13 @@ - + @if (!searchFieldEmpty) { + + } - - -
    -
    - + +
    +
    + +

    + + @if (settingsService.updateCheckingIsSet) { + @if (appRemoteVersion.update_available) { + + + + + @if (appRemoteVersion?.update_available) { + Update available + } + + } + } @else { + + + + + + } +
    + } +
    + + +
    + -
    - -
    -
    - +
    + +
    + + diff --git a/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.html b/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.html index 57b3ba39a..6425c63e5 100644 --- a/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.html +++ b/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.html @@ -1,9 +1,15 @@ - + +} diff --git a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html index 2b60ff9de..bb5577061 100644 --- a/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html +++ b/src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.html @@ -1,24 +1,32 @@ -
    - - -
    -
    -

    {{messageBold}}

    -

    -
    -
    - +
    +
    + @if (messageBold) { +

    {{messageBold}}

    + } + @if (message) { +

    + } +
    +
    + - - -
    + + @if (alternativeBtnCaption) { + + } + diff --git a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html index 2b5804829..f3ac1ed77 100644 --- a/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html +++ b/src-ui/src/app/components/common/date-dropdown/date-dropdown.component.html @@ -1,15 +1,18 @@ -
    +
    - -
    diff --git a/src-ui/src/app/components/common/edit-dialog/consumption-template-edit-dialog/consumption-template-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/consumption-template-edit-dialog/consumption-template-edit-dialog.component.html index f537527eb..050a2068c 100644 --- a/src-ui/src/app/components/common/edit-dialog/consumption-template-edit-dialog/consumption-template-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/consumption-template-edit-dialog/consumption-template-edit-dialog.component.html @@ -1,93 +1,95 @@
    -
    - - -
    -
    -
    -
    - -
    -
    - -
    +
    + + +
    +
    +
    +
    +
    -
    -
    -
    Filters
    -

    Process documents that match all filters specified below.

    - - - - -
    -
    -
    -
    -
    Assignments
    -
    +
    + +
    +
    +
    +
    +
    Filters
    +

    Process documents that match all filters specified below.

    + + + + +
    +
    +
    +
    +
    Assignments
    -
    -
    - - - - - - +
    +
    +
    + + + + + +
    -
    - -
    -
    -
    - -
    -
    - -
    +
    + +
    +
    +
    +
    -
    -
    - -
    -
    - -
    +
    +
    - -
    -
    -
    - -
    -
    - -
    +
    +
    +
    -
    -
    - -
    -
    - -
    +
    +
    - Edit permissions also grant viewing permissions
    + +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + Edit permissions also grant viewing permissions +
    +
    -
    -
    - Error: {{error.non_field_errors}} - - -
    - +
    +
    + @if (error?.non_field_errors) { + Error: {{error.non_field_errors}} + } + + +
    + diff --git a/src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html index 7bb192a90..72541e7c0 100644 --- a/src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html @@ -8,8 +8,12 @@ - - + @if (patternRequired) { + + } + @if (patternRequired) { + + }
    diff --git a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.html index 63f235b43..25bddad76 100644 --- a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.html @@ -7,7 +7,9 @@
    - Data type cannot be changed after a field is created + @if (typeFieldDisabled) { + Data type cannot be changed after a field is created + }
    diff --git a/src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html index 294fb5d58..8315c605a 100644 --- a/src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html @@ -1,25 +1,29 @@
    -
    - - -
    -
    - -
    - - - - -
    - -
    - -
    +
    + + +
    +
    +
    + + + @if (patternRequired) { + + } + @if (patternRequired) { + + }
    -
    - - + +
    +
    - + +
    +
    + + +
    + diff --git a/src-ui/src/app/components/common/edit-dialog/mail-account-edit-dialog/mail-account-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/mail-account-edit-dialog/mail-account-edit-dialog.component.html index 924fcdcfa..f031cc9ab 100644 --- a/src-ui/src/app/components/common/edit-dialog/mail-account-edit-dialog/mail-account-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/mail-account-edit-dialog/mail-account-edit-dialog.component.html @@ -22,13 +22,15 @@
    - {{testResultMessage}} + @if (testResult) { + {{testResultMessage}} + }
    diff --git a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html index 5c335fdaa..ef684a3fa 100644 --- a/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.html @@ -26,19 +26,25 @@
    - + @if (showActionParamField) { + + }

    Assignments specified here will supersede any consumption templates.

    - + @if (showCorrespondentField) { + + }
    - Error: {{error.non_field_errors}} + @if (error?.non_field_errors) { + Error: {{error.non_field_errors}} + }
    diff --git a/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html index 12e70f3cd..c88961ecc 100644 --- a/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html @@ -9,8 +9,12 @@ - - + @if (patternRequired) { + + } + @if (patternRequired) { + + }
    diff --git a/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html index 1a9ee58da..1067951b3 100644 --- a/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html +++ b/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html @@ -1,26 +1,30 @@ -
    -
    - - + +
    + + +
    +
    + + + + + + + @if (patternRequired) { + + } + @if (patternRequired) { + + } + +
    +
    -
    - - - - - - - - -
    - -
    - -
    -
    - - -
    - +
    +
    + + +
    + diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index 849dec4c5..2e082cff3 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -4,49 +4,61 @@
     {{title}}
    - + @if (!editing && selectionModel.totalCount > 0) { - + }
    -
    -
    - - - - + @if (!editing && manyToOne) { +
    +
    + + + + +
    -
    -
    -
    - - - - + } + @if (!editing && !manyToOne) { +
    +
    + + + + +
    -
    + }
    -
    - - - - -
    - -
    - Click again to exclude items. -
    + @if (selectionModel.items) { +
    + @for (item of selectionModel.itemsSorted | filter: filterText; track item; let i = $index) { + @if (allowSelectNone || item.id) { + + + } + } +
    + } + @if (editing) { + + } + @if (!editing && manyToOne) { +
    + Click again to exclude items. +
    + }
    diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html index 461f38b3b..2ab6794a5 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html @@ -1,24 +1,29 @@ diff --git a/src-ui/src/app/components/common/input/check/check.component.html b/src-ui/src/app/components/common/input/check/check.component.html index 35bde2ad3..541288bde 100644 --- a/src-ui/src/app/components/common/input/check/check.component.html +++ b/src-ui/src/app/components/common/input/check/check.component.html @@ -1,19 +1,27 @@
    -
    - - -
    -
    -
    - - -
    {{hint}}
    + @if (horizontal) { +
    + + @if (removable) { + + } +
    + } +
    +
    + + @if (!horizontal) { + + } + @if (hint) { +
    {{hint}}
    + } +
    -
    diff --git a/src-ui/src/app/components/common/input/color/color.component.html b/src-ui/src/app/components/common/input/color/color.component.html index f905f5e7c..100297a9a 100644 --- a/src-ui/src/app/components/common/input/color/color.component.html +++ b/src-ui/src/app/components/common/input/color/color.component.html @@ -1,28 +1,32 @@
    - + @if (title) { + + }
        - -
    - -
    + +
    + +
    -     +     - + - + -
    - {{hint}} -
    - {{error}} -
    +
    + @if (hint) { + {{hint}} + } +
    + {{error}} +
    diff --git a/src-ui/src/app/components/common/input/date/date.component.html b/src-ui/src/app/components/common/input/date/date.component.html index d68629328..2a7984a17 100644 --- a/src-ui/src/app/components/common/input/date/date.component.html +++ b/src-ui/src/app/components/common/input/date/date.component.html @@ -2,36 +2,44 @@
    - -
    -
    -
    - - - + @if (removable) { + + } +
    +
    +
    + + + @if (showFilter) { + + } +
    +
    Invalid date.
    + @if (hint) { + {{hint}} + } + @if (getSuggestions().length > 0) { + + Suggestions:  + @for (s of getSuggestions(); track s) { + {{s}}  + } + + }
    -
    Invalid date.
    - {{hint}} - - Suggestions:  - - {{s}}  - -
    -
    diff --git a/src-ui/src/app/components/common/input/document-link/document-link.component.html b/src-ui/src/app/components/common/input/document-link/document-link.component.html index d6c17e953..8e4074035 100644 --- a/src-ui/src/app/components/common/input/document-link/document-link.component.html +++ b/src-ui/src/app/components/common/input/document-link/document-link.component.html @@ -1,12 +1,16 @@
    -
    -
    - - +  Remove + + }
    @@ -23,28 +27,30 @@ [loading]="loading" [typeahead]="documentsInput$" (change)="onChange(selectedDocuments)"> - -
    - - - - - - - {{document.title}} - -
    -     - - - - - -
    {{document.title}} ({{document.created | customDate:'shortDate'}})
    -     - + +
    + + + + + + + {{document.title}} + +
    +     + + + + + +
    {{document.title}} ({{document.created | customDate:'shortDate'}})
    +     + +
    + @if (hint) { + {{hint}} + }
    - {{hint}}
    -
    diff --git a/src-ui/src/app/components/common/input/number/number.component.html b/src-ui/src/app/components/common/input/number/number.component.html index bf7397cc0..f194270d8 100644 --- a/src-ui/src/app/components/common/input/number/number.component.html +++ b/src-ui/src/app/components/common/input/number/number.component.html @@ -2,21 +2,27 @@
    - -
    -
    -
    - - + @if (removable) { + + }
    -
    - {{error}} +
    +
    + + @if (showAdd) { + + } +
    +
    + {{error}} +
    + @if (hint) { + {{hint}} + }
    - {{hint}}
    -
    diff --git a/src-ui/src/app/components/common/input/password/password.component.html b/src-ui/src/app/components/common/input/password/password.component.html index dc285ac7b..b94750f94 100644 --- a/src-ui/src/app/components/common/input/password/password.component.html +++ b/src-ui/src/app/components/common/input/password/password.component.html @@ -2,14 +2,18 @@
    - + @if (showReveal) { + + }
    {{error}}
    - + @if (hint) { + + }
    diff --git a/src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.html b/src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.html index ddab005ad..3ba732dc5 100644 --- a/src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.html +++ b/src-ui/src/app/components/common/input/permissions/permissions-form/permissions-form.component.html @@ -1,8 +1,8 @@ - +@if (!accordion) {
    Permissions
    -     - +} +@if (accordion) {

    @@ -17,59 +17,59 @@

    - +} -
    -
    -
    - +
    +
    +
    + +
    +
    + +
    -
    - + Objects without an owner can be viewed and edited by all users +
    +
    View
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    Edit
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + Edit permissions also grant viewing permissions +
    - Objects without an owner can be viewed and edited by all users -
    -
    View
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    Edit
    -
    -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - Edit permissions also grant viewing permissions -
    -
    -
    diff --git a/src-ui/src/app/components/common/input/select/select.component.html b/src-ui/src/app/components/common/input/select/select.component.html index 844ea1932..bdffbcc12 100644 --- a/src-ui/src/app/components/common/input/select/select.component.html +++ b/src-ui/src/app/components/common/input/select/select.component.html @@ -1,57 +1,69 @@
    - - -
    -
    -
    - - - - + @if (title) { + + } + @if (removable) { + + }
    -
    - {{error}} +
    +
    + + + @if (allowCreateNew) { + + } + @if (showFilter) { + + } +
    +
    + {{error}} +
    + @if (hint) { + {{hint}} + } + @if (getSuggestions().length > 0) { + + Suggestions:  + @for (s of getSuggestions(); track s) { + {{s.name}}  + } + + }
    - {{hint}} - - Suggestions:  - - {{s.name}}  - -
    -
    diff --git a/src-ui/src/app/components/common/input/select/select.component.ts b/src-ui/src/app/components/common/input/select/select.component.ts index 76acf31dc..9b8e43329 100644 --- a/src-ui/src/app/components/common/input/select/select.component.ts +++ b/src-ui/src/app/components/common/input/select/select.component.ts @@ -122,7 +122,7 @@ export class SelectComponent extends AbstractInputComponent { } } - addItem(name: string) { + addItem(name: string = null) { if (name) this.createNew.next(name) else this.createNew.next(this._lastSearchTerm) this.clearLastSearchTerm() diff --git a/src-ui/src/app/components/common/input/tags/tags.component.html b/src-ui/src/app/components/common/input/tags/tags.component.html index 3c93a167d..c4207fc61 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.html +++ b/src-ui/src/app/components/common/input/tags/tags.component.html @@ -21,33 +21,45 @@ - + @if (item.id && tags) { + + }
    - + @if (item.id && tags) { + + }
    - - + @if (allowCreate) { + + } + @if (showFilter) { + + }
    - {{hint}} - - Suggestions:  - - {{tag?.name}}  - - + @if (hint) { + {{hint}} + } + @if (getSuggestions().length > 0) { + + Suggestions:  + @for (tag of getSuggestions(); track tag) { + {{tag?.name}}  + } + + }
    diff --git a/src-ui/src/app/components/common/input/text/text.component.html b/src-ui/src/app/components/common/input/text/text.component.html index 47ec804c6..3b9f7e36d 100644 --- a/src-ui/src/app/components/common/input/text/text.component.html +++ b/src-ui/src/app/components/common/input/text/text.component.html @@ -2,18 +2,22 @@
    - -
    -
    - - -
    - {{error}} + @if (removable) { + + } +
    +
    + + @if (hint) { + + } +
    + {{error}} +
    -
    diff --git a/src-ui/src/app/components/common/input/url/url.component.html b/src-ui/src/app/components/common/input/url/url.component.html index 5c94f0635..cca0ee259 100644 --- a/src-ui/src/app/components/common/input/url/url.component.html +++ b/src-ui/src/app/components/common/input/url/url.component.html @@ -1,12 +1,14 @@
    -
    -
    - - +  Remove + + }
    @@ -20,7 +22,9 @@ {{error}}
    - + @if (hint) { + + }
    diff --git a/src-ui/src/app/components/common/page-header/page-header.component.html b/src-ui/src/app/components/common/page-header/page-header.component.html index b77b6e445..e3e631434 100644 --- a/src-ui/src/app/components/common/page-header/page-header.component.html +++ b/src-ui/src/app/components/common/page-header/page-header.component.html @@ -2,7 +2,9 @@

    {{title}} - {{subTitle}} + @if (subTitle) { + {{subTitle}} + }

    diff --git a/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.html b/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.html index 863c9ecee..37ab7efbd 100644 --- a/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.html +++ b/src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.html @@ -1,22 +1,24 @@
    - - -
    -
    + + +
    +
    -

    + @if (!object && message) { +

    + } -
    - -
    +
    + +
    -
    -
    - - - - - - -
    +
    +
    + @if (!buttonsEnabled) { + + + } + + +
    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 b7a1b1397..ef413a67c 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,82 +1,94 @@
    - -
    -
    - - - - - -
    -
    - - -
    -
    + +
    +
    + + + + + + @if (selectionModel.ownerFilter === OwnerFilterType.NONE || selectionModel.ownerFilter === OwnerFilterType.NOT_SELF) { +
    +
    + + +
    +
    + }
    +
    diff --git a/src-ui/src/app/components/common/permissions-select/permissions-select.component.html b/src-ui/src/app/components/common/permissions-select/permissions-select.component.html index f3e85a543..a2aa4a5c0 100644 --- a/src-ui/src/app/components/common/permissions-select/permissions-select.component.html +++ b/src-ui/src/app/components/common/permissions-select/permissions-select.component.html @@ -9,19 +9,23 @@
    Delete
    View
    -
  • -
    {{type.key}}:
    - -
    - - -
    - -
    - - -
    -
    • -
    {{error}}
    + @for (type of PermissionType | keyvalue; track type) { +
  • +
    {{type.key}}:
    +
    + + +
    + @for (action of PermissionAction | keyvalue; track action) { +
    + + +
    + } +
    • + } + @if (error) { +
    {{error}}
    + } diff --git a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.html b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.html index b6423b796..8c98d91b7 100644 --- a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.html +++ b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.html @@ -1,53 +1,57 @@
    -
    - - +
    + + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    -
    - -
    -
    -
    -
    - -
    -
    + +
    +
    +
    +
    +
    - -
    -
    -
    -
    - -
    -
    +
    +
    + + +
    + +
    +
    + + +
    + Copied!
    - - -
    - -
    -
    - - - -
    - Copied! -
    -
    Warning: changing the token cannot be undone
    -
    +
    Warning: changing the token cannot be undone
    +
    diff --git a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.html b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.html index 81c8b58ec..2dbd29308 100644 --- a/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.html +++ b/src-ui/src/app/components/common/share-links-dropdown/share-links-dropdown.component.html @@ -1,61 +1,79 @@
    - - + + +
    + Copied! + + } +
  • +
    +
    + + +
    +
    +
    + + + +
    +
    • + +
    +
    diff --git a/src-ui/src/app/components/common/tag/tag.component.html b/src-ui/src/app/components/common/tag/tag.component.html index ff07b4864..f845d743b 100644 --- a/src-ui/src/app/components/common/tag/tag.component.html +++ b/src-ui/src/app/components/common/tag/tag.component.html @@ -1,9 +1,15 @@ - - {{tag.name}} - {{tag.name}} - - - - Private - Private - +@if (tag !== undefined) { + @if (!clickable) { + {{tag.name}} + } + @if (clickable) { + {{tag.name}} + } +} @else { + @if (!clickable) { + Private + } + @if (clickable) { + Private + } +} diff --git a/src-ui/src/app/components/common/toasts/toasts.component.html b/src-ui/src/app/components/common/toasts/toasts.component.html index 2372911ae..1a671c4e9 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.html +++ b/src-ui/src/app/components/common/toasts/toasts.component.html @@ -1,43 +1,58 @@ - - - -
    - - - - -
    -

    {{toast.content}}

    -
    -
    -
    -
    URL
    -
    {{ toast.error.url }}
    -
    Status
    -
    {{ toast.error.status }} {{ toast.error.statusText }}
    -
    Error
    -
    {{ getErrorText(toast.error) }}
    -
    -
    -
    - -
    -
    +@for (toast of toasts; track toast) { + + + +
    + + @if (!toast.error) { + + } + @if (toast.error) { + + } + +
    +

    {{toast.content}}

    + @if (toast.error) { +
    +
    + @if (isDetailedError(toast.error)) { +
    +
    URL
    +
    {{ toast.error.url }}
    +
    Status
    +
    {{ toast.error.status }} {{ toast.error.statusText }}
    +
    Error
    +
    {{ getErrorText(toast.error) }}
    +
    + } +
    +
    + +
    +
    +
    +
    + } + @if (toast.action) { +

    + }
    -
    -

    -
    - -
    -     + +
    + + } diff --git a/src-ui/src/app/components/common/toasts/toasts.component.ts b/src-ui/src/app/components/common/toasts/toasts.component.ts index dac65c37f..37198d1e0 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.ts +++ b/src-ui/src/app/components/common/toasts/toasts.component.ts @@ -10,7 +10,7 @@ import { Clipboard } from '@angular/cdk/clipboard' }) export class ToastsComponent implements OnInit, OnDestroy { constructor( - private toastService: ToastService, + public toastService: ToastService, private clipboard: Clipboard ) {} diff --git a/src-ui/src/app/components/dashboard/dashboard.component.html b/src-ui/src/app/components/dashboard/dashboard.component.html index 0a70310a1..4d1c510ab 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.html +++ b/src-ui/src/app/components/dashboard/dashboard.component.html @@ -8,25 +8,31 @@ cdkDropList [cdkDropListDisabled]="settingsService.globalDropzoneActive" (cdkDropListDropped)="onDrop($event)" - > -
    - - Loading... -
    + > + @if (savedViewService.loading) { +
    + + Loading... +
    + } -
    - -
    + @if (settingsService.offerTour()) { +
    + +
    + } -
    - - -
    + @for (v of dashboardViews; track v) { +
    + + +
    + }
    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 637a28a54..e510c0aa5 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/dashboard/widgets/statistics-widget/statistics-widget.component.html b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html index 1f8253694..49ebc5ae5 100644 --- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.html @@ -1,10 +1,12 @@
    - - Documents in inbox: - {{statistics?.documents_inbox}} - + @if (statistics?.documents_inbox !== null) { + + Documents in inbox: + {{statistics?.documents_inbox}} + + } Total documents: {{statistics?.documents_total}} @@ -13,60 +15,74 @@ Total characters: {{statistics?.character_count | number}}
    -
    -
    -
    -
    + @if (statistics?.document_file_type_counts?.length > 1) { +
    +
    +
    + @for (filetype of statistics?.document_file_type_counts; track filetype; let i = $index; let last = $last) { +
    +
    + }
    -
    -
    -
    -
    - - {{ getFileTypeExtension(filetype) }} ({{getFileTypePercent(filetype) | number: '1.0-1'}}%) -
    +
    + @for (filetype of statistics?.document_file_type_counts; track filetype; let i = $index) { +
    +
    + + {{ getFileTypeExtension(filetype) }} ({{getFileTypePercent(filetype) | number: '1.0-1'}}%) +
    +
    + }
    -
    + }
    - - Tags: - {{statistics?.tag_count | number}} - + @if (statistics?.tag_count > 0) { + + Tags: + {{statistics?.tag_count | number}} + + } - - Correspondents: - {{statistics?.correspondent_count | number}} - + @if (statistics?.correspondent_count > 0) { + + Correspondents: + {{statistics?.correspondent_count | number}} + + } - - Document Types: - {{statistics?.document_type_count | number}} - + @if (statistics?.document_type_count > 0) { + + Document Types: + {{statistics?.document_type_count | number}} + + } - - Storage Paths: - {{statistics?.storage_path_count | number}} - + @if (statistics?.storage_path_count > 0) { + + Storage Paths: + {{statistics?.storage_path_count | number}} + + }
    diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html index 58b9800b8..f178c2d9f 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.html @@ -8,32 +8,44 @@
    -

    {{getStatusSummary()}}

    - - Dismiss completed - - - - - + @if (getStatus().length > 0) { +

    {{getStatusSummary()}}

    + } + @if (getStatusCompleted().length > 0) { + + Dismiss completed + + + + + + }
    -
    - -
    -
    -
    -

    - {getStatusHidden().length, plural, =1 {One more document} other {{{getStatusHidden().length}} more documents}} -  •  - Show all -

    -
    -
    + @for (status of getStatus(); track status) { +
    -
    + }
    + @if (getStatusHidden().length) { +
    + @if (!alertsExpanded) { +

    + {getStatusHidden().length, plural, =1 {One more document} other {{{getStatusHidden().length}} more documents}} +  •  + Show all +

    + } +
    + @for (status of getStatusHidden(); track status) { +
    + +
    + } +
    +
    + }
    @@ -42,17 +54,23 @@
    {{status.filename}}
    -

    {{status.message}}

    + @if (!isFinished(status) || (isFinished(status) && !status.documentId)) { +

    {{status.message}}

    + }
    -
    - -
    + @if (isFinished(status)) { +
    + @if (status.documentId) { + + } +
    + }
    diff --git a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html index 539ec9bee..ddf412566 100644 --- a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html +++ b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html @@ -2,17 +2,19 @@
    -
    - - - -
    + @if (draggable) { +
    + + + +
    + }
    {{title}}
    - + @if (loading) { - + }
    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 b3ea4cc43..72e1727c7 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 + +
    +
    - - + + - - + + -
    -
    +
    +
    - + -
    +
    - - - + + +
    - - - - - - + + + @if (hasNext()) { + + } + @if (!hasNext()) { + + } + +
    -
    +
    -
      +
      • - 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) { +
    +
    + +
    +
    + } +
    +
    -
    -
    - - -
    -
    - - Loading... -
    -
    - -
    - - -
    - - - -     - -
    -     -
    -
    - -
    -
    -     + + @if (!metadata) { +
    +
    + + Loading... +
    +
    + } + @if (getContentType() === 'application/pdf') { + @if (!useNativePdfViewer ) { +
    + + +
    + } @else { + + } + } + @if (renderAsPlainText) { +
    + } + @if (showPasswordField) { +
    +
    + +
    +
    + } +     diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html index ae4705e01..17a31f0cf 100644 --- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html +++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.html @@ -1,23 +1,29 @@
    {{title}}
    - - - - - - + + @for (m of metadata; track m) { + + + + + } +
    {{m.prefix}}:{{m.key}}{{m.value}}
    {{m.prefix}}:{{m.key}}{{m.value}}
    diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html index 9e65b7a77..49920c0b5 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.html @@ -3,140 +3,144 @@ -
    -
    - -
    - -
    -
    -
    - - - - - - - - - -
    -
    -
    - - - -
    - -
    - +
    + +
    + + +
    -
    -
    - -
    - -
    - -
    -
    -

    Include:

    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    +
    + +
    +
    +
    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 ba4608d3c..6c11a3751 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: -
    - -
    -
    -
    -
    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 8719f2ddf..cb0d7f77f 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,18 +75,22 @@ {{document.created_date | customDate:'mediumDate'}}
    -
    - - - - #{{document.archive_serial_number}} -
    -
    - - - - {{document.owner | username}} -
    + @if (document.archive_serial_number | isNumber) { +
    + + + + #{{document.archive_serial_number}} +
    + } + @if (document.owner && document.owner !== settingsService.currentUser.id) { +
    + + + + {{document.owner | username}} +
    + }
    @@ -86,8 +100,8 @@ + [ngbPopover]="previewContent" [popoverTitle]="document.title | documentTitle" + autoClose="true" popoverClass="shadow popover-preview" (mouseenter)="mouseEnterPreview()" (mouseleave)="mouseLeavePreview()" #popover="ngbPopover"> diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index 480a559c8..64cac2d90 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -52,9 +52,11 @@
    - + @for (f of getSortFields(); track f) { + + }
    @@ -62,18 +64,26 @@
    - - -
    -     + @if (!list.activeSavedViewId) { + @for (view of savedViewService.allViews; track view) { + + } + @if (savedViewService.allViews.length > 0) { +
    + } + }
    - + @if (list.activeSavedViewId) { + + }
    @@ -90,165 +100,191 @@
    - + @if (list.isReloading) { Loading... - - {list.collectionSize, plural, =1 {Selected {{list.selected.size}} of one document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}} - - {list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}} (filtered) - - + } + @if (list.selected.size > 0) { + {list.collectionSize, plural, =1 {Selected {{list.selected.size}} of one document} other {Selected {{list.selected.size}} of {{list.collectionSize || 0}} documents}} + } + @if (!list.isReloading) { + @if (list.selected.size === 0) { + {list.collectionSize, plural, =1 {One document} other {{{list.collectionSize || 0}} documents}} + } @if (isFiltered) { + (filtered) + } + } + @if (!list.isReloading && isFiltered) { + + } +
    + @if (list.collectionSize) { + + }
    - -
    - + -
    - -
    - - - - - - -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ASNCorrespondentTitleOwnerNotesDocument typeStorage pathCreatedAdded
    -
    - - -
    -     		- {{d.archive_serial_number}} - - - {{(d.correspondent$ | async)?.name}} - - - {{d.title | documentTitle}} - - - {{d.owner | username}} - - - - - - - {{d.notes.length}} - - - - {{(d.document_type$ | async)?.name}} - - - - {{(d.storage_path$ | async)?.name}} - - - {{d.created_date | customDate}} - - {{d.added | customDate}} -
    - -
    - -
    -
    +
    - - + @if (list.error ) { + + } @else { + @if (displayMode === 'largeCards') { +
    + @for (d of list.documents; track trackByDocumentId($index, d)) { + + + } +
    + } + @if (displayMode === 'details') { + + + + + + + + @if (notesEnabled) { + + } + + + + + + + @for (d of list.documents; track trackByDocumentId($index, d)) { + + + + + + + @if (notesEnabled) { + + } + + + + + + } + +
    ASNCorrespondentTitleOwnerNotesDocument typeStorage pathCreatedAdded
    +
    + + +
    +     		+ {{d.archive_serial_number}} + + @if (d.correspondent) { + {{(d.correspondent$ | async)?.name}} + } + + {{d.title | documentTitle}} + @for (t of d.tags$ | async; track t) { + + } + + {{d.owner | username}} + + @if (d.notes.length) { + + + + + + {{d.notes.length}} + + } + + @if (d.document_type) { + {{(d.document_type$ | async)?.name}} + } + + @if (d.storage_path) { + {{(d.storage_path$ | async)?.name}} + } + + {{d.created_date | customDate}} + + {{d.added | customDate}} +
    + } + @if (displayMode === 'smallCards') { +
    + @for (d of list.documents; track trackByDocumentId($index, d)) { + + } +
    + } + @if (list.documents?.length > 15) { +
    + +
    + } + } diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html index 460b9e0fb..6fec313f8 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html @@ -5,17 +5,25 @@
    - + @for (t of textFilterTargets; track t) { + + }
    - - + @if (textFilterTarget === 'asn') { + + } + @if (_textFilter) { + + }
    @@ -31,7 +39,7 @@ (selectionModelChange)="updateRules()" (opened)="onTagsDropdownOpen()" [documentCounts]="tagDocumentCounts" - [allowSelectNone]="true"> + [allowSelectNone]="true"> + [allowSelectNone]="true"> + [allowSelectNone]="true"> + [allowSelectNone]="true">
    + [(relativeDate)]="dateCreatedRelativeDate"> + [(relativeDate)]="dateAddedRelativeDate">
    + [(selectionModel)]="permissionsSelectionModel">
    + Reset filters + +
    -
    diff --git a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html index 4563e9624..0d0a84eb8 100644 --- a/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html +++ b/src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.html @@ -8,11 +8,13 @@ - + @if (error?.filter_rules) { + + }
    diff --git a/src-ui/src/app/components/document-notes/document-notes.component.html b/src-ui/src/app/components/document-notes/document-notes.component.html index 64426962a..b759e6b66 100644 --- a/src-ui/src/app/components/document-notes/document-notes.component.html +++ b/src-ui/src/app/components/document-notes/document-notes.component.html @@ -1,29 +1,35 @@ -
    +@if (notes) { +
    -
    - -
    +
    + +
    Please enter a note.
    -
    -
    - - -
    +
    +
    + @if (networkActive) { + + } + +
    -
    -
    + @for (note of notes; track note) { +
    +

    {{note.note}}

    -
    -
    +
    +
    {{displayName(note)}} - {{ note.created | customDate}} +
    + }
    -
    + } diff --git a/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.html b/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.html index 0cab5eda9..02e888228 100644 --- a/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.html +++ b/src-ui/src/app/components/manage/consumption-templates/consumption-templates.component.html @@ -1,43 +1,47 @@ - +
      -
    • -
      -
      Name
      -
      Sort order
      -
      Document Sources
      -
      Actions
      -
      -
      • +
    • +
      +
      Name
      +
      Sort order
      +
      Document Sources
      +
      Actions
      +
      +
      • -
    • -
      -
      -
      {{template.order}}
      -
      {{getSourceList(template)}}
      -
      -
      - - -
      + @for (template of templates; track template) { +
    • +
      +
      +
      {{template.order}}
      +
      {{getSourceList(template)}}
      +
      +
      + + +
      -
      -
      • -
    • No templates defined.
      • -
    +
    + + } + @if (templates.length === 0) { +
  • No templates defined.
    • + } + diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.html b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.html index 41558c859..dc6628a6a 100644 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.html +++ b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.html @@ -1,41 +1,45 @@ - +
      -
    • -
      -
      Name
      -
      Data Type
      -
      Actions
      -
      -
      • +
    • +
      +
      Name
      +
      Data Type
      +
      Actions
      +
      +
      • -
    • -
      -
      -
      {{getDataType(field)}}
      -
      -
      - - -
      + @for (field of fields; track field) { +
    • +
      +
      +
      {{getDataType(field)}}
      +
      +
      + + +
      -
      -
      • -
    • No fields defined.
      • -
    +
    + + } + @if (fields.length === 0) { +
  • No fields defined.
    • + } + diff --git a/src-ui/src/app/components/manage/mail/mail.component.html b/src-ui/src/app/components/manage/mail/mail.component.html index e75e98afe..b3c93d794 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.html +++ b/src-ui/src/app/components/manage/mail/mail.component.html @@ -2,104 +2,114 @@ -

    - Mail accounts - -

    -
      -
    • -
      -
      Name
      -
      Server
      -
      Actions
      -
      -
      • +

      + Mail accounts + +

      +
        +
      • +
        +
        Name
        +
        Server
        +
        Actions
        +
        +
        • -
      • -
        -
        -
        {{account.imap_server}}
        -
        -
        -
        +
        {{account.imap_server}}
        +
        +
        + - + + +  Delete + +
        -
        -
        -
        • -
      • No mail accounts defined.
        • -
      +
    + + } + @if (mailAccounts.length === 0) { +
  • No mail accounts defined.
    • + } + - + - -

    - Mail rules - -

    -
      -
    • + +

      + Mail rules + +

      +
        +
      • -
        Name
        -
        Account
        -
        Actions
        +
        Name
        +
        Account
        +
        Actions
        -
        • + -
      • -
        -
        -
        {{(mailAccountService.getCached(rule.account) | async)?.name}}
        -
        -
        -
        +
        {{(mailAccountService.getCached(rule.account) | async)?.name}}
        +
        +
        + - - -
        -
        -
        -
        • -
      • No mail rules defined.
        • -
      +  Edit + + + +
    +
    +
    + + } + @if (mailRules.length === 0) { +
  • No mail rules defined.
    • + } + - + -
    - - -
    + @if (!mailAccounts || !mailRules) { +
    + + +
    + } diff --git a/src-ui/src/app/components/manage/management-list/management-list.component.html b/src-ui/src/app/components/manage/management-list/management-list.component.html index 3592c9cfa..ca9ec4750 100644 --- a/src-ui/src/app/components/manage/management-list/management-list.component.html +++ b/src-ui/src/app/components/manage/management-list/management-list.component.html @@ -2,112 +2,131 @@ - - + + - + -
    -
    -
    - - +
    +
    +
    + + +
    +
    + +
    -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - - -
    -     		NameMatchingDocument count{{column.name}}Actions
    - - Loading... -
    -
    - - -
    -     		{{ getMatching(object) }}{{ object.document_count }} -
    - {{ column.valueFn.call(null, object) }} -     		-
    -
    - -
    - - - -
    +
    + + + + + + + + @for (column of extraColumns; track column) { + + } + + + + + @if (isLoading) { + + + + } + @for (object of data; track object) { + + + + + + @for (column of extraColumns; track column) { + + } + + + } + +
    +
    + + +
    +     		NameMatchingDocument count{{column.name}}Actions
    + + Loading... +
    +
    + + +
    +     		{{ getMatching(object) }}{{ object.document_count }} + @if (column.rendersHtml) { +
    + } @else { + {{ column.valueFn.call(null, object) }} + } +     		+
    +
    + +
    + + + +
    +
    +
    +
    + + + +
    +
    -
    -
    - - - -
    -
    -
    -
    -
    - {collectionSize, plural, =1 {One {{typeName}}} other {{{collectionSize || 0}} total {{typeNamePlural}}}} -  ({{selectedObjects.size}} selected) -
    - -
    + @if (!isLoading) { +
    + @if (collectionSize > 0) { +
    + {collectionSize, plural, =1 {One {{typeName}}} other {{{collectionSize || 0}} total {{typeNamePlural}}}} + @if (selectedObjects.size > 0) { +  ({{selectedObjects.size}} selected) + } +
    + } + @if (collectionSize > 20) { + + } +
    + }