-
Notifications
You must be signed in to change notification settings - Fork 18
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat(api-v2): Add support for PDF files #1206
Merged
Merged
Changes from 1 commit
Commits
Show all changes
101 commits
Select commit
Hold shift + click to select a range
ff19529
feature (api-v2): Upload non-image files (ongoing).
91bd6f3
Merge branch 'develop' into wip/1202-upload-non-images
6574df4
Merge branch 'develop' into wip/1202-upload-non-images
2a6012d
Merge branch 'develop' into wip/1202-upload-non-images
7a554f1
Merge branch 'develop' into wip/1202-upload-non-images
0b90fcf
Merge branch 'develop' into wip/1202-upload-non-images
822936d
Merge branch 'develop' into wip/1202-upload-non-images
e48d107
test(api-v2): Fix test.
db04659
test(api-v2): Update test.
d6a9965
Merge branch 'develop' into wip/1202-upload-non-images
db04d6e
Merge branch 'develop' into wip/1202-upload-non-images
9c6b43d
Merge branch 'develop' into wip/1202-upload-non-images
0e2ae67
Merge branch 'develop' into wip/1202-upload-non-images
321eb7f
Merge branch 'develop' into wip/1202-upload-non-images
d1a8dee
Merge branch 'develop' into wip/1202-upload-non-images
67bc622
Merge branch 'develop' into wip/1202-upload-non-images
63d2e1d
Merge branch 'develop' into wip/1202-upload-non-images
5b0edec
Merge branch 'develop' into wip/1202-upload-non-images
2d490df
Merge branch 'develop' into wip/1202-upload-non-images
189a792
Merge branch 'develop' into wip/1202-upload-non-images
dfaaf83
Merge branch 'develop' into wip/1202-upload-non-images
e8c51ec
Merge branch 'develop' into wip/1202-upload-non-images
049498e
test: Fix compile error in test.
b028dff
Merge branch 'develop' into wip/1202-upload-non-images
9a63d4e
Merge branch 'develop' into wip/1202-upload-non-images
5784f76
Merge branch 'develop' into wip/1202-upload-non-images
d5aa88f
Merge branch 'develop' into wip/1202-upload-non-images
f53ddb0
Merge branch 'develop' into wip/1202-upload-non-images
44d3edb
Merge branch 'develop' into wip/1202-upload-non-images
80f532e
Merge branch 'develop' into wip/1202-upload-non-images
74dde70
Merge branch 'develop' into wip/1202-upload-non-images
fa7fe5f
Merge branch 'develop' into wip/1202-upload-non-images
6fdf1ed
Merge branch 'develop' into wip/1202-upload-non-images
2a2f0b6
Merge branch 'develop' into wip/1202-upload-non-images
36d26be
Merge branch 'develop' into wip/1202-upload-non-images
e63d33c
Merge branch 'develop' into wip/1202-upload-non-images
30c52e0
Merge branch 'develop' into wip/1202-upload-non-images
09b8bf8
Merge branch 'develop' into wip/1202-upload-non-images
c63b66a
Merge branch 'develop' into wip/1202-upload-non-images
f451b74
Merge branch 'develop' into wip/1202-upload-non-images
486e0c7
Merge branch 'develop' into wip/1202-upload-non-images
16dfcb4
Merge branch 'develop' into wip/1202-upload-non-images
6414fbf
Merge branch 'develop' into wip/1202-upload-non-images
17113d2
Merge branch 'develop' into wip/1202-upload-non-images
63937bf
Merge branch 'develop' into wip/1202-upload-non-images
ca119e1
Merge branch 'develop' into wip/1202-upload-non-images
c8bbd56
Merge branch 'develop' into wip/1202-upload-non-images
4c7e46e
Merge branch 'develop' into wip/1202-upload-non-images
a12c69e
Merge branch 'develop' into wip/1202-upload-non-images
1266341
Merge branch 'develop' into wip/1202-upload-non-images
a7bc49f
test: Fix test data.
ae389c7
Merge branch 'develop' into wip/1202-upload-non-images
25a7cc6
Merge branch 'develop' into wip/1202-upload-non-images
dc81e1f
Merge branch 'develop' into wip/1202-upload-non-images
4f803af
feat(api-v2): Support non-image files (ongoing).
bdb05bf
Merge branch 'develop' into wip/1202-upload-non-images
893773b
Merge branch 'develop' into wip/1202-upload-non-images
4fcc248
Merge branch 'develop' into wip/1202-upload-non-images
0eeb961
Merge branch 'develop' into wip/1202-upload-non-images
1d9a212
fix: Fix previous merge commit.
e054e73
Merge branch 'develop' into wip/1202-upload-non-images
8c6bccf
Merge branch 'develop' into wip/1202-upload-non-images
ecf2805
feat(api-v2): Allow upload of PDF files (ongoing).
6570517
test(sipi): Fix compile error.
b29d978
Merge branch 'develop' into wip/1202-upload-non-images
5d2676f
fix(sipi): Fix v1 Lua scripts.
80ab4df
Merge branch 'develop' into wip/1202-upload-non-images
6b16f50
test(sipi): Test creating a resource with a CSV file.
4fbb72f
Merge branch 'develop' into wip/1202-upload-non-images
b6d7bea
refactor(sipi): Make 500 error handling consistent in Lua scripts.
0752140
docs(api-v2): Document storing non-image files.
cd00c4c
Merge branch 'develop' into wip/1202-upload-non-images
9be03a7
Merge branch 'develop' into wip/1202-upload-non-images
7bbc80a
Merge branch 'develop' into wip/1202-upload-non-images
d25509b
test(sipi): Add more integration tests.
1f3faf4
fix(sipi): Fix docker-compose.yml.
a507bdd
fix(sipi): Fix typo.
05dbcbe
fix(sipi): Fix typo.
6380562
fix(sipi): Remove redundant line.
e712796
Merge branch 'develop' into wip/1202-upload-non-images
adba4b1
Merge branch 'develop' into wip/1202-upload-non-images
7b098cf
Merge branch 'develop' into wip/1202-upload-non-images
5847ef8
Merge branch 'develop' into wip/1202-upload-non-images
55b9557
Merge branch 'develop' into wip/1202-upload-non-images
d2174b1
Merge branch 'develop' into wip/1202-upload-non-images
746d85e
Merge branch 'develop' into wip/1202-upload-non-images
516e4e4
test(sipi): Check file extension on image upload.
60f8fce
fix(build): Increase timeout.
a50fec1
Merge branch 'develop' into wip/1202-upload-non-images
544c642
test: Fix Sipi test route.
5c43c9f
test: Remove println.
4d3688b
test: Increase GraphDB timeout.
3ef4e9d
Merge branch 'develop' into wip/1202-upload-non-images
cf17688
test: Increase Redis connection timeout.
5dc6e70
test: Increase timeout.
14abdeb
test: Revert commit to wrong branch.
49b2d4f
Merge branch 'develop' into wip/1202-upload-non-images
b4acacf
fix(api-v2): Clarify error message.
7e98f1e
fix(sipi): Restore code that was commented out.
a1a37cc
fix(sipi): Try to fix MIME type consistency check.
86939b8
fix(sipi): Comment out Sipi function call that doesn't work.
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe you need to add
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added that in a1a37cc, but Sipi returns the same HTTP 500 error. I actually think that since this is an API v1 or Sipi bug, and this PR only adds functionality to API v2, there's no reason to hold back this PR because of it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok , and you are going to change the v1 behaviour anyway. If your fix doesn't solve the problem, could you open an issue in Sipi?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In other words, this problem was there before, and this PR doesn't affect it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand, but the code shouldn't have been just commented out in https://github.com/dasch-swiss/knora-api/pull/1459/files#diff-4a1a2aedd2d8b7dee2f824e33b243ca1R123
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's ok for me to make separate issues (Knora and/or Sipi) and move on with this PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps, but that's a different PR. You can't expect every PR to fix every bug that already existed before the PR. You're reviewing this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#1531
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree. But this is kind of a critical issue (Sipi is expected to recreate the image file in its original format), this is why I kept insisting. If it had been a detail, it would not have mattered that much.