mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2026-03-04 16:26:24 +00:00
Compare commits
3 Commits
feature-ex
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
190fc70288 | ||
|
|
c623234769 | ||
|
|
299dac21ee |
@@ -440,9 +440,6 @@ src/documents/permissions.py:0: error: Item "list[str]" of "Any | list[str] | Qu
|
|||||||
src/documents/permissions.py:0: error: Item "list[str]" of "Any | list[str] | QuerySet[User, User]" has no attribute "exists" [union-attr]
|
src/documents/permissions.py:0: error: Item "list[str]" of "Any | list[str] | QuerySet[User, User]" has no attribute "exists" [union-attr]
|
||||||
src/documents/permissions.py:0: error: Missing type parameters for generic type "QuerySet" [type-arg]
|
src/documents/permissions.py:0: error: Missing type parameters for generic type "QuerySet" [type-arg]
|
||||||
src/documents/permissions.py:0: error: Missing type parameters for generic type "dict" [type-arg]
|
src/documents/permissions.py:0: error: Missing type parameters for generic type "dict" [type-arg]
|
||||||
src/documents/plugins/helpers.py:0: error: "Collection[str]" has no attribute "update" [attr-defined]
|
|
||||||
src/documents/plugins/helpers.py:0: error: Argument 1 to "send" of "BaseStatusManager" has incompatible type "dict[str, Collection[str]]"; expected "dict[str, str | int | None]" [arg-type]
|
|
||||||
src/documents/plugins/helpers.py:0: error: Argument 1 to "send" of "BaseStatusManager" has incompatible type "dict[str, Collection[str]]"; expected "dict[str, str | int | None]" [arg-type]
|
|
||||||
src/documents/plugins/helpers.py:0: error: Function is missing a type annotation [no-untyped-def]
|
src/documents/plugins/helpers.py:0: error: Function is missing a type annotation [no-untyped-def]
|
||||||
src/documents/plugins/helpers.py:0: error: Function is missing a type annotation [no-untyped-def]
|
src/documents/plugins/helpers.py:0: error: Function is missing a type annotation [no-untyped-def]
|
||||||
src/documents/plugins/helpers.py:0: error: Skipping analyzing "channels_redis.pubsub": module is installed, but missing library stubs or py.typed marker [import-untyped]
|
src/documents/plugins/helpers.py:0: error: Skipping analyzing "channels_redis.pubsub": module is installed, but missing library stubs or py.typed marker [import-untyped]
|
||||||
@@ -667,7 +664,6 @@ src/documents/signals/handlers.py:0: error: Argument 3 to "validate_move" has in
|
|||||||
src/documents/signals/handlers.py:0: error: Argument 5 to "_suggestion_printer" has incompatible type "Any | None"; expected "MatchingModel" [arg-type]
|
src/documents/signals/handlers.py:0: error: Argument 5 to "_suggestion_printer" has incompatible type "Any | None"; expected "MatchingModel" [arg-type]
|
||||||
src/documents/signals/handlers.py:0: error: Argument 5 to "_suggestion_printer" has incompatible type "Any | None"; expected "MatchingModel" [arg-type]
|
src/documents/signals/handlers.py:0: error: Argument 5 to "_suggestion_printer" has incompatible type "Any | None"; expected "MatchingModel" [arg-type]
|
||||||
src/documents/signals/handlers.py:0: error: Argument 5 to "_suggestion_printer" has incompatible type "Any | None"; expected "MatchingModel" [arg-type]
|
src/documents/signals/handlers.py:0: error: Argument 5 to "_suggestion_printer" has incompatible type "Any | None"; expected "MatchingModel" [arg-type]
|
||||||
src/documents/signals/handlers.py:0: error: Function is missing a return type annotation [no-untyped-def]
|
|
||||||
src/documents/signals/handlers.py:0: error: Function is missing a type annotation [no-untyped-def]
|
src/documents/signals/handlers.py:0: error: Function is missing a type annotation [no-untyped-def]
|
||||||
src/documents/signals/handlers.py:0: error: Function is missing a type annotation [no-untyped-def]
|
src/documents/signals/handlers.py:0: error: Function is missing a type annotation [no-untyped-def]
|
||||||
src/documents/signals/handlers.py:0: error: Function is missing a type annotation for one or more arguments [no-untyped-def]
|
src/documents/signals/handlers.py:0: error: Function is missing a type annotation for one or more arguments [no-untyped-def]
|
||||||
@@ -1928,6 +1924,7 @@ src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLaye
|
|||||||
src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send" [union-attr]
|
src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send" [union-attr]
|
||||||
src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send" [union-attr]
|
src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send" [union-attr]
|
||||||
src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send" [union-attr]
|
src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send" [union-attr]
|
||||||
|
src/paperless/tests/test_websockets.py:0: error: Item "None" of "BaseChannelLayer | None" has no attribute "group_send" [union-attr]
|
||||||
src/paperless/tests/test_websockets.py:0: error: TypedDict "_WebsocketTestScope" has no key "user" [typeddict-item]
|
src/paperless/tests/test_websockets.py:0: error: TypedDict "_WebsocketTestScope" has no key "user" [typeddict-item]
|
||||||
src/paperless/tests/test_websockets.py:0: error: TypedDict "_WebsocketTestScope" has no key "user" [typeddict-item]
|
src/paperless/tests/test_websockets.py:0: error: TypedDict "_WebsocketTestScope" has no key "user" [typeddict-item]
|
||||||
src/paperless/tests/test_websockets.py:0: error: TypedDict "_WebsocketTestScope" has no key "user" [typeddict-item]
|
src/paperless/tests/test_websockets.py:0: error: TypedDict "_WebsocketTestScope" has no key "user" [typeddict-item]
|
||||||
|
|||||||
@@ -310,6 +310,7 @@ markers = [
|
|||||||
[tool.pytest_env]
|
[tool.pytest_env]
|
||||||
PAPERLESS_DISABLE_DBHANDLER = "true"
|
PAPERLESS_DISABLE_DBHANDLER = "true"
|
||||||
PAPERLESS_CACHE_BACKEND = "django.core.cache.backends.locmem.LocMemCache"
|
PAPERLESS_CACHE_BACKEND = "django.core.cache.backends.locmem.LocMemCache"
|
||||||
|
PAPERLESS_CHANNELS_BACKEND = "channels.layers.InMemoryChannelLayer"
|
||||||
|
|
||||||
[tool.coverage.report]
|
[tool.coverage.report]
|
||||||
exclude_also = [
|
exclude_also = [
|
||||||
|
|||||||
@@ -1217,7 +1217,7 @@
|
|||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1629</context>
|
<context context-type="linenumber">1756</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="1577733187050997705" datatype="html">
|
<trans-unit id="1577733187050997705" datatype="html">
|
||||||
@@ -2088,6 +2088,10 @@
|
|||||||
<context context-type="sourcefile">src/app/components/admin/tasks/tasks.component.ts</context>
|
<context context-type="sourcefile">src/app/components/admin/tasks/tasks.component.ts</context>
|
||||||
<context context-type="linenumber">155</context>
|
<context context-type="linenumber">155</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
|
<context-group purpose="location">
|
||||||
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
|
<context context-type="linenumber">634</context>
|
||||||
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.html</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.html</context>
|
||||||
<context context-type="linenumber">50</context>
|
<context context-type="linenumber">50</context>
|
||||||
@@ -2794,11 +2798,11 @@
|
|||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1249</context>
|
<context context-type="linenumber">1376</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1630</context>
|
<context context-type="linenumber">1757</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
||||||
@@ -3396,7 +3400,7 @@
|
|||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1202</context>
|
<context context-type="linenumber">1329</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
||||||
@@ -3501,7 +3505,7 @@
|
|||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1681</context>
|
<context context-type="linenumber">1808</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="6661109599266152398" datatype="html">
|
<trans-unit id="6661109599266152398" datatype="html">
|
||||||
@@ -3512,7 +3516,7 @@
|
|||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1682</context>
|
<context context-type="linenumber">1809</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="5162686434580248853" datatype="html">
|
<trans-unit id="5162686434580248853" datatype="html">
|
||||||
@@ -3523,7 +3527,7 @@
|
|||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1683</context>
|
<context context-type="linenumber">1810</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="8157388568390631653" datatype="html">
|
<trans-unit id="8157388568390631653" datatype="html">
|
||||||
@@ -5484,7 +5488,7 @@
|
|||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1206</context>
|
<context context-type="linenumber">1333</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
||||||
@@ -7691,67 +7695,81 @@
|
|||||||
<source>Error retrieving metadata</source>
|
<source>Error retrieving metadata</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">397</context>
|
<context context-type="linenumber">408</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="2218903673684131427" datatype="html">
|
<trans-unit id="2218903673684131427" datatype="html">
|
||||||
<source>An error occurred loading content: <x id="PH" equiv-text="err.message ?? err.toString()"/></source>
|
<source>An error occurred loading content: <x id="PH" equiv-text="err.message ?? err.toString()"/></source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">495,497</context>
|
<context context-type="linenumber">509,511</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">841,843</context>
|
<context context-type="linenumber">956,958</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="3200733026060976258" datatype="html">
|
<trans-unit id="6357361810318120957" datatype="html">
|
||||||
<source>Document changes detected</source>
|
<source>Document was updated</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">555</context>
|
<context context-type="linenumber">629</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="2887155916749964" datatype="html">
|
<trans-unit id="5154064822428631306" datatype="html">
|
||||||
<source>The version of this document in your browser session appears older than the existing version.</source>
|
<source>Document was updated at <x id="PH" equiv-text="formattedModified"/>.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">556</context>
|
<context context-type="linenumber">630</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="237142428785956348" datatype="html">
|
<trans-unit id="8462497568316256794" datatype="html">
|
||||||
<source>Saving the document here may overwrite other changes that were made. To restore the existing version, discard your changes or close the document.</source>
|
<source>Reload to discard your local unsaved edits and load the latest remote version.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">557</context>
|
<context context-type="linenumber">631</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="8720977247725652816" datatype="html">
|
<trans-unit id="7967484035994732534" datatype="html">
|
||||||
<source>Ok</source>
|
<source>Reload</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">559</context>
|
<context context-type="linenumber">633</context>
|
||||||
|
</context-group>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="2907037627372942104" datatype="html">
|
||||||
|
<source>Document reloaded with latest changes.</source>
|
||||||
|
<context-group purpose="location">
|
||||||
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
|
<context context-type="linenumber">689</context>
|
||||||
|
</context-group>
|
||||||
|
</trans-unit>
|
||||||
|
<trans-unit id="6435639868943916539" datatype="html">
|
||||||
|
<source>Document reloaded.</source>
|
||||||
|
<context-group purpose="location">
|
||||||
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
|
<context context-type="linenumber">700</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="6142395741265832184" datatype="html">
|
<trans-unit id="6142395741265832184" datatype="html">
|
||||||
<source>Next document</source>
|
<source>Next document</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">687</context>
|
<context context-type="linenumber">802</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="651985345816518480" datatype="html">
|
<trans-unit id="651985345816518480" datatype="html">
|
||||||
<source>Previous document</source>
|
<source>Previous document</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">697</context>
|
<context context-type="linenumber">812</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="2885986061416655600" datatype="html">
|
<trans-unit id="2885986061416655600" datatype="html">
|
||||||
<source>Close document</source>
|
<source>Close document</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">705</context>
|
<context context-type="linenumber">820</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/open-documents.service.ts</context>
|
<context context-type="sourcefile">src/app/services/open-documents.service.ts</context>
|
||||||
@@ -7762,67 +7780,67 @@
|
|||||||
<source>Save document</source>
|
<source>Save document</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">712</context>
|
<context context-type="linenumber">827</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="1784543155727940353" datatype="html">
|
<trans-unit id="1784543155727940353" datatype="html">
|
||||||
<source>Save and close / next</source>
|
<source>Save and close / next</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">721</context>
|
<context context-type="linenumber">836</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="7427704425579737895" datatype="html">
|
<trans-unit id="7427704425579737895" datatype="html">
|
||||||
<source>Error retrieving version content</source>
|
<source>Error retrieving version content</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">825</context>
|
<context context-type="linenumber">940</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="3456881259945295697" datatype="html">
|
<trans-unit id="3456881259945295697" datatype="html">
|
||||||
<source>Error retrieving suggestions.</source>
|
<source>Error retrieving suggestions.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">882</context>
|
<context context-type="linenumber">997</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="2194092841814123758" datatype="html">
|
<trans-unit id="2194092841814123758" datatype="html">
|
||||||
<source>Document "<x id="PH" equiv-text="newValues.title"/>" saved successfully.</source>
|
<source>Document "<x id="PH" equiv-text="newValues.title"/>" saved successfully.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1091</context>
|
<context context-type="linenumber">1209</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1115</context>
|
<context context-type="linenumber">1236</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="6626387786259219838" datatype="html">
|
<trans-unit id="6626387786259219838" datatype="html">
|
||||||
<source>Error saving document "<x id="PH" equiv-text="this.document.title"/>"</source>
|
<source>Error saving document "<x id="PH" equiv-text="this.document.title"/>"</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1121</context>
|
<context context-type="linenumber">1242</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="448882439049417053" datatype="html">
|
<trans-unit id="448882439049417053" datatype="html">
|
||||||
<source>Error saving document</source>
|
<source>Error saving document</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1171</context>
|
<context context-type="linenumber">1297</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="8410796510716511826" datatype="html">
|
<trans-unit id="8410796510716511826" datatype="html">
|
||||||
<source>Do you really want to move the document "<x id="PH" equiv-text="this.document.title"/>" to the trash?</source>
|
<source>Do you really want to move the document "<x id="PH" equiv-text="this.document.title"/>" to the trash?</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1203</context>
|
<context context-type="linenumber">1330</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="282586936710748252" datatype="html">
|
<trans-unit id="282586936710748252" datatype="html">
|
||||||
<source>Documents can be restored prior to permanent deletion.</source>
|
<source>Documents can be restored prior to permanent deletion.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1204</context>
|
<context context-type="linenumber">1331</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
||||||
@@ -7833,14 +7851,14 @@
|
|||||||
<source>Error deleting document</source>
|
<source>Error deleting document</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1225</context>
|
<context context-type="linenumber">1352</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="619486176823357521" datatype="html">
|
<trans-unit id="619486176823357521" datatype="html">
|
||||||
<source>Reprocess confirm</source>
|
<source>Reprocess confirm</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1245</context>
|
<context context-type="linenumber">1372</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
|
||||||
@@ -7851,102 +7869,102 @@
|
|||||||
<source>This operation will permanently recreate the archive file for this document.</source>
|
<source>This operation will permanently recreate the archive file for this document.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1246</context>
|
<context context-type="linenumber">1373</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="302054111564709516" datatype="html">
|
<trans-unit id="302054111564709516" datatype="html">
|
||||||
<source>The archive file will be re-generated with the current settings.</source>
|
<source>The archive file will be re-generated with the current settings.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1247</context>
|
<context context-type="linenumber">1374</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="8251197608401006898" datatype="html">
|
<trans-unit id="4700389117298802932" datatype="html">
|
||||||
<source>Reprocess operation for "<x id="PH" equiv-text="this.document.title"/>" will begin in the background. Close and re-open or reload this document after the operation has completed to see new content.</source>
|
<source>Reprocess operation for "<x id="PH" equiv-text="this.document.title"/>" will begin in the background.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1257</context>
|
<context context-type="linenumber">1384</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="4409560272830824468" datatype="html">
|
<trans-unit id="4409560272830824468" datatype="html">
|
||||||
<source>Error executing operation</source>
|
<source>Error executing operation</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1268</context>
|
<context context-type="linenumber">1395</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="6030453331794586802" datatype="html">
|
<trans-unit id="6030453331794586802" datatype="html">
|
||||||
<source>Error downloading document</source>
|
<source>Error downloading document</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1331</context>
|
<context context-type="linenumber">1458</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="4458954481601077369" datatype="html">
|
<trans-unit id="4458954481601077369" datatype="html">
|
||||||
<source>Page Fit</source>
|
<source>Page Fit</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1411</context>
|
<context context-type="linenumber">1538</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="4663705961777238777" datatype="html">
|
<trans-unit id="4663705961777238777" datatype="html">
|
||||||
<source>PDF edit operation for "<x id="PH" equiv-text="this.document.title"/>" will begin in the background.</source>
|
<source>PDF edit operation for "<x id="PH" equiv-text="this.document.title"/>" will begin in the background.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1648</context>
|
<context context-type="linenumber">1775</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="9043972994040261999" datatype="html">
|
<trans-unit id="9043972994040261999" datatype="html">
|
||||||
<source>Error executing PDF edit operation</source>
|
<source>Error executing PDF edit operation</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1660</context>
|
<context context-type="linenumber">1787</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="6172690334763056188" datatype="html">
|
<trans-unit id="6172690334763056188" datatype="html">
|
||||||
<source>Please enter the current password before attempting to remove it.</source>
|
<source>Please enter the current password before attempting to remove it.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1671</context>
|
<context context-type="linenumber">1798</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="968660764814228922" datatype="html">
|
<trans-unit id="968660764814228922" datatype="html">
|
||||||
<source>Password removal operation for "<x id="PH" equiv-text="this.document.title"/>" will begin in the background.</source>
|
<source>Password removal operation for "<x id="PH" equiv-text="this.document.title"/>" will begin in the background.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1703</context>
|
<context context-type="linenumber">1830</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="2282118435712883014" datatype="html">
|
<trans-unit id="2282118435712883014" datatype="html">
|
||||||
<source>Error executing password removal operation</source>
|
<source>Error executing password removal operation</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1717</context>
|
<context context-type="linenumber">1844</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="3740891324955700797" datatype="html">
|
<trans-unit id="3740891324955700797" datatype="html">
|
||||||
<source>Print failed.</source>
|
<source>Print failed.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1756</context>
|
<context context-type="linenumber">1883</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="6457245677384603573" datatype="html">
|
<trans-unit id="6457245677384603573" datatype="html">
|
||||||
<source>Error loading document for printing.</source>
|
<source>Error loading document for printing.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1768</context>
|
<context context-type="linenumber">1895</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="6085793215710522488" datatype="html">
|
<trans-unit id="6085793215710522488" datatype="html">
|
||||||
<source>An error occurred loading tiff: <x id="PH" equiv-text="err.toString()"/></source>
|
<source>An error occurred loading tiff: <x id="PH" equiv-text="err.toString()"/></source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1833</context>
|
<context context-type="linenumber">1960</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
<context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
|
||||||
<context context-type="linenumber">1837</context>
|
<context context-type="linenumber">1964</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="4958946940233632319" datatype="html">
|
<trans-unit id="4958946940233632319" datatype="html">
|
||||||
@@ -11182,42 +11200,42 @@
|
|||||||
<source>Document already exists.</source>
|
<source>Document already exists.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">24</context>
|
<context context-type="linenumber">26</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="5103087968344279314" datatype="html">
|
<trans-unit id="5103087968344279314" datatype="html">
|
||||||
<source>Document already exists. Note: existing document is in the trash.</source>
|
<source>Document already exists. Note: existing document is in the trash.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">25</context>
|
<context context-type="linenumber">27</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="6108404046106249255" datatype="html">
|
<trans-unit id="6108404046106249255" datatype="html">
|
||||||
<source>Document with ASN already exists.</source>
|
<source>Document with ASN already exists.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">26</context>
|
<context context-type="linenumber">28</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="65951081560571094" datatype="html">
|
<trans-unit id="65951081560571094" datatype="html">
|
||||||
<source>Document with ASN already exists. Note: existing document is in the trash.</source>
|
<source>Document with ASN already exists. Note: existing document is in the trash.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">27</context>
|
<context context-type="linenumber">29</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="148389968432135849" datatype="html">
|
<trans-unit id="148389968432135849" datatype="html">
|
||||||
<source>File not found.</source>
|
<source>File not found.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">28</context>
|
<context context-type="linenumber">30</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="1520671543092565667" datatype="html">
|
<trans-unit id="1520671543092565667" datatype="html">
|
||||||
<source>Pre-consume script does not exist.</source>
|
<source>Pre-consume script does not exist.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">29</context>
|
<context context-type="linenumber">31</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<note priority="1" from="description">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
|
<note priority="1" from="description">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
@@ -11225,7 +11243,7 @@
|
|||||||
<source>Error while executing pre-consume script.</source>
|
<source>Error while executing pre-consume script.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">30</context>
|
<context context-type="linenumber">32</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<note priority="1" from="description">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
|
<note priority="1" from="description">Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
@@ -11233,7 +11251,7 @@
|
|||||||
<source>Post-consume script does not exist.</source>
|
<source>Post-consume script does not exist.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">31</context>
|
<context context-type="linenumber">33</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<note priority="1" from="description">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
|
<note priority="1" from="description">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
@@ -11241,7 +11259,7 @@
|
|||||||
<source>Error while executing post-consume script.</source>
|
<source>Error while executing post-consume script.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">32</context>
|
<context context-type="linenumber">34</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
<note priority="1" from="description">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
|
<note priority="1" from="description">Post-Consume is a term that appears like that in the documentation as well and does not need a specific translation</note>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
@@ -11249,49 +11267,49 @@
|
|||||||
<source>Received new file.</source>
|
<source>Received new file.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">33</context>
|
<context context-type="linenumber">35</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="7337565919209746135" datatype="html">
|
<trans-unit id="7337565919209746135" datatype="html">
|
||||||
<source>File type not supported.</source>
|
<source>File type not supported.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">34</context>
|
<context context-type="linenumber">36</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="5002399167376099234" datatype="html">
|
<trans-unit id="5002399167376099234" datatype="html">
|
||||||
<source>Processing document...</source>
|
<source>Processing document...</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">35</context>
|
<context context-type="linenumber">37</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="1085975194762600381" datatype="html">
|
<trans-unit id="1085975194762600381" datatype="html">
|
||||||
<source>Generating thumbnail...</source>
|
<source>Generating thumbnail...</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">36</context>
|
<context context-type="linenumber">38</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="3280851677698431426" datatype="html">
|
<trans-unit id="3280851677698431426" datatype="html">
|
||||||
<source>Retrieving date from document...</source>
|
<source>Retrieving date from document...</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">37</context>
|
<context context-type="linenumber">39</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="7162102384876037296" datatype="html">
|
<trans-unit id="7162102384876037296" datatype="html">
|
||||||
<source>Saving document...</source>
|
<source>Saving document...</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">38</context>
|
<context context-type="linenumber">40</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="4550450765009165976" datatype="html">
|
<trans-unit id="4550450765009165976" datatype="html">
|
||||||
<source>Finished.</source>
|
<source>Finished.</source>
|
||||||
<context-group purpose="location">
|
<context-group purpose="location">
|
||||||
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
<context context-type="sourcefile">src/app/services/websocket-status.service.ts</context>
|
||||||
<context context-type="linenumber">39</context>
|
<context context-type="linenumber">41</context>
|
||||||
</context-group>
|
</context-group>
|
||||||
</trans-unit>
|
</trans-unit>
|
||||||
<trans-unit id="2501522447884928778" datatype="html">
|
<trans-unit id="2501522447884928778" datatype="html">
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ import { TagService } from 'src/app/services/rest/tag.service'
|
|||||||
import { UserService } from 'src/app/services/rest/user.service'
|
import { UserService } from 'src/app/services/rest/user.service'
|
||||||
import { SettingsService } from 'src/app/services/settings.service'
|
import { SettingsService } from 'src/app/services/settings.service'
|
||||||
import { ToastService } from 'src/app/services/toast.service'
|
import { ToastService } from 'src/app/services/toast.service'
|
||||||
|
import { WebsocketStatusService } from 'src/app/services/websocket-status.service'
|
||||||
import { environment } from 'src/environments/environment'
|
import { environment } from 'src/environments/environment'
|
||||||
import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
|
import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
|
||||||
import { PasswordRemovalConfirmDialogComponent } from '../common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component'
|
import { PasswordRemovalConfirmDialogComponent } from '../common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component'
|
||||||
@@ -83,9 +84,9 @@ const doc: Document = {
|
|||||||
storage_path: 31,
|
storage_path: 31,
|
||||||
tags: [41, 42, 43],
|
tags: [41, 42, 43],
|
||||||
content: 'text content',
|
content: 'text content',
|
||||||
added: new Date('May 4, 2014 03:24:00'),
|
added: new Date('May 4, 2014 03:24:00').toISOString(),
|
||||||
created: new Date('May 4, 2014 03:24:00'),
|
created: new Date('May 4, 2014 03:24:00').toISOString(),
|
||||||
modified: new Date('May 4, 2014 03:24:00'),
|
modified: new Date('May 4, 2014 03:24:00').toISOString(),
|
||||||
archive_serial_number: null,
|
archive_serial_number: null,
|
||||||
original_file_name: 'file.pdf',
|
original_file_name: 'file.pdf',
|
||||||
owner: null,
|
owner: null,
|
||||||
@@ -327,6 +328,29 @@ describe('DocumentDetailComponent', () => {
|
|||||||
expect(component.activeNavID).toEqual(component.DocumentDetailNavIDs.Notes)
|
expect(component.activeNavID).toEqual(component.DocumentDetailNavIDs.Notes)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('should switch from preview to details when pdf preview enters the DOM', fakeAsync(() => {
|
||||||
|
component.nav = {
|
||||||
|
activeId: component.DocumentDetailNavIDs.Preview,
|
||||||
|
select: jest.fn(),
|
||||||
|
} as any
|
||||||
|
;(component as any).pdfPreview = {
|
||||||
|
nativeElement: { offsetParent: {} },
|
||||||
|
}
|
||||||
|
|
||||||
|
tick()
|
||||||
|
expect(component.nav.select).toHaveBeenCalledWith(
|
||||||
|
component.DocumentDetailNavIDs.Details
|
||||||
|
)
|
||||||
|
}))
|
||||||
|
|
||||||
|
it('should forward title key up value to titleSubject', () => {
|
||||||
|
const subjectSpy = jest.spyOn(component.titleSubject, 'next')
|
||||||
|
|
||||||
|
component.titleKeyUp({ target: { value: 'Updated title' } })
|
||||||
|
|
||||||
|
expect(subjectSpy).toHaveBeenCalledWith('Updated title')
|
||||||
|
})
|
||||||
|
|
||||||
it('should change url on tab switch', () => {
|
it('should change url on tab switch', () => {
|
||||||
initNormally()
|
initNormally()
|
||||||
const navigateSpy = jest.spyOn(router, 'navigate')
|
const navigateSpy = jest.spyOn(router, 'navigate')
|
||||||
@@ -524,7 +548,7 @@ describe('DocumentDetailComponent', () => {
|
|||||||
jest.spyOn(documentService, 'get').mockReturnValue(
|
jest.spyOn(documentService, 'get').mockReturnValue(
|
||||||
of({
|
of({
|
||||||
...doc,
|
...doc,
|
||||||
modified: new Date('2024-01-02T00:00:00Z'),
|
modified: '2024-01-02T00:00:00Z',
|
||||||
duplicate_documents: updatedDuplicates,
|
duplicate_documents: updatedDuplicates,
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
@@ -1386,17 +1410,21 @@ describe('DocumentDetailComponent', () => {
|
|||||||
expect(errorSpy).toHaveBeenCalled()
|
expect(errorSpy).toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should warn when open document does not match doc retrieved from backend on init', () => {
|
it('should show incoming update modal when open local draft is older than backend on init', () => {
|
||||||
let openModal: NgbModalRef
|
let openModal: NgbModalRef
|
||||||
modalService.activeInstances.subscribe((modals) => (openModal = modals[0]))
|
modalService.activeInstances.subscribe((modals) => (openModal = modals[0]))
|
||||||
const modalSpy = jest.spyOn(modalService, 'open')
|
const modalSpy = jest.spyOn(modalService, 'open')
|
||||||
const openDoc = Object.assign({}, doc)
|
const openDoc = Object.assign({}, doc, {
|
||||||
|
__changedFields: ['title'],
|
||||||
|
})
|
||||||
// simulate a document being modified elsewhere and db updated
|
// simulate a document being modified elsewhere and db updated
|
||||||
doc.modified = new Date()
|
const remoteDoc = Object.assign({}, doc, {
|
||||||
|
modified: new Date(new Date(doc.modified).getTime() + 1000).toISOString(),
|
||||||
|
})
|
||||||
jest
|
jest
|
||||||
.spyOn(activatedRoute, 'paramMap', 'get')
|
.spyOn(activatedRoute, 'paramMap', 'get')
|
||||||
.mockReturnValue(of(convertToParamMap({ id: 3, section: 'details' })))
|
.mockReturnValue(of(convertToParamMap({ id: 3, section: 'details' })))
|
||||||
jest.spyOn(documentService, 'get').mockReturnValueOnce(of(doc))
|
jest.spyOn(documentService, 'get').mockReturnValueOnce(of(remoteDoc))
|
||||||
jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(openDoc)
|
jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(openDoc)
|
||||||
jest.spyOn(customFieldsService, 'listAll').mockReturnValue(
|
jest.spyOn(customFieldsService, 'listAll').mockReturnValue(
|
||||||
of({
|
of({
|
||||||
@@ -1406,11 +1434,185 @@ describe('DocumentDetailComponent', () => {
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
fixture.detectChanges() // calls ngOnInit
|
fixture.detectChanges() // calls ngOnInit
|
||||||
expect(modalSpy).toHaveBeenCalledWith(ConfirmDialogComponent)
|
expect(modalSpy).toHaveBeenCalledWith(ConfirmDialogComponent, {
|
||||||
const closeSpy = jest.spyOn(openModal, 'close')
|
backdrop: 'static',
|
||||||
|
})
|
||||||
const confirmDialog = openModal.componentInstance as ConfirmDialogComponent
|
const confirmDialog = openModal.componentInstance as ConfirmDialogComponent
|
||||||
confirmDialog.confirmClicked.next(confirmDialog)
|
expect(confirmDialog.messageBold).toContain('Document was updated at')
|
||||||
expect(closeSpy).toHaveBeenCalled()
|
})
|
||||||
|
|
||||||
|
it('should react to websocket document updated notifications', () => {
|
||||||
|
initNormally()
|
||||||
|
const updateMessage = {
|
||||||
|
document_id: component.documentId,
|
||||||
|
modified: '2026-02-17T00:00:00Z',
|
||||||
|
owner_id: 1,
|
||||||
|
}
|
||||||
|
const handleSpy = jest
|
||||||
|
.spyOn(component as any, 'handleIncomingDocumentUpdated')
|
||||||
|
.mockImplementation(() => {})
|
||||||
|
const websocketStatusService = TestBed.inject(WebsocketStatusService)
|
||||||
|
|
||||||
|
websocketStatusService.handleDocumentUpdated(updateMessage)
|
||||||
|
|
||||||
|
expect(handleSpy).toHaveBeenCalledWith(updateMessage)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should queue incoming update while network is active and flush after', () => {
|
||||||
|
initNormally()
|
||||||
|
const loadSpy = jest.spyOn(component as any, 'loadDocument')
|
||||||
|
const toastSpy = jest.spyOn(toastService, 'showInfo')
|
||||||
|
|
||||||
|
component.networkActive = true
|
||||||
|
;(component as any).handleIncomingDocumentUpdated({
|
||||||
|
document_id: component.documentId,
|
||||||
|
modified: '2026-02-17T00:00:00Z',
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(loadSpy).not.toHaveBeenCalled()
|
||||||
|
|
||||||
|
component.networkActive = false
|
||||||
|
;(component as any).flushPendingIncomingUpdate()
|
||||||
|
|
||||||
|
expect(loadSpy).toHaveBeenCalledWith(component.documentId, true)
|
||||||
|
expect(toastSpy).toHaveBeenCalledWith(
|
||||||
|
'Document reloaded with latest changes.'
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should ignore queued incoming update matching local save modified', () => {
|
||||||
|
initNormally()
|
||||||
|
const loadSpy = jest.spyOn(component as any, 'loadDocument')
|
||||||
|
const toastSpy = jest.spyOn(toastService, 'showInfo')
|
||||||
|
|
||||||
|
component.networkActive = true
|
||||||
|
;(component as any).lastLocalSaveModified = '2026-02-17T00:00:00+00:00'
|
||||||
|
;(component as any).handleIncomingDocumentUpdated({
|
||||||
|
document_id: component.documentId,
|
||||||
|
modified: '2026-02-17T00:00:00+00:00',
|
||||||
|
})
|
||||||
|
|
||||||
|
component.networkActive = false
|
||||||
|
;(component as any).flushPendingIncomingUpdate()
|
||||||
|
|
||||||
|
expect(loadSpy).not.toHaveBeenCalled()
|
||||||
|
expect(toastSpy).not.toHaveBeenCalled()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should clear pdf source if preview URL is empty', () => {
|
||||||
|
component.pdfSource = { url: '/preview', password: 'secret' } as any
|
||||||
|
component.previewUrl = null
|
||||||
|
;(component as any).updatePdfSource()
|
||||||
|
|
||||||
|
expect(component.pdfSource).toEqual({ url: null, password: undefined })
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should close incoming update modal if one is open', () => {
|
||||||
|
const modalRef = { close: jest.fn() } as unknown as NgbModalRef
|
||||||
|
;(component as any).incomingUpdateModal = modalRef
|
||||||
|
;(component as any).closeIncomingUpdateModal()
|
||||||
|
|
||||||
|
expect(modalRef.close).toHaveBeenCalled()
|
||||||
|
expect((component as any).incomingUpdateModal).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should reload remote version when incoming update modal is confirmed', async () => {
|
||||||
|
let openModal: NgbModalRef
|
||||||
|
modalService.activeInstances.subscribe((modals) => (openModal = modals[0]))
|
||||||
|
const reloadSpy = jest
|
||||||
|
.spyOn(component as any, 'reloadRemoteVersion')
|
||||||
|
.mockImplementation(() => {})
|
||||||
|
|
||||||
|
;(component as any).showIncomingUpdateModal('2026-02-17T00:00:00Z')
|
||||||
|
|
||||||
|
const dialog = openModal.componentInstance as ConfirmDialogComponent
|
||||||
|
dialog.confirmClicked.next()
|
||||||
|
await openModal.result
|
||||||
|
|
||||||
|
expect(dialog.buttonsEnabled).toBe(false)
|
||||||
|
expect(reloadSpy).toHaveBeenCalled()
|
||||||
|
expect((component as any).incomingUpdateModal).toBeNull()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should overwrite open document state when loading remote version with force', () => {
|
||||||
|
const openDoc = Object.assign({}, doc, {
|
||||||
|
title: 'Locally edited title',
|
||||||
|
__changedFields: ['title'],
|
||||||
|
})
|
||||||
|
const remoteDoc = Object.assign({}, doc, {
|
||||||
|
title: 'Remote title',
|
||||||
|
modified: '2026-02-17T00:00:00Z',
|
||||||
|
})
|
||||||
|
jest.spyOn(documentService, 'get').mockReturnValue(of(remoteDoc))
|
||||||
|
jest.spyOn(documentService, 'getMetadata').mockReturnValue(
|
||||||
|
of({
|
||||||
|
has_archive_version: false,
|
||||||
|
original_mime_type: 'application/pdf',
|
||||||
|
})
|
||||||
|
)
|
||||||
|
jest.spyOn(documentService, 'getSuggestions').mockReturnValue(
|
||||||
|
of({
|
||||||
|
suggested_tags: [],
|
||||||
|
suggested_document_types: [],
|
||||||
|
suggested_correspondents: [],
|
||||||
|
})
|
||||||
|
)
|
||||||
|
jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(openDoc)
|
||||||
|
const setDirtySpy = jest.spyOn(openDocumentsService, 'setDirty')
|
||||||
|
const saveSpy = jest.spyOn(openDocumentsService, 'save')
|
||||||
|
|
||||||
|
;(component as any).loadDocument(doc.id, true)
|
||||||
|
|
||||||
|
expect(openDoc.title).toEqual('Remote title')
|
||||||
|
expect(openDoc.__changedFields).toEqual([])
|
||||||
|
expect(setDirtySpy).toHaveBeenCalledWith(openDoc, false)
|
||||||
|
expect(saveSpy).toHaveBeenCalled()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should ignore incoming update for a different document id', () => {
|
||||||
|
initNormally()
|
||||||
|
const loadSpy = jest.spyOn(component as any, 'loadDocument')
|
||||||
|
|
||||||
|
;(component as any).handleIncomingDocumentUpdated({
|
||||||
|
document_id: component.documentId + 1,
|
||||||
|
modified: '2026-02-17T00:00:00Z',
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(loadSpy).not.toHaveBeenCalled()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should show incoming update modal when local document has unsaved edits', () => {
|
||||||
|
initNormally()
|
||||||
|
jest.spyOn(openDocumentsService, 'isDirty').mockReturnValue(true)
|
||||||
|
const modalSpy = jest
|
||||||
|
.spyOn(component as any, 'showIncomingUpdateModal')
|
||||||
|
.mockImplementation(() => {})
|
||||||
|
|
||||||
|
;(component as any).handleIncomingDocumentUpdated({
|
||||||
|
document_id: component.documentId,
|
||||||
|
modified: '2026-02-17T00:00:00Z',
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(modalSpy).toHaveBeenCalledWith('2026-02-17T00:00:00Z')
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should reload current document and show toast when reloading remote version', () => {
|
||||||
|
component.documentId = doc.id
|
||||||
|
const closeModalSpy = jest
|
||||||
|
.spyOn(component as any, 'closeIncomingUpdateModal')
|
||||||
|
.mockImplementation(() => {})
|
||||||
|
const loadSpy = jest
|
||||||
|
.spyOn(component as any, 'loadDocument')
|
||||||
|
.mockImplementation(() => {})
|
||||||
|
const notifySpy = jest.spyOn(component.docChangeNotifier, 'next')
|
||||||
|
const toastSpy = jest.spyOn(toastService, 'showInfo')
|
||||||
|
|
||||||
|
;(component as any).reloadRemoteVersion()
|
||||||
|
|
||||||
|
expect(closeModalSpy).toHaveBeenCalled()
|
||||||
|
expect(notifySpy).toHaveBeenCalledWith(doc.id)
|
||||||
|
expect(loadSpy).toHaveBeenCalledWith(doc.id, true)
|
||||||
|
expect(toastSpy).toHaveBeenCalledWith('Document reloaded.')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should change preview element by render type', () => {
|
it('should change preview element by render type', () => {
|
||||||
@@ -1721,6 +1923,14 @@ describe('DocumentDetailComponent', () => {
|
|||||||
expect(component.createDisabled(DataType.Tag)).toBeFalsy()
|
expect(component.createDisabled(DataType.Tag)).toBeFalsy()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('should expose add permission via userCanAdd getter', () => {
|
||||||
|
currentUserCan = true
|
||||||
|
expect(component.userCanAdd).toBeTruthy()
|
||||||
|
|
||||||
|
currentUserCan = false
|
||||||
|
expect(component.userCanAdd).toBeFalsy()
|
||||||
|
})
|
||||||
|
|
||||||
it('should call tryRenderTiff when no archive and file is tiff', () => {
|
it('should call tryRenderTiff when no archive and file is tiff', () => {
|
||||||
initNormally()
|
initNormally()
|
||||||
const tiffRenderSpy = jest.spyOn(
|
const tiffRenderSpy = jest.spyOn(
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import {
|
|||||||
NgbDateStruct,
|
NgbDateStruct,
|
||||||
NgbDropdownModule,
|
NgbDropdownModule,
|
||||||
NgbModal,
|
NgbModal,
|
||||||
|
NgbModalRef,
|
||||||
NgbNav,
|
NgbNav,
|
||||||
NgbNavChangeEvent,
|
NgbNavChangeEvent,
|
||||||
NgbNavModule,
|
NgbNavModule,
|
||||||
@@ -80,6 +81,7 @@ import { TagService } from 'src/app/services/rest/tag.service'
|
|||||||
import { UserService } from 'src/app/services/rest/user.service'
|
import { UserService } from 'src/app/services/rest/user.service'
|
||||||
import { SettingsService } from 'src/app/services/settings.service'
|
import { SettingsService } from 'src/app/services/settings.service'
|
||||||
import { ToastService } from 'src/app/services/toast.service'
|
import { ToastService } from 'src/app/services/toast.service'
|
||||||
|
import { WebsocketStatusService } from 'src/app/services/websocket-status.service'
|
||||||
import { getFilenameFromContentDisposition } from 'src/app/utils/http'
|
import { getFilenameFromContentDisposition } from 'src/app/utils/http'
|
||||||
import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
|
import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
|
||||||
import * as UTIF from 'utif'
|
import * as UTIF from 'utif'
|
||||||
@@ -143,6 +145,11 @@ enum ContentRenderType {
|
|||||||
TIFF = 'tiff',
|
TIFF = 'tiff',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface IncomingDocumentUpdate {
|
||||||
|
document_id: number
|
||||||
|
modified: string
|
||||||
|
}
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'pngx-document-detail',
|
selector: 'pngx-document-detail',
|
||||||
templateUrl: './document-detail.component.html',
|
templateUrl: './document-detail.component.html',
|
||||||
@@ -208,6 +215,7 @@ export class DocumentDetailComponent
|
|||||||
private componentRouterService = inject(ComponentRouterService)
|
private componentRouterService = inject(ComponentRouterService)
|
||||||
private deviceDetectorService = inject(DeviceDetectorService)
|
private deviceDetectorService = inject(DeviceDetectorService)
|
||||||
private savedViewService = inject(SavedViewService)
|
private savedViewService = inject(SavedViewService)
|
||||||
|
private readonly websocketStatusService = inject(WebsocketStatusService)
|
||||||
|
|
||||||
@ViewChild('inputTitle')
|
@ViewChild('inputTitle')
|
||||||
titleInput: TextComponent
|
titleInput: TextComponent
|
||||||
@@ -267,6 +275,9 @@ export class DocumentDetailComponent
|
|||||||
isDirty$: Observable<boolean>
|
isDirty$: Observable<boolean>
|
||||||
unsubscribeNotifier: Subject<any> = new Subject()
|
unsubscribeNotifier: Subject<any> = new Subject()
|
||||||
docChangeNotifier: Subject<any> = new Subject()
|
docChangeNotifier: Subject<any> = new Subject()
|
||||||
|
private incomingUpdateModal: NgbModalRef
|
||||||
|
private pendingIncomingUpdate: IncomingDocumentUpdate
|
||||||
|
private lastLocalSaveModified: string | null = null
|
||||||
|
|
||||||
requiresPassword: boolean = false
|
requiresPassword: boolean = false
|
||||||
password: string
|
password: string
|
||||||
@@ -475,9 +486,12 @@ export class DocumentDetailComponent
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private loadDocument(documentId: number): void {
|
private loadDocument(documentId: number, forceRemote: boolean = false): void {
|
||||||
let redirectedToRoot = false
|
let redirectedToRoot = false
|
||||||
|
this.closeIncomingUpdateModal()
|
||||||
|
this.pendingIncomingUpdate = null
|
||||||
this.selectedVersionId = documentId
|
this.selectedVersionId = documentId
|
||||||
|
this.lastLocalSaveModified = null
|
||||||
this.previewUrl = this.documentsService.getPreviewUrl(
|
this.previewUrl = this.documentsService.getPreviewUrl(
|
||||||
this.selectedVersionId
|
this.selectedVersionId
|
||||||
)
|
)
|
||||||
@@ -545,21 +559,25 @@ export class DocumentDetailComponent
|
|||||||
openDocument.duplicate_documents = doc.duplicate_documents
|
openDocument.duplicate_documents = doc.duplicate_documents
|
||||||
this.openDocumentService.save()
|
this.openDocumentService.save()
|
||||||
}
|
}
|
||||||
const useDoc = openDocument || doc
|
let useDoc = openDocument || doc
|
||||||
if (openDocument) {
|
if (openDocument && forceRemote) {
|
||||||
if (
|
Object.assign(openDocument, doc)
|
||||||
new Date(doc.modified) > new Date(openDocument.modified) &&
|
openDocument.__changedFields = []
|
||||||
!this.modalService.hasOpenModals()
|
this.openDocumentService.setDirty(openDocument, false)
|
||||||
) {
|
this.openDocumentService.save()
|
||||||
const modal = this.modalService.open(ConfirmDialogComponent)
|
useDoc = openDocument
|
||||||
modal.componentInstance.title = $localize`Document changes detected`
|
} else if (openDocument) {
|
||||||
modal.componentInstance.messageBold = $localize`The version of this document in your browser session appears older than the existing version.`
|
if (new Date(doc.modified) > new Date(openDocument.modified)) {
|
||||||
modal.componentInstance.message = $localize`Saving the document here may overwrite other changes that were made. To restore the existing version, discard your changes or close the document.`
|
if (this.hasLocalEdits(openDocument)) {
|
||||||
modal.componentInstance.cancelBtnClass = 'visually-hidden'
|
this.showIncomingUpdateModal(doc.modified)
|
||||||
modal.componentInstance.btnCaption = $localize`Ok`
|
} else {
|
||||||
modal.componentInstance.confirmClicked.subscribe(() =>
|
// No local edits to preserve, so keep the tab in sync automatically.
|
||||||
modal.close()
|
Object.assign(openDocument, doc)
|
||||||
)
|
openDocument.__changedFields = []
|
||||||
|
this.openDocumentService.setDirty(openDocument, false)
|
||||||
|
this.openDocumentService.save()
|
||||||
|
useDoc = openDocument
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.openDocumentService
|
this.openDocumentService
|
||||||
@@ -590,6 +608,98 @@ export class DocumentDetailComponent
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private hasLocalEdits(doc: Document): boolean {
|
||||||
|
return (
|
||||||
|
this.openDocumentService.isDirty(doc) || !!doc.__changedFields?.length
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private showIncomingUpdateModal(modified: string): void {
|
||||||
|
if (this.incomingUpdateModal) return
|
||||||
|
|
||||||
|
const modal = this.modalService.open(ConfirmDialogComponent, {
|
||||||
|
backdrop: 'static',
|
||||||
|
})
|
||||||
|
this.incomingUpdateModal = modal
|
||||||
|
|
||||||
|
let formattedModified = null
|
||||||
|
const parsed = new Date(modified)
|
||||||
|
formattedModified = parsed.toLocaleString()
|
||||||
|
|
||||||
|
modal.componentInstance.title = $localize`Document was updated`
|
||||||
|
modal.componentInstance.messageBold = $localize`Document was updated at ${formattedModified}.`
|
||||||
|
modal.componentInstance.message = $localize`Reload to discard your local unsaved edits and load the latest remote version.`
|
||||||
|
modal.componentInstance.btnClass = 'btn-warning'
|
||||||
|
modal.componentInstance.btnCaption = $localize`Reload`
|
||||||
|
modal.componentInstance.cancelBtnCaption = $localize`Dismiss`
|
||||||
|
|
||||||
|
modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
|
||||||
|
modal.componentInstance.buttonsEnabled = false
|
||||||
|
modal.close()
|
||||||
|
this.reloadRemoteVersion()
|
||||||
|
})
|
||||||
|
modal.result.finally(() => {
|
||||||
|
this.incomingUpdateModal = null
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
private closeIncomingUpdateModal() {
|
||||||
|
if (!this.incomingUpdateModal) return
|
||||||
|
this.incomingUpdateModal.close()
|
||||||
|
this.incomingUpdateModal = null
|
||||||
|
}
|
||||||
|
|
||||||
|
private flushPendingIncomingUpdate() {
|
||||||
|
if (!this.pendingIncomingUpdate || this.networkActive) return
|
||||||
|
const pendingUpdate = this.pendingIncomingUpdate
|
||||||
|
this.pendingIncomingUpdate = null
|
||||||
|
this.handleIncomingDocumentUpdated(pendingUpdate)
|
||||||
|
}
|
||||||
|
|
||||||
|
private handleIncomingDocumentUpdated(data: IncomingDocumentUpdate): void {
|
||||||
|
if (
|
||||||
|
!this.documentId ||
|
||||||
|
!this.document ||
|
||||||
|
data.document_id !== this.documentId
|
||||||
|
)
|
||||||
|
return
|
||||||
|
if (this.networkActive) {
|
||||||
|
this.pendingIncomingUpdate = data
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// If modified timestamp of the incoming update is the same as the last local save,
|
||||||
|
// we assume this update is from our own save and dont notify
|
||||||
|
const incomingModified = data.modified
|
||||||
|
if (
|
||||||
|
incomingModified &&
|
||||||
|
this.lastLocalSaveModified &&
|
||||||
|
incomingModified === this.lastLocalSaveModified
|
||||||
|
) {
|
||||||
|
this.lastLocalSaveModified = null
|
||||||
|
return
|
||||||
|
}
|
||||||
|
this.lastLocalSaveModified = null
|
||||||
|
|
||||||
|
if (this.openDocumentService.isDirty(this.document)) {
|
||||||
|
this.showIncomingUpdateModal(data.modified)
|
||||||
|
} else {
|
||||||
|
this.docChangeNotifier.next(this.documentId)
|
||||||
|
this.loadDocument(this.documentId, true)
|
||||||
|
this.toastService.showInfo(
|
||||||
|
$localize`Document reloaded with latest changes.`
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private reloadRemoteVersion() {
|
||||||
|
if (!this.documentId) return
|
||||||
|
|
||||||
|
this.closeIncomingUpdateModal()
|
||||||
|
this.docChangeNotifier.next(this.documentId)
|
||||||
|
this.loadDocument(this.documentId, true)
|
||||||
|
this.toastService.showInfo($localize`Document reloaded.`)
|
||||||
|
}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.setZoom(
|
this.setZoom(
|
||||||
this.settings.get(SETTINGS_KEYS.PDF_VIEWER_ZOOM_SETTING) as PdfZoomScale
|
this.settings.get(SETTINGS_KEYS.PDF_VIEWER_ZOOM_SETTING) as PdfZoomScale
|
||||||
@@ -648,6 +758,11 @@ export class DocumentDetailComponent
|
|||||||
|
|
||||||
this.getCustomFields()
|
this.getCustomFields()
|
||||||
|
|
||||||
|
this.websocketStatusService
|
||||||
|
.onDocumentUpdated()
|
||||||
|
.pipe(takeUntil(this.unsubscribeNotifier))
|
||||||
|
.subscribe((data) => this.handleIncomingDocumentUpdated(data))
|
||||||
|
|
||||||
this.route.paramMap
|
this.route.paramMap
|
||||||
.pipe(
|
.pipe(
|
||||||
filter(
|
filter(
|
||||||
@@ -1033,6 +1148,7 @@ export class DocumentDetailComponent
|
|||||||
)
|
)
|
||||||
.subscribe({
|
.subscribe({
|
||||||
next: (doc) => {
|
next: (doc) => {
|
||||||
|
this.closeIncomingUpdateModal()
|
||||||
Object.assign(this.document, doc)
|
Object.assign(this.document, doc)
|
||||||
doc['permissions_form'] = {
|
doc['permissions_form'] = {
|
||||||
owner: doc.owner,
|
owner: doc.owner,
|
||||||
@@ -1079,6 +1195,8 @@ export class DocumentDetailComponent
|
|||||||
.pipe(first())
|
.pipe(first())
|
||||||
.subscribe({
|
.subscribe({
|
||||||
next: (docValues) => {
|
next: (docValues) => {
|
||||||
|
this.closeIncomingUpdateModal()
|
||||||
|
this.lastLocalSaveModified = docValues.modified ?? null
|
||||||
// in case data changed while saving eg removing inbox_tags
|
// in case data changed while saving eg removing inbox_tags
|
||||||
this.documentForm.patchValue(docValues)
|
this.documentForm.patchValue(docValues)
|
||||||
const newValues = Object.assign({}, this.documentForm.value)
|
const newValues = Object.assign({}, this.documentForm.value)
|
||||||
@@ -1093,16 +1211,19 @@ export class DocumentDetailComponent
|
|||||||
this.networkActive = false
|
this.networkActive = false
|
||||||
this.error = null
|
this.error = null
|
||||||
if (close) {
|
if (close) {
|
||||||
|
this.pendingIncomingUpdate = null
|
||||||
this.close(() =>
|
this.close(() =>
|
||||||
this.openDocumentService.refreshDocument(this.documentId)
|
this.openDocumentService.refreshDocument(this.documentId)
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
this.openDocumentService.refreshDocument(this.documentId)
|
this.openDocumentService.refreshDocument(this.documentId)
|
||||||
|
this.flushPendingIncomingUpdate()
|
||||||
}
|
}
|
||||||
this.savedViewService.maybeRefreshDocumentCounts()
|
this.savedViewService.maybeRefreshDocumentCounts()
|
||||||
},
|
},
|
||||||
error: (error) => {
|
error: (error) => {
|
||||||
this.networkActive = false
|
this.networkActive = false
|
||||||
|
this.lastLocalSaveModified = null
|
||||||
const canEdit =
|
const canEdit =
|
||||||
this.permissionsService.currentUserHasObjectPermissions(
|
this.permissionsService.currentUserHasObjectPermissions(
|
||||||
PermissionAction.Change,
|
PermissionAction.Change,
|
||||||
@@ -1122,6 +1243,7 @@ export class DocumentDetailComponent
|
|||||||
error
|
error
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
this.flushPendingIncomingUpdate()
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -1158,8 +1280,11 @@ export class DocumentDetailComponent
|
|||||||
.pipe(first())
|
.pipe(first())
|
||||||
.subscribe({
|
.subscribe({
|
||||||
next: ({ updateResult, nextDocId, closeResult }) => {
|
next: ({ updateResult, nextDocId, closeResult }) => {
|
||||||
|
this.closeIncomingUpdateModal()
|
||||||
this.error = null
|
this.error = null
|
||||||
this.networkActive = false
|
this.networkActive = false
|
||||||
|
this.pendingIncomingUpdate = null
|
||||||
|
this.lastLocalSaveModified = null
|
||||||
if (closeResult && updateResult && nextDocId) {
|
if (closeResult && updateResult && nextDocId) {
|
||||||
this.router.navigate(['documents', nextDocId])
|
this.router.navigate(['documents', nextDocId])
|
||||||
this.titleInput?.focus()
|
this.titleInput?.focus()
|
||||||
@@ -1167,8 +1292,10 @@ export class DocumentDetailComponent
|
|||||||
},
|
},
|
||||||
error: (error) => {
|
error: (error) => {
|
||||||
this.networkActive = false
|
this.networkActive = false
|
||||||
|
this.lastLocalSaveModified = null
|
||||||
this.error = error.error
|
this.error = error.error
|
||||||
this.toastService.showError($localize`Error saving document`, error)
|
this.toastService.showError($localize`Error saving document`, error)
|
||||||
|
this.flushPendingIncomingUpdate()
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -1254,7 +1381,7 @@ export class DocumentDetailComponent
|
|||||||
.subscribe({
|
.subscribe({
|
||||||
next: () => {
|
next: () => {
|
||||||
this.toastService.showInfo(
|
this.toastService.showInfo(
|
||||||
$localize`Reprocess operation for "${this.document.title}" will begin in the background. Close and re-open or reload this document after the operation has completed to see new content.`
|
$localize`Reprocess operation for "${this.document.title}" will begin in the background.`
|
||||||
)
|
)
|
||||||
if (modal) {
|
if (modal) {
|
||||||
modal.close()
|
modal.close()
|
||||||
|
|||||||
@@ -128,15 +128,15 @@ export interface Document extends ObjectWithPermissions {
|
|||||||
checksum?: string
|
checksum?: string
|
||||||
|
|
||||||
// UTC
|
// UTC
|
||||||
created?: Date
|
created?: string // ISO string
|
||||||
|
|
||||||
modified?: Date
|
modified?: string // ISO string
|
||||||
|
|
||||||
added?: Date
|
added?: string // ISO string
|
||||||
|
|
||||||
mime_type?: string
|
mime_type?: string
|
||||||
|
|
||||||
deleted_at?: Date
|
deleted_at?: string // ISO string
|
||||||
|
|
||||||
original_file_name?: string
|
original_file_name?: string
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
export interface WebsocketDocumentUpdatedMessage {
|
||||||
|
document_id: number
|
||||||
|
modified: string
|
||||||
|
owner_id?: number
|
||||||
|
users_can_view?: number[]
|
||||||
|
groups_can_view?: number[]
|
||||||
|
}
|
||||||
@@ -416,4 +416,42 @@ describe('ConsumerStatusService', () => {
|
|||||||
websocketStatusService.disconnect()
|
websocketStatusService.disconnect()
|
||||||
expect(deleted).toBeTruthy()
|
expect(deleted).toBeTruthy()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('should trigger updated subject on document updated', () => {
|
||||||
|
let updated = false
|
||||||
|
websocketStatusService.onDocumentUpdated().subscribe((data) => {
|
||||||
|
updated = true
|
||||||
|
expect(data.document_id).toEqual(12)
|
||||||
|
})
|
||||||
|
|
||||||
|
websocketStatusService.connect()
|
||||||
|
server.send({
|
||||||
|
type: WebsocketStatusType.DOCUMENT_UPDATED,
|
||||||
|
data: {
|
||||||
|
document_id: 12,
|
||||||
|
modified: '2026-02-17T00:00:00Z',
|
||||||
|
owner_id: 1,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
websocketStatusService.disconnect()
|
||||||
|
expect(updated).toBeTruthy()
|
||||||
|
})
|
||||||
|
|
||||||
|
it('should ignore document updated events the user cannot view', () => {
|
||||||
|
let updated = false
|
||||||
|
websocketStatusService.onDocumentUpdated().subscribe(() => {
|
||||||
|
updated = true
|
||||||
|
})
|
||||||
|
|
||||||
|
websocketStatusService.handleDocumentUpdated({
|
||||||
|
document_id: 12,
|
||||||
|
modified: '2026-02-17T00:00:00Z',
|
||||||
|
owner_id: 2,
|
||||||
|
users_can_view: [],
|
||||||
|
groups_can_view: [],
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(updated).toBeFalsy()
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Injectable, inject } from '@angular/core'
|
|||||||
import { Subject } from 'rxjs'
|
import { Subject } from 'rxjs'
|
||||||
import { environment } from 'src/environments/environment'
|
import { environment } from 'src/environments/environment'
|
||||||
import { User } from '../data/user'
|
import { User } from '../data/user'
|
||||||
|
import { WebsocketDocumentUpdatedMessage } from '../data/websocket-document-updated-message'
|
||||||
import { WebsocketDocumentsDeletedMessage } from '../data/websocket-documents-deleted-message'
|
import { WebsocketDocumentsDeletedMessage } from '../data/websocket-documents-deleted-message'
|
||||||
import { WebsocketProgressMessage } from '../data/websocket-progress-message'
|
import { WebsocketProgressMessage } from '../data/websocket-progress-message'
|
||||||
import { SettingsService } from './settings.service'
|
import { SettingsService } from './settings.service'
|
||||||
@@ -9,6 +10,7 @@ import { SettingsService } from './settings.service'
|
|||||||
export enum WebsocketStatusType {
|
export enum WebsocketStatusType {
|
||||||
STATUS_UPDATE = 'status_update',
|
STATUS_UPDATE = 'status_update',
|
||||||
DOCUMENTS_DELETED = 'documents_deleted',
|
DOCUMENTS_DELETED = 'documents_deleted',
|
||||||
|
DOCUMENT_UPDATED = 'document_updated',
|
||||||
}
|
}
|
||||||
|
|
||||||
// see ProgressStatusOptions in src/documents/plugins/helpers.py
|
// see ProgressStatusOptions in src/documents/plugins/helpers.py
|
||||||
@@ -100,17 +102,20 @@ export enum UploadState {
|
|||||||
providedIn: 'root',
|
providedIn: 'root',
|
||||||
})
|
})
|
||||||
export class WebsocketStatusService {
|
export class WebsocketStatusService {
|
||||||
private settingsService = inject(SettingsService)
|
private readonly settingsService = inject(SettingsService)
|
||||||
|
|
||||||
private statusWebSocket: WebSocket
|
private statusWebSocket: WebSocket
|
||||||
|
|
||||||
private consumerStatus: FileStatus[] = []
|
private consumerStatus: FileStatus[] = []
|
||||||
|
|
||||||
private documentDetectedSubject = new Subject<FileStatus>()
|
private readonly documentDetectedSubject = new Subject<FileStatus>()
|
||||||
private documentConsumptionFinishedSubject = new Subject<FileStatus>()
|
private readonly documentConsumptionFinishedSubject =
|
||||||
private documentConsumptionFailedSubject = new Subject<FileStatus>()
|
new Subject<FileStatus>()
|
||||||
private documentDeletedSubject = new Subject<boolean>()
|
private readonly documentConsumptionFailedSubject = new Subject<FileStatus>()
|
||||||
private connectionStatusSubject = new Subject<boolean>()
|
private readonly documentDeletedSubject = new Subject<boolean>()
|
||||||
|
private readonly documentUpdatedSubject =
|
||||||
|
new Subject<WebsocketDocumentUpdatedMessage>()
|
||||||
|
private readonly connectionStatusSubject = new Subject<boolean>()
|
||||||
|
|
||||||
private get(taskId: string, filename?: string) {
|
private get(taskId: string, filename?: string) {
|
||||||
let status =
|
let status =
|
||||||
@@ -176,7 +181,10 @@ export class WebsocketStatusService {
|
|||||||
data: messageData,
|
data: messageData,
|
||||||
}: {
|
}: {
|
||||||
type: WebsocketStatusType
|
type: WebsocketStatusType
|
||||||
data: WebsocketProgressMessage | WebsocketDocumentsDeletedMessage
|
data:
|
||||||
|
| WebsocketProgressMessage
|
||||||
|
| WebsocketDocumentsDeletedMessage
|
||||||
|
| WebsocketDocumentUpdatedMessage
|
||||||
} = JSON.parse(ev.data)
|
} = JSON.parse(ev.data)
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
@@ -184,6 +192,12 @@ export class WebsocketStatusService {
|
|||||||
this.documentDeletedSubject.next(true)
|
this.documentDeletedSubject.next(true)
|
||||||
break
|
break
|
||||||
|
|
||||||
|
case WebsocketStatusType.DOCUMENT_UPDATED:
|
||||||
|
this.handleDocumentUpdated(
|
||||||
|
messageData as WebsocketDocumentUpdatedMessage
|
||||||
|
)
|
||||||
|
break
|
||||||
|
|
||||||
case WebsocketStatusType.STATUS_UPDATE:
|
case WebsocketStatusType.STATUS_UPDATE:
|
||||||
this.handleProgressUpdate(messageData as WebsocketProgressMessage)
|
this.handleProgressUpdate(messageData as WebsocketProgressMessage)
|
||||||
break
|
break
|
||||||
@@ -191,7 +205,11 @@ export class WebsocketStatusService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private canViewMessage(messageData: WebsocketProgressMessage): boolean {
|
private canViewMessage(messageData: {
|
||||||
|
owner_id?: number
|
||||||
|
users_can_view?: number[]
|
||||||
|
groups_can_view?: number[]
|
||||||
|
}): boolean {
|
||||||
// see paperless.consumers.StatusConsumer._can_view
|
// see paperless.consumers.StatusConsumer._can_view
|
||||||
const user: User = this.settingsService.currentUser
|
const user: User = this.settingsService.currentUser
|
||||||
return (
|
return (
|
||||||
@@ -251,6 +269,15 @@ export class WebsocketStatusService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
handleDocumentUpdated(messageData: WebsocketDocumentUpdatedMessage) {
|
||||||
|
// fallback if backend didn't restrict message
|
||||||
|
if (!this.canViewMessage(messageData)) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
this.documentUpdatedSubject.next(messageData)
|
||||||
|
}
|
||||||
|
|
||||||
fail(status: FileStatus, message: string) {
|
fail(status: FileStatus, message: string) {
|
||||||
status.message = message
|
status.message = message
|
||||||
status.phase = FileStatusPhase.FAILED
|
status.phase = FileStatusPhase.FAILED
|
||||||
@@ -304,6 +331,10 @@ export class WebsocketStatusService {
|
|||||||
return this.documentDeletedSubject
|
return this.documentDeletedSubject
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onDocumentUpdated() {
|
||||||
|
return this.documentUpdatedSubject
|
||||||
|
}
|
||||||
|
|
||||||
onConnectionStatus() {
|
onConnectionStatus() {
|
||||||
return this.connectionStatusSubject.asObservable()
|
return this.connectionStatusSubject.asObservable()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ class DocumentsConfig(AppConfig):
|
|||||||
from documents.signals.handlers import add_to_index
|
from documents.signals.handlers import add_to_index
|
||||||
from documents.signals.handlers import run_workflows_added
|
from documents.signals.handlers import run_workflows_added
|
||||||
from documents.signals.handlers import run_workflows_updated
|
from documents.signals.handlers import run_workflows_updated
|
||||||
|
from documents.signals.handlers import send_websocket_document_updated
|
||||||
from documents.signals.handlers import set_correspondent
|
from documents.signals.handlers import set_correspondent
|
||||||
from documents.signals.handlers import set_document_type
|
from documents.signals.handlers import set_document_type
|
||||||
from documents.signals.handlers import set_storage_path
|
from documents.signals.handlers import set_storage_path
|
||||||
@@ -29,6 +30,7 @@ class DocumentsConfig(AppConfig):
|
|||||||
document_consumption_finished.connect(run_workflows_added)
|
document_consumption_finished.connect(run_workflows_added)
|
||||||
document_consumption_finished.connect(add_or_update_document_in_llm_index)
|
document_consumption_finished.connect(add_or_update_document_in_llm_index)
|
||||||
document_updated.connect(run_workflows_updated)
|
document_updated.connect(run_workflows_updated)
|
||||||
|
document_updated.connect(send_websocket_document_updated)
|
||||||
|
|
||||||
import documents.schema # noqa: F401
|
import documents.schema # noqa: F401
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import enum
|
import enum
|
||||||
|
from collections.abc import Mapping
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from asgiref.sync import async_to_sync
|
from asgiref.sync import async_to_sync
|
||||||
@@ -47,7 +48,7 @@ class BaseStatusManager:
|
|||||||
async_to_sync(self._channel.flush)
|
async_to_sync(self._channel.flush)
|
||||||
self._channel = None
|
self._channel = None
|
||||||
|
|
||||||
def send(self, payload: dict[str, str | int | None]) -> None:
|
def send(self, payload: Mapping[str, object]) -> None:
|
||||||
# Ensure the layer is open
|
# Ensure the layer is open
|
||||||
self.open()
|
self.open()
|
||||||
|
|
||||||
@@ -73,26 +74,28 @@ class ProgressManager(BaseStatusManager):
|
|||||||
max_progress: int,
|
max_progress: int,
|
||||||
extra_args: dict[str, str | int | None] | None = None,
|
extra_args: dict[str, str | int | None] | None = None,
|
||||||
) -> None:
|
) -> None:
|
||||||
payload = {
|
data: dict[str, object] = {
|
||||||
"type": "status_update",
|
"filename": self.filename,
|
||||||
"data": {
|
"task_id": self.task_id,
|
||||||
"filename": self.filename,
|
"current_progress": current_progress,
|
||||||
"task_id": self.task_id,
|
"max_progress": max_progress,
|
||||||
"current_progress": current_progress,
|
"status": status,
|
||||||
"max_progress": max_progress,
|
"message": message,
|
||||||
"status": status,
|
|
||||||
"message": message,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
if extra_args is not None:
|
if extra_args is not None:
|
||||||
payload["data"].update(extra_args)
|
data.update(extra_args)
|
||||||
|
|
||||||
|
payload: dict[str, object] = {
|
||||||
|
"type": "status_update",
|
||||||
|
"data": data,
|
||||||
|
}
|
||||||
|
|
||||||
self.send(payload)
|
self.send(payload)
|
||||||
|
|
||||||
|
|
||||||
class DocumentsStatusManager(BaseStatusManager):
|
class DocumentsStatusManager(BaseStatusManager):
|
||||||
def send_documents_deleted(self, documents: list[int]) -> None:
|
def send_documents_deleted(self, documents: list[int]) -> None:
|
||||||
payload = {
|
payload: dict[str, object] = {
|
||||||
"type": "documents_deleted",
|
"type": "documents_deleted",
|
||||||
"data": {
|
"data": {
|
||||||
"documents": documents,
|
"documents": documents,
|
||||||
@@ -100,3 +103,25 @@ class DocumentsStatusManager(BaseStatusManager):
|
|||||||
}
|
}
|
||||||
|
|
||||||
self.send(payload)
|
self.send(payload)
|
||||||
|
|
||||||
|
def send_document_updated(
|
||||||
|
self,
|
||||||
|
*,
|
||||||
|
document_id: int,
|
||||||
|
modified: str,
|
||||||
|
owner_id: int | None = None,
|
||||||
|
users_can_view: list[int] | None = None,
|
||||||
|
groups_can_view: list[int] | None = None,
|
||||||
|
) -> None:
|
||||||
|
payload: dict[str, object] = {
|
||||||
|
"type": "document_updated",
|
||||||
|
"data": {
|
||||||
|
"document_id": document_id,
|
||||||
|
"modified": modified,
|
||||||
|
"owner_id": owner_id,
|
||||||
|
"users_can_view": users_can_view or [],
|
||||||
|
"groups_can_view": groups_can_view or [],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
self.send(payload)
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ from django.db.models import Q
|
|||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from filelock import FileLock
|
from filelock import FileLock
|
||||||
|
from rest_framework import serializers
|
||||||
|
|
||||||
from documents import matching
|
from documents import matching
|
||||||
from documents.caching import clear_document_caches
|
from documents.caching import clear_document_caches
|
||||||
@@ -48,6 +49,7 @@ from documents.models import WorkflowAction
|
|||||||
from documents.models import WorkflowRun
|
from documents.models import WorkflowRun
|
||||||
from documents.models import WorkflowTrigger
|
from documents.models import WorkflowTrigger
|
||||||
from documents.permissions import get_objects_for_user_owner_aware
|
from documents.permissions import get_objects_for_user_owner_aware
|
||||||
|
from documents.plugins.helpers import DocumentsStatusManager
|
||||||
from documents.templating.utils import convert_format_str_to_template_format
|
from documents.templating.utils import convert_format_str_to_template_format
|
||||||
from documents.workflows.actions import build_workflow_action_context
|
from documents.workflows.actions import build_workflow_action_context
|
||||||
from documents.workflows.actions import execute_email_action
|
from documents.workflows.actions import execute_email_action
|
||||||
@@ -69,6 +71,7 @@ if TYPE_CHECKING:
|
|||||||
from documents.data_models import DocumentMetadataOverrides
|
from documents.data_models import DocumentMetadataOverrides
|
||||||
|
|
||||||
logger = logging.getLogger("paperless.handlers")
|
logger = logging.getLogger("paperless.handlers")
|
||||||
|
DRF_DATETIME_FIELD = serializers.DateTimeField()
|
||||||
|
|
||||||
|
|
||||||
def add_inbox_tags(sender, document: Document, logging_group=None, **kwargs) -> None:
|
def add_inbox_tags(sender, document: Document, logging_group=None, **kwargs) -> None:
|
||||||
@@ -764,6 +767,28 @@ def run_workflows_updated(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def send_websocket_document_updated(
|
||||||
|
sender,
|
||||||
|
document: Document,
|
||||||
|
**kwargs,
|
||||||
|
) -> None:
|
||||||
|
# At this point, workflows may already have applied additional changes.
|
||||||
|
document.refresh_from_db()
|
||||||
|
|
||||||
|
from documents.data_models import DocumentMetadataOverrides
|
||||||
|
|
||||||
|
doc_overrides = DocumentMetadataOverrides.from_document(document)
|
||||||
|
|
||||||
|
with DocumentsStatusManager() as status_mgr:
|
||||||
|
status_mgr.send_document_updated(
|
||||||
|
document_id=document.id,
|
||||||
|
modified=DRF_DATETIME_FIELD.to_representation(document.modified),
|
||||||
|
owner_id=doc_overrides.owner_id,
|
||||||
|
users_can_view=doc_overrides.view_users,
|
||||||
|
groups_can_view=doc_overrides.view_groups,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def run_workflows(
|
def run_workflows(
|
||||||
trigger_type: WorkflowTrigger.WorkflowTriggerType,
|
trigger_type: WorkflowTrigger.WorkflowTriggerType,
|
||||||
document: Document | ConsumableDocument,
|
document: Document | ConsumableDocument,
|
||||||
@@ -1045,7 +1070,11 @@ def add_or_update_document_in_llm_index(sender, document, **kwargs):
|
|||||||
|
|
||||||
|
|
||||||
@receiver(models.signals.post_delete, sender=Document)
|
@receiver(models.signals.post_delete, sender=Document)
|
||||||
def delete_document_from_llm_index(sender, instance: Document, **kwargs):
|
def delete_document_from_llm_index(
|
||||||
|
sender: Any,
|
||||||
|
instance: Document,
|
||||||
|
**kwargs: Any,
|
||||||
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Delete a document from the LLM index when it is deleted.
|
Delete a document from the LLM index when it is deleted.
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ from documents.sanity_checker import SanityCheckFailedException
|
|||||||
from documents.signals import document_updated
|
from documents.signals import document_updated
|
||||||
from documents.signals.handlers import cleanup_document_deletion
|
from documents.signals.handlers import cleanup_document_deletion
|
||||||
from documents.signals.handlers import run_workflows
|
from documents.signals.handlers import run_workflows
|
||||||
|
from documents.signals.handlers import send_websocket_document_updated
|
||||||
from documents.workflows.utils import get_workflows_for_trigger
|
from documents.workflows.utils import get_workflows_for_trigger
|
||||||
from paperless.config import AIConfig
|
from paperless.config import AIConfig
|
||||||
from paperless_ai.indexing import llm_index_add_or_update_document
|
from paperless_ai.indexing import llm_index_add_or_update_document
|
||||||
@@ -572,6 +573,11 @@ def check_scheduled_workflows() -> None:
|
|||||||
workflow_to_run=workflow,
|
workflow_to_run=workflow,
|
||||||
document=document,
|
document=document,
|
||||||
)
|
)
|
||||||
|
# Scheduled workflows dont send document_updated signal, so send a websocket update here to ensure clients are updated
|
||||||
|
send_websocket_document_updated(
|
||||||
|
sender=None,
|
||||||
|
document=document,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def update_document_parent_tags(tag: Tag, new_parent: Tag) -> None:
|
def update_document_parent_tags(tag: Tag, new_parent: Tag) -> None:
|
||||||
|
|||||||
@@ -1270,7 +1270,11 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
|
|||||||
input_doc, overrides = self.get_last_consume_delay_call_args()
|
input_doc, overrides = self.get_last_consume_delay_call_args()
|
||||||
|
|
||||||
self.assertEqual(input_doc.original_file.name, "simple.pdf")
|
self.assertEqual(input_doc.original_file.name, "simple.pdf")
|
||||||
self.assertIn(Path(settings.SCRATCH_DIR), input_doc.original_file.parents)
|
self.assertTrue(
|
||||||
|
input_doc.original_file.resolve(strict=False).is_relative_to(
|
||||||
|
Path(settings.SCRATCH_DIR).resolve(strict=False),
|
||||||
|
),
|
||||||
|
)
|
||||||
self.assertIsNone(overrides.title)
|
self.assertIsNone(overrides.title)
|
||||||
self.assertIsNone(overrides.correspondent_id)
|
self.assertIsNone(overrides.correspondent_id)
|
||||||
self.assertIsNone(overrides.document_type_id)
|
self.assertIsNone(overrides.document_type_id)
|
||||||
@@ -1351,7 +1355,11 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
|
|||||||
input_doc, overrides = self.get_last_consume_delay_call_args()
|
input_doc, overrides = self.get_last_consume_delay_call_args()
|
||||||
|
|
||||||
self.assertEqual(input_doc.original_file.name, "simple.pdf")
|
self.assertEqual(input_doc.original_file.name, "simple.pdf")
|
||||||
self.assertIn(Path(settings.SCRATCH_DIR), input_doc.original_file.parents)
|
self.assertTrue(
|
||||||
|
input_doc.original_file.resolve(strict=False).is_relative_to(
|
||||||
|
Path(settings.SCRATCH_DIR).resolve(strict=False),
|
||||||
|
),
|
||||||
|
)
|
||||||
self.assertIsNone(overrides.title)
|
self.assertIsNone(overrides.title)
|
||||||
self.assertIsNone(overrides.correspondent_id)
|
self.assertIsNone(overrides.correspondent_id)
|
||||||
self.assertIsNone(overrides.document_type_id)
|
self.assertIsNone(overrides.document_type_id)
|
||||||
|
|||||||
@@ -643,7 +643,9 @@ class TestWorkflows(
|
|||||||
|
|
||||||
expected_str = f"Document did not match {w}"
|
expected_str = f"Document did not match {w}"
|
||||||
self.assertIn(expected_str, cm.output[0])
|
self.assertIn(expected_str, cm.output[0])
|
||||||
expected_str = f"Document path {test_file} does not match"
|
expected_str = (
|
||||||
|
f"Document path {Path(test_file).resolve(strict=False)} does not match"
|
||||||
|
)
|
||||||
self.assertIn(expected_str, cm.output[1])
|
self.assertIn(expected_str, cm.output[1])
|
||||||
|
|
||||||
def test_workflow_no_match_mail_rule(self) -> None:
|
def test_workflow_no_match_mail_rule(self) -> None:
|
||||||
@@ -2010,6 +2012,36 @@ class TestWorkflows(
|
|||||||
doc.refresh_from_db()
|
doc.refresh_from_db()
|
||||||
self.assertEqual(doc.owner, self.user2)
|
self.assertEqual(doc.owner, self.user2)
|
||||||
|
|
||||||
|
@mock.patch("documents.tasks.send_websocket_document_updated")
|
||||||
|
def test_workflow_scheduled_trigger_sends_websocket_update(
|
||||||
|
self,
|
||||||
|
mock_send_websocket_document_updated,
|
||||||
|
) -> None:
|
||||||
|
trigger = WorkflowTrigger.objects.create(
|
||||||
|
type=WorkflowTrigger.WorkflowTriggerType.SCHEDULED,
|
||||||
|
schedule_offset_days=1,
|
||||||
|
schedule_date_field=WorkflowTrigger.ScheduleDateField.CREATED,
|
||||||
|
)
|
||||||
|
action = WorkflowAction.objects.create(assign_owner=self.user2)
|
||||||
|
workflow = Workflow.objects.create(name="Workflow 1", order=0)
|
||||||
|
workflow.triggers.add(trigger)
|
||||||
|
workflow.actions.add(action)
|
||||||
|
|
||||||
|
doc = Document.objects.create(
|
||||||
|
title="sample test",
|
||||||
|
correspondent=self.c,
|
||||||
|
original_filename="sample.pdf",
|
||||||
|
created=timezone.now() - timedelta(days=2),
|
||||||
|
)
|
||||||
|
|
||||||
|
tasks.check_scheduled_workflows()
|
||||||
|
|
||||||
|
self.assertEqual(mock_send_websocket_document_updated.call_count, 1)
|
||||||
|
self.assertEqual(
|
||||||
|
mock_send_websocket_document_updated.call_args.kwargs["document"].pk,
|
||||||
|
doc.pk,
|
||||||
|
)
|
||||||
|
|
||||||
def test_workflow_scheduled_trigger_added(self) -> None:
|
def test_workflow_scheduled_trigger_added(self) -> None:
|
||||||
"""
|
"""
|
||||||
GIVEN:
|
GIVEN:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: paperless-ngx\n"
|
"Project-Id-Version: paperless-ngx\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2026-03-02 16:22+0000\n"
|
"POT-Creation-Date: 2026-03-04 00:28+0000\n"
|
||||||
"PO-Revision-Date: 2022-02-17 04:17\n"
|
"PO-Revision-Date: 2022-02-17 04:17\n"
|
||||||
"Last-Translator: \n"
|
"Last-Translator: \n"
|
||||||
"Language-Team: English\n"
|
"Language-Team: English\n"
|
||||||
@@ -1856,151 +1856,151 @@ msgstr ""
|
|||||||
msgid "paperless application settings"
|
msgid "paperless application settings"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:746
|
#: paperless/settings/__init__.py:752
|
||||||
msgid "English (US)"
|
msgid "English (US)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:747
|
#: paperless/settings/__init__.py:753
|
||||||
msgid "Arabic"
|
msgid "Arabic"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:748
|
#: paperless/settings/__init__.py:754
|
||||||
msgid "Afrikaans"
|
msgid "Afrikaans"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:749
|
#: paperless/settings/__init__.py:755
|
||||||
msgid "Belarusian"
|
msgid "Belarusian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:750
|
#: paperless/settings/__init__.py:756
|
||||||
msgid "Bulgarian"
|
msgid "Bulgarian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:751
|
#: paperless/settings/__init__.py:757
|
||||||
msgid "Catalan"
|
msgid "Catalan"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:752
|
#: paperless/settings/__init__.py:758
|
||||||
msgid "Czech"
|
msgid "Czech"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:753
|
#: paperless/settings/__init__.py:759
|
||||||
msgid "Danish"
|
msgid "Danish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:754
|
#: paperless/settings/__init__.py:760
|
||||||
msgid "German"
|
msgid "German"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:755
|
#: paperless/settings/__init__.py:761
|
||||||
msgid "Greek"
|
msgid "Greek"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:756
|
#: paperless/settings/__init__.py:762
|
||||||
msgid "English (GB)"
|
msgid "English (GB)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:757
|
#: paperless/settings/__init__.py:763
|
||||||
msgid "Spanish"
|
msgid "Spanish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:758
|
#: paperless/settings/__init__.py:764
|
||||||
msgid "Persian"
|
msgid "Persian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:759
|
#: paperless/settings/__init__.py:765
|
||||||
msgid "Finnish"
|
msgid "Finnish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:760
|
#: paperless/settings/__init__.py:766
|
||||||
msgid "French"
|
msgid "French"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:761
|
#: paperless/settings/__init__.py:767
|
||||||
msgid "Hungarian"
|
msgid "Hungarian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:762
|
#: paperless/settings/__init__.py:768
|
||||||
msgid "Indonesian"
|
msgid "Indonesian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:763
|
#: paperless/settings/__init__.py:769
|
||||||
msgid "Italian"
|
msgid "Italian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:764
|
#: paperless/settings/__init__.py:770
|
||||||
msgid "Japanese"
|
msgid "Japanese"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:765
|
#: paperless/settings/__init__.py:771
|
||||||
msgid "Korean"
|
msgid "Korean"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:766
|
#: paperless/settings/__init__.py:772
|
||||||
msgid "Luxembourgish"
|
msgid "Luxembourgish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:767
|
#: paperless/settings/__init__.py:773
|
||||||
msgid "Norwegian"
|
msgid "Norwegian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:768
|
#: paperless/settings/__init__.py:774
|
||||||
msgid "Dutch"
|
msgid "Dutch"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:769
|
#: paperless/settings/__init__.py:775
|
||||||
msgid "Polish"
|
msgid "Polish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:770
|
#: paperless/settings/__init__.py:776
|
||||||
msgid "Portuguese (Brazil)"
|
msgid "Portuguese (Brazil)"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:771
|
#: paperless/settings/__init__.py:777
|
||||||
msgid "Portuguese"
|
msgid "Portuguese"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:772
|
#: paperless/settings/__init__.py:778
|
||||||
msgid "Romanian"
|
msgid "Romanian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:773
|
#: paperless/settings/__init__.py:779
|
||||||
msgid "Russian"
|
msgid "Russian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:774
|
#: paperless/settings/__init__.py:780
|
||||||
msgid "Slovak"
|
msgid "Slovak"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:775
|
#: paperless/settings/__init__.py:781
|
||||||
msgid "Slovenian"
|
msgid "Slovenian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:776
|
#: paperless/settings/__init__.py:782
|
||||||
msgid "Serbian"
|
msgid "Serbian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:777
|
#: paperless/settings/__init__.py:783
|
||||||
msgid "Swedish"
|
msgid "Swedish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:778
|
#: paperless/settings/__init__.py:784
|
||||||
msgid "Turkish"
|
msgid "Turkish"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:779
|
#: paperless/settings/__init__.py:785
|
||||||
msgid "Ukrainian"
|
msgid "Ukrainian"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:780
|
#: paperless/settings/__init__.py:786
|
||||||
msgid "Vietnamese"
|
msgid "Vietnamese"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:781
|
#: paperless/settings/__init__.py:787
|
||||||
msgid "Chinese Simplified"
|
msgid "Chinese Simplified"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: paperless/settings/__init__.py:782
|
#: paperless/settings/__init__.py:788
|
||||||
msgid "Chinese Traditional"
|
msgid "Chinese Traditional"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import json
|
import json
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
from asgiref.sync import async_to_sync
|
from asgiref.sync import async_to_sync
|
||||||
from channels.exceptions import AcceptConnection
|
from channels.exceptions import AcceptConnection
|
||||||
@@ -52,3 +53,10 @@ class StatusConsumer(WebsocketConsumer):
|
|||||||
self.close()
|
self.close()
|
||||||
else:
|
else:
|
||||||
self.send(json.dumps(event))
|
self.send(json.dumps(event))
|
||||||
|
|
||||||
|
def document_updated(self, event: Any) -> None:
|
||||||
|
if not self._authenticated():
|
||||||
|
self.close()
|
||||||
|
else:
|
||||||
|
if self._can_view(event["data"]):
|
||||||
|
self.send(json.dumps(event))
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ def _parse_redis_url(env_redis: str | None) -> tuple[str, str]:
|
|||||||
if "unix" in env_redis.lower():
|
if "unix" in env_redis.lower():
|
||||||
# channels_redis socket format, looks like:
|
# channels_redis socket format, looks like:
|
||||||
# "unix:///path/to/redis.sock"
|
# "unix:///path/to/redis.sock"
|
||||||
_, path = env_redis.split(":")
|
_, path = env_redis.split(":", 1)
|
||||||
# Optionally setting a db number
|
# Optionally setting a db number
|
||||||
if "?db=" in env_redis:
|
if "?db=" in env_redis:
|
||||||
path, number = path.split("?db=")
|
path, number = path.split("?db=")
|
||||||
@@ -141,7 +141,7 @@ def _parse_redis_url(env_redis: str | None) -> tuple[str, str]:
|
|||||||
elif "+socket" in env_redis.lower():
|
elif "+socket" in env_redis.lower():
|
||||||
# celery socket style, looks like:
|
# celery socket style, looks like:
|
||||||
# "redis+socket:///path/to/redis.sock"
|
# "redis+socket:///path/to/redis.sock"
|
||||||
_, path = env_redis.split(":")
|
_, path = env_redis.split(":", 1)
|
||||||
if "?virtual_host=" in env_redis:
|
if "?virtual_host=" in env_redis:
|
||||||
# Virtual host (aka db number)
|
# Virtual host (aka db number)
|
||||||
path, number = path.split("?virtual_host=")
|
path, number = path.split("?virtual_host=")
|
||||||
@@ -493,18 +493,24 @@ TEMPLATES = [
|
|||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
_CHANNELS_BACKEND = os.environ.get(
|
||||||
|
"PAPERLESS_CHANNELS_BACKEND",
|
||||||
|
"channels_redis.pubsub.RedisPubSubChannelLayer",
|
||||||
|
)
|
||||||
CHANNEL_LAYERS = {
|
CHANNEL_LAYERS = {
|
||||||
"default": {
|
"default": {
|
||||||
"BACKEND": "channels_redis.pubsub.RedisPubSubChannelLayer",
|
"BACKEND": _CHANNELS_BACKEND,
|
||||||
"CONFIG": {
|
|
||||||
"hosts": [_CHANNELS_REDIS_URL],
|
|
||||||
"capacity": 2000, # default 100
|
|
||||||
"expiry": 15, # default 60
|
|
||||||
"prefix": _REDIS_KEY_PREFIX,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if _CHANNELS_BACKEND.startswith("channels_redis."):
|
||||||
|
CHANNEL_LAYERS["default"]["CONFIG"] = {
|
||||||
|
"hosts": [_CHANNELS_REDIS_URL],
|
||||||
|
"capacity": 2000, # default 100
|
||||||
|
"expiry": 15, # default 60
|
||||||
|
"prefix": _REDIS_KEY_PREFIX,
|
||||||
|
}
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Email (SMTP) Backend #
|
# Email (SMTP) Backend #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|||||||
@@ -48,6 +48,20 @@ class TestWebSockets(TestCase):
|
|||||||
mock_close.assert_called_once()
|
mock_close.assert_called_once()
|
||||||
mock_close.reset_mock()
|
mock_close.reset_mock()
|
||||||
|
|
||||||
|
message = {
|
||||||
|
"type": "document_updated",
|
||||||
|
"data": {"document_id": 10, "modified": "2026-02-17T00:00:00Z"},
|
||||||
|
}
|
||||||
|
|
||||||
|
await channel_layer.group_send(
|
||||||
|
"status_updates",
|
||||||
|
message,
|
||||||
|
)
|
||||||
|
await communicator.receive_nothing()
|
||||||
|
|
||||||
|
mock_close.assert_called_once()
|
||||||
|
mock_close.reset_mock()
|
||||||
|
|
||||||
message = {"type": "documents_deleted", "data": {"documents": [1, 2, 3]}}
|
message = {"type": "documents_deleted", "data": {"documents": [1, 2, 3]}}
|
||||||
|
|
||||||
await channel_layer.group_send(
|
await channel_layer.group_send(
|
||||||
@@ -158,6 +172,40 @@ class TestWebSockets(TestCase):
|
|||||||
|
|
||||||
await communicator.disconnect()
|
await communicator.disconnect()
|
||||||
|
|
||||||
|
@mock.patch("paperless.consumers.StatusConsumer._can_view")
|
||||||
|
@mock.patch("paperless.consumers.StatusConsumer._authenticated")
|
||||||
|
async def test_receive_document_updated(self, _authenticated, _can_view) -> None:
|
||||||
|
_authenticated.return_value = True
|
||||||
|
_can_view.return_value = True
|
||||||
|
|
||||||
|
communicator = WebsocketCommunicator(application, "/ws/status/")
|
||||||
|
connected, _ = await communicator.connect()
|
||||||
|
self.assertTrue(connected)
|
||||||
|
|
||||||
|
message = {
|
||||||
|
"type": "document_updated",
|
||||||
|
"data": {
|
||||||
|
"document_id": 10,
|
||||||
|
"modified": "2026-02-17T00:00:00Z",
|
||||||
|
"owner_id": 1,
|
||||||
|
"users_can_view": [1],
|
||||||
|
"groups_can_view": [],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
channel_layer = get_channel_layer()
|
||||||
|
assert channel_layer is not None
|
||||||
|
await channel_layer.group_send(
|
||||||
|
"status_updates",
|
||||||
|
message,
|
||||||
|
)
|
||||||
|
|
||||||
|
response = await communicator.receive_json_from()
|
||||||
|
|
||||||
|
self.assertEqual(response, message)
|
||||||
|
|
||||||
|
await communicator.disconnect()
|
||||||
|
|
||||||
@mock.patch("channels.layers.InMemoryChannelLayer.group_send")
|
@mock.patch("channels.layers.InMemoryChannelLayer.group_send")
|
||||||
def test_manager_send_progress(self, mock_group_send) -> None:
|
def test_manager_send_progress(self, mock_group_send) -> None:
|
||||||
with ProgressManager(task_id="test") as manager:
|
with ProgressManager(task_id="test") as manager:
|
||||||
@@ -190,7 +238,10 @@ class TestWebSockets(TestCase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@mock.patch("channels.layers.InMemoryChannelLayer.group_send")
|
@mock.patch("channels.layers.InMemoryChannelLayer.group_send")
|
||||||
def test_manager_send_documents_deleted(self, mock_group_send) -> None:
|
def test_manager_send_documents_deleted(
|
||||||
|
self,
|
||||||
|
mock_group_send: mock.MagicMock,
|
||||||
|
) -> None:
|
||||||
with DocumentsStatusManager() as manager:
|
with DocumentsStatusManager() as manager:
|
||||||
manager.send_documents_deleted([1, 2, 3])
|
manager.send_documents_deleted([1, 2, 3])
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user