Commit Graph

2582 Commits

Author SHA1 Message Date
eikek
21647e950d Add docs for merging items 2021-08-16 14:41:56 +02:00
eikek
9478152a94 Switch to search view after successful merge 2021-08-16 14:40:57 +02:00
eikek
a923351b09 Fix item merge when merging tags and text fields
Also hard delete the remaining items. They are empty (have no
attachments), because data is moved if possible. Doesn't make much
sense to keep them, because restoring them isn't much useful.
2021-08-16 14:40:52 +02:00
eikek
8099b78b0e Merge items in webui 2021-08-16 12:55:25 +02:00
eikek
85085ec173 Implement item merge 2021-08-16 12:32:54 +02:00
eikek
22d331f082 Integrate item merge dialog into home page 2021-08-16 12:32:54 +02:00
mergify[bot]
5782166273
Merge pull request #1010 from eikek/fixup/347-file-exists
Fixup for deleting items
2021-08-15 14:11:36 +00:00
eikek
14e4a8f792 Fixup for deleting items
First, when checking for existence of a file, deleted items are not
conisdered.

The working with fulltext search has been changed: deleted items are
removed from fulltext index and are re-added when they are restored.
The fulltext index currently doesn't hold the item state and it would
mean much more work to introduce it into the index (or, worse, to
reprocess the results from the index). Thus, deleted items can only be
searched using database queries. It is probably a very rare use case
when fulltext search should be applied to deleted items. They have
been deleted for a reason and the most likely case is that they are
simply removed.

Refs: #347
2021-08-15 16:00:30 +02:00
mergify[bot]
50387cd378
Merge pull request #1009 from eikek/fixup/347-delete-duration
Use a minimum age of items to remove
2021-08-15 10:50:30 +00:00
eikek
bc6924fd5d Show delete/restore buttons conditionally
When only trashed items are selected, the "delete" button doesn't make
sense and vice versa.
2021-08-15 12:41:10 +02:00
eikek
f4a2b86ea8 Use a minimum age of items to remove
In order to keep deleted items for a while, the periodic task can now
use a duration to only remove items with a certain age. This can be
used to ensure that a deleted item stays at least X days before it
will be removed from the database.

Refs: #347
2021-08-15 12:32:50 +02:00
mergify[bot]
cabc0dfa0d
Merge pull request #1008 from scala-steward/update/jsoup-1.14.2
Update jsoup to 1.14.2
2021-08-15 08:46:19 +00:00
Scala Steward
3cc5e56f8e
Update jsoup to 1.14.2 2021-08-15 10:35:49 +02:00
mergify[bot]
fd3642ba31
Merge pull request #1007 from scala-steward/update/sbt-sonatype-3.9.9
Update sbt-sonatype to 3.9.9
2021-08-15 05:14:04 +00:00
Scala Steward
fa6cbfba43
Update sbt-sonatype to 3.9.9 2021-08-15 07:02:00 +02:00
eikek
d136bb8166 Update docker url in README 2021-08-15 02:18:08 +02:00
mergify[bot]
fe7d64d989
Merge pull request #1006 from eikek/feature/347-delete-items
Feature/347 delete items
2021-08-14 20:16:17 +00:00
eikek
ef31c90e34 Fix submitter column of a collective-scoped periodic job 2021-08-14 22:07:56 +02:00
eikek
4562c77152 Fix migration changeset name for h2 2021-08-14 22:07:56 +02:00
eikek
31d885ed79 Refactor user tasks to support collective and user scopes
Before, there were periodic tasks run per collective and not user by
making sure that submitter + group are the same value. This is now
encoded in `UserTaskScope` so it is now obvious and errors can be
reduced when using this.
2021-08-14 22:07:56 +02:00
eikek
548dfb9a57 Fix openapi.yml where undefined query parameter 2021-08-14 20:40:04 +02:00
eikek
27fd7a5867 Make sure the empty-trash task is started for all collectives 2021-08-14 20:40:04 +02:00
eikek
50706c3d6d Add a task implementation to delete items 2021-08-14 19:33:18 +02:00
eikek
4901276c66 Change "empty trash" settings for a collective and submit the job 2021-08-14 19:33:15 +02:00
eikek
828e5cf703 Allow to restore deleted items in webui 2021-08-14 16:50:17 +02:00
eikek
f999662905 Add routes to restore deleted items 2021-08-14 16:48:03 +02:00
eikek
eede20b014 Display deleted items in the webui
The card renders a trash can in the top right corner and the detail
page shows a label and also this trash can.
2021-08-14 16:06:55 +02:00
eikek
3f1ff5c1ac Allow to search in deleted items 2021-08-14 15:35:17 +02:00
eikek
edb344314f Use an enum instead of a boolean to differentiate search
It's not very likely to have more modes of search besides normal and
trashed, but got surprised in that way quite often and it's nicer this
way anyways.
2021-08-14 15:11:48 +02:00
eikek
a7b74bd5ae Allow to search in soft-deleted items
A new query/request parameter can be used to apply a search to only
soft-deleted items.

