[Doc Repo] Refactor to use new File Uploader class #5234

johnsaigle · 2019-09-18T21:38:10Z

Brief summary of changes

Use the new File Uploader class to do file uploading.
Add a new permission document_repository_edit to separate view and edit permissions.
Cleanup files class in the doc repo module

Testing instructions (if applicable)

Run the patch.
In the Configuration module under Paths, set documentRepositoryPath to a writable folder on your system.
Using a superuser, or another user with the new document_repository_edit permission, ensure that you can upload files.
Make sure that you can download the files you've uploaded.
Try uploading a file type that's not allowed, such as an .mp3 file. You should get a Sweet Alert error message.
Remove the document_repository_edit permission. You should get a 403 response when trying to upload any file.

Links to related tickets (GitHub, Redmine, ...)

johnsaigle · 2019-09-18T21:38:54Z

This is accidentally based on another PR... will rebase soon.

Also I didn't update the test plan but I imagine that needs to be done.

jesscall · 2019-10-23T20:27:46Z

SQL/0000-00-01-Permission.sql

@@ -101,7 +101,8 @@ INSERT INTO `permissions` VALUES
    (52,'instrument_manager_write', 'Instrument Manager: Install new instruments via file upload', 2),
    (53,'publication_view', 'Publication - Access to module', 2),
    (54,'publication_propose', 'Publication - Propose a project', 2),
-    (55,'publication_approve', 'Publication - Approve or reject proposed publication projects', 2);
+    (55,'publication_approve', 'Publication - Approve or reject proposed publication projects', 2),
+    (56,'document_repository_edit','Upload and edit files in Document Repository','2');


Are you proposing 3 doc repo permissions? Is this new document_repository_edit permission also separate from the document_repository_delete permission?

I just wanted to separate view from edit, basically.

I'm not sure whether there should also be a delete. Maybe there is a use case where someone is allowed to edit information about doc repo files but shouldn't be able to remove them entirely?

I agree with separating view and upload / edit.

I'm not sure we need that much granularity in terms of edit / delete, but I'm not strictly opposed to it

raisinbread/RB_files/RB_Config.sql

johnsaigle · 2019-10-30T20:26:29Z

TODO: Restart Travis

johnsaigle · 2019-12-02T17:33:33Z

#5815 also adds a document repository setting and I think that PR should go in before this one. Adding Blocked label.

zaliqarosli · 2019-12-02T21:11:51Z

@johnsaigle is this ready for review even though needs rebase and is blocked?

johnsaigle · 2019-12-02T22:02:22Z

@zaliqarosli Nope it will require some changes after all these months. I'll fix it soon.

johnsaigle · 2019-12-03T18:44:21Z

The raisinbread files got messed up during my rebase. I'll rerun the exporter script and commit the correct results when the VMs come back.

Co-Authored-By: Zaliqa <zaliqa.rosli@mcin.ca>

johnsaigle · 2020-07-07T20:37:04Z

@nicolasbrossard It's working now in my local testing. Would you mind trying again?

nicolasbrossard · 2020-07-07T21:08:33Z

Works now! 👍 Approving this PR.

johnsaigle · 2020-07-07T21:27:13Z

Thanks for all the help!

- Use the new File Uploader class to do file uploading. - Add a new permission document_repository_edit to separate view and edit permissions. - Cleanup files class in the doc repo module Resolves aces#4854 Resolves aces#6373

johnsaigle added Language: SQL PR or issue that update SQL code and removed State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) State: Needs documentation PR that needs a more exhaustive documentation to proceed labels Sep 18, 2019

johnsaigle mentioned this pull request Sep 23, 2019

Document Repository and Data Release should not store uploaded files in the codebase #5062

Closed

jesscall reviewed Oct 23, 2019

View reviewed changes

johnsaigle added the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label Oct 23, 2019

jesscall added the State: Needs RB update PR that needs to update Raisinbread to reflect its changes label Oct 23, 2019

johnsaigle removed State: Needs RB update PR that needs to update Raisinbread to reflect its changes State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) labels Oct 28, 2019

