Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat(api-v1): Change API v1 file uploads to work like API v2 (DSP-41, PR 3) #1722

Merged
merged 9 commits into from
Oct 6, 2020
Merged

feat(api-v1): Change API v1 file uploads to work like API v2 (DSP-41, PR 3) #1722

merged 9 commits into from
Oct 6, 2020
+1,105 −3,118

Conversation

benjamingeer
Copy link

@benjamingeer benjamingeer commented Sep 30, 2020 •
edited
Loading

This PR changes API v1 so that Knora and Sipi no longer need to share a filesystem.

  • Port feat(api-v1): Change API v1 file uploads to work like API v2 (PR 2) #1667 to the current code structure:
    • Change API v1 to use the same Sipi scripts as API v2.
    • Remove the API v1 Sipi scripts.
    • Change salsah1 to use upload.lua, sending it a JWT token.
    • Update other API v1 tests.
    • Update API v1 docs.
  • Add necessary support for text files in API v1.
  • Update KnoraSipiIntegrationV1ITSpec to create XSLTransformation resources using upload.lua.

Breaking API v1 change: To enable Knora and Sipi to work without sharing a filesystem, the procedure for uploading files in API v1 has changed; see docs/03-apis/api-v1/adding-resources.md, sections "Adding Resources with Image Files" and "Bulk Import with Image Files".

Moved from #1667.
Resolves #535.
Resolves DSP-41.
Resolves DSP-42.

Sorry, something went wrong.

@benjamingeer benjamingeer marked this pull request as draft September 30, 2020 13:39
@benjamingeer benjamingeer mentioned this pull request Sep 30, 2020
Closed
7 tasks
@benjamingeer benjamingeer added enhancement improve existing code or new feature breaking any breaking change API/V1 labels Sep 30, 2020
@benjamingeer benjamingeer self-assigned this Oct 1, 2020
@benjamingeer benjamingeer requested a review from subotic October 1, 2020 12:07
@benjamingeer benjamingeer marked this pull request as ready for review October 1, 2020 12:19
subotic
subotic approved these changes Oct 6, 2020
View reviewed changes
Copy link
Collaborator

@subotic subotic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!

@benjamingeer
Copy link
Author

Thank you for the review! So glad to see this finally done.
🎉 🥳

@benjamingeer benjamingeer merged commit a824bcc into develop Oct 6, 2020
@benjamingeer benjamingeer deleted the wip/DSP-42-api-v1-file-upload branch October 6, 2020 11:53
@kilchenmann kilchenmann mentioned this pull request Jan 8, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@subotic subotic

Assignees

@benjamingeer benjamingeer

Labels
API/V1 breaking any breaking change enhancement improve existing code or new feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Don't require Knora and Sipi to share a directory for image upload
2 participants
@benjamingeer @subotic