The query expression `Trashed` has been introduced which selects only
items with state `Deleted`. This is another option an analog to
`ValidItemStates` (both cannot be used together as they would select
no items). This new query node is not added to the parser, because
users may not use it in their own queries - it must be part of the
"fixed" query so the application can control in which subset to search
(it would otherwise be possible to select any items).
2021-08-14 14:53:05 +02:00
eikek
cb777e30c0 Delete items by introducing a deleted state
When deleting items via the http api, they are not deleted anymore but
a new status "Deleted" is set. The collective insights contains now a
count separately for deleted items.
2021-08-14 14:18:03 +02:00
eikek
48d13a35fc Fix search summary to restrict on valid items 2021-08-14 14:09:07 +02:00
mergify[bot]
1d90095707
Merge pull request #1005 from eikek/fix/973-jpn-ocr
Use different japanese train files for tesseract
2021-08-13 14:59:04 +00:00
eikek
326cf1c087 Use different japanese train files for tesseract
They seem to work better as suggested here:
https://github.com/tesseract-ocr/tessdata/issues/119

Refs: #973
2021-08-13 16:46:37 +02:00
eikek
f79aa447b5
Merge pull request #1004 from eikek/dependabot/npm_and_yarn/modules/webapp/path-parse-1.0.7
Bump path-parse from 1.0.6 to 1.0.7 in /modules/webapp
2021-08-13 09:03:54 +02:00
dependabot[bot]
e669876ce2
Bump path-parse from 1.0.6 to 1.0.7 in /modules/webapp
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-13 01:49:38 +00:00
mergify[bot]
333fa6d93a
Merge pull request #1003 from eikek/fix/975-viewerjs
Fix path to viewerjs for pdf view
2021-08-12 23:13:26 +00:00
eikek
08ce6b5256 Fix path to viewerjs for pdf view 2021-08-13 00:58:13 +02:00
eikek
968f8f6932
Merge pull request #1002 from eikek/renovate/postgres-13.x
Update postgres Docker tag to v13.4
2021-08-12 23:53:07 +02:00
Renovate Bot
93981fe869
Update postgres Docker tag to v13.4 2021-08-12 21:27:18 +00:00
eikek
f61844a800
Merge pull request #1000 from eikek/renovate/npm-path-parse-vulnerability
Update dependency path-parse to 1.0.7 [SECURITY]
2021-08-12 13:40:16 +02:00
Renovate Bot
51c35bd7dd
Update dependency path-parse to 1.0.7 [SECURITY] 2021-08-12 11:22:06 +00:00
mergify[bot]
ac7dc8138d
Merge pull request #999 from scala-steward/update/mariadb-java-client-2.7.4
Update mariadb-java-client to 2.7.4
2021-08-11 18:32:10 +00:00
Scala Steward
672d5892eb
Update mariadb-java-client to 2.7.4 2021-08-11 20:23:36 +02:00
mergify[bot]
68b3b943f0
Merge pull request #998 from eikek/fix/976-docker-healthcheck
Fix health check in docker images
2021-08-11 17:32:38 +00:00
eikek
9457de32b6 Fix health check in docker images 2021-08-11 19:23:15 +02:00
mergify[bot]
0d05cb01ca
Merge pull request #997 from eikek/fix/zola-build
Update website to zola 0.13.0
2021-08-11 16:34:01 +00:00
eikek
166384d338 Update website to zola 0.13.0 2021-08-11 18:23:38 +02:00
mergify[bot]
7bd7a953e5
Merge pull request #996 from scala-steward/update/flyway-core-7.13.0
Update flyway-core to 7.13.0
2021-08-11 14:28:54 +00:00
Scala Steward
45e3577457
Update flyway-core to 7.13.0 2021-08-11 16:19:56 +02:00