johnsaigle commented Oct 28, 2019

View reviewed changes

raisinbread/RB_files/RB_Config.sql Outdated Show resolved Hide resolved

johnsaigle added the State: Needs work PR awaiting additional work by the author to proceed label Oct 30, 2019

johnsaigle added State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) and removed State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) State: Needs work PR awaiting additional work by the author to proceed labels Nov 27, 2019

cmadjar assigned zaliqarosli Nov 29, 2019

johnsaigle added the State: Blocked PR or issue awaiting an external event such as the merge or another PR to proceed label Dec 2, 2019

johnsaigle added the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label Dec 2, 2019

johnsaigle added State: Needs RB update PR that needs to update Raisinbread to reflect its changes and removed State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) labels Dec 3, 2019

johnsaigle changed the base branch from major to master December 3, 2019 18:44

johnsaigle and others added 19 commits July 7, 2020 15:59

Fix bug in building path

15acee0

improve error handling

0d9a33d

remove unnecessary comments

c479cb2

Fix SWAL issues

2d12ba1

Undo changes to instrument manager

d616d48

Update modules/instrument_manager/jsx/uploadForm.js

162d304

Co-Authored-By: Zaliqa <zaliqa.rosli@mcin.ca>

Fix config variable name

c308cc3

add new permissions to admin rb user

8745aa3

phpcs

9a74115

Helping to fix javascript

9733047

handling unknown errors

b0bf21e

update error handling message

546e8ca

fix json

bc47728

update permission descriptions

8dffe61

finalized unknown error message

ae890d5

remove print statement

0f00d77

fixing error upon file upload

e8044da

fix typo

21711d3

restore uploading files to a user sub directory

d94fc48

nicolasbrossard approved these changes Jul 7, 2020

View reviewed changes

johnsaigle requested a review from driusan July 7, 2020 21:27

driusan merged commit f38c95d into aces:master Jul 8, 2020

ridz1208 added this to the 24.0.0 milestone Jul 15, 2020

ridz1208 mentioned this pull request Aug 17, 2021

Push 23.0.5 into main #7537

Closed

skarya22 mentioned this pull request Oct 3, 2024

[document_repository] Remove File Type Restriction #9388

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Doc Repo] Refactor to use new File Uploader class #5234

[Doc Repo] Refactor to use new File Uploader class #5234

johnsaigle commented Sep 18, 2019 •

edited

Loading

johnsaigle commented Sep 18, 2019

jesscall Oct 23, 2019 •

edited

Loading

johnsaigle Oct 23, 2019

jesscall Oct 23, 2019

johnsaigle commented Oct 30, 2019

johnsaigle commented Dec 2, 2019

zaliqarosli commented Dec 2, 2019

johnsaigle commented Dec 2, 2019

johnsaigle commented Dec 3, 2019

johnsaigle commented Jul 7, 2020

nicolasbrossard commented Jul 7, 2020

johnsaigle commented Jul 7, 2020

[Doc Repo] Refactor to use new File Uploader class #5234

[Doc Repo] Refactor to use new File Uploader class #5234

Conversation

johnsaigle commented Sep 18, 2019 • edited Loading

Brief summary of changes

Testing instructions (if applicable)

Links to related tickets (GitHub, Redmine, ...)

johnsaigle commented Sep 18, 2019

jesscall Oct 23, 2019 • edited Loading

Choose a reason for hiding this comment

johnsaigle Oct 23, 2019

Choose a reason for hiding this comment

jesscall Oct 23, 2019

Choose a reason for hiding this comment

johnsaigle commented Oct 30, 2019

johnsaigle commented Dec 2, 2019

zaliqarosli commented Dec 2, 2019

johnsaigle commented Dec 2, 2019

johnsaigle commented Dec 3, 2019

johnsaigle commented Jul 7, 2020

nicolasbrossard commented Jul 7, 2020

johnsaigle commented Jul 7, 2020

johnsaigle commented Sep 18, 2019 •

edited

Loading

jesscall Oct 23, 2019 •

edited

Loading