Page MenuHomeSoftware Heritage
Differential D5673

origin_save: Enable to filter user submitted save requests in Web UI
ClosedPublic
Actions

Authored by anlambert on May 4 2021, 6:27 PM.

Details

Reviewers
ardumont
vlorentz
Group Reviewers
Reviewers
Maniphest Tasks
T3272: Authenticated users should be able to browse their save code now requests
Commits
rDWAPPS43636f47d562: origin_save: Enable to filter user submitted save requests in Web UI
Summary

If a user has submitted save code now requests while being authenticated,
he will be able to filter those requests through a new dedicated checkbox
in the "Browse save requests" tab of the Save code now Web UI.

Related to T3272

Depends on D5679 (I manually hack the Jenkins pipeline until it is landed)

Diff Detail

Repository
rDWAPPS Web applications
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

anlambert created this revision.May 4 2021, 6:27 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptMay 4 2021, 6:27 PM
Harbormaster returned this revision to the author for changes because remote builds failed.May 4 2021, 6:32 PM
Harbormaster failed remote builds in B21255: Diff 20268!
swh-public-ci added a comment.May 4 2021, 6:34 PM

Build has FAILED

Patch application report for D5673 (id=20268)

Rebasing onto f8c750b65a...

Current branch diff-target is up to date.
Changes applied before test
commit f548dd7006c4b0a696ac513b0f5affb2b1197cf0
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/772/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/772/console

swh-public-ci added a comment.May 4 2021, 6:42 PM

Build has FAILED

Patch application report for D5673 (id=20268)

Rebasing onto f8c750b65a...

Current branch diff-target is up to date.
Changes applied before test
commit f548dd7006c4b0a696ac513b0f5affb2b1197cf0
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/773/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/773/console

swh-public-ci added a comment.May 4 2021, 7:37 PM

Build has FAILED

Patch application report for D5673 (id=20268)

Rebasing onto f8c750b65a...

Current branch diff-target is up to date.
Changes applied before test
commit f548dd7006c4b0a696ac513b0f5affb2b1197cf0
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/775/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/775/console

anlambert updated this revision to Diff 20286.May 5 2021, 12:19 PM

Put test user creation in a separate file

swh-public-ci added a comment.May 5 2021, 12:20 PM

Build has FAILED

Patch application report for D5673 (id=20268)

Rebasing onto f8c750b65a...

Current branch diff-target is up to date.
Changes applied before test
commit f548dd7006c4b0a696ac513b0f5affb2b1197cf0
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/777/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/777/console

anlambert mentioned this in D5679: templates/stage-cypress-tests: Handle all user creation scripts.May 5 2021, 12:22 PM
anlambert edited the summary of this revision. (Show Details)May 5 2021, 12:23 PM
anlambert added a parent revision: D5679: templates/stage-cypress-tests: Handle all user creation scripts.
anlambert edited the summary of this revision. (Show Details)
swh-public-ci added a comment.May 5 2021, 12:28 PM

Build has FAILED

Patch application report for D5673 (id=20286)

Rebasing onto f8c750b65a...

Current branch diff-target is up to date.
Changes applied before test
commit 68f265aa47901aa51bef045f969c480cafba577e
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/778/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/778/console

Harbormaster returned this revision to the author for changes because remote builds failed.May 5 2021, 12:28 PM
Harbormaster failed remote builds in B21272: Diff 20286!
swh-public-ci added a comment.May 5 2021, 1:53 PM

Build has FAILED

Patch application report for D5673 (id=20286)

Rebasing onto f8c750b65a...

Current branch diff-target is up to date.
Changes applied before test
commit 68f265aa47901aa51bef045f969c480cafba577e
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/779/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/779/console

swh-public-ci added a comment.May 5 2021, 2:28 PM

Build is green

Patch application report for D5673 (id=20286)

Rebasing onto f8c750b65a...

Current branch diff-target is up to date.
Changes applied before test
commit 68f265aa47901aa51bef045f969c480cafba577e
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/780/ for more details.

Harbormaster completed remote builds in B21272: Diff 20286.May 5 2021, 2:28 PM
anlambert requested review of this revision.May 5 2021, 2:28 PM
anlambert added inline comments.May 5 2021, 2:41 PM
assets/src/bundles/save/index.js
79–81

that weird syntax set the datatables UI components plus an extra one while not breaking the bootstrap layout.
(see comments in https://datatables.net/examples/advanced_init/dom_toolbar.html)

ardumont added a subscriber: ardumont.May 5 2021, 2:48 PM
ardumont added inline comments.
assets/src/bundles/save/index.js
79–81

yes, thanks, I recall datatable are highly configurable and some with weird syntax ;)

Maybe inline your comment in the code directly so we can refer to it next time we encouter and scratch our heads ;)

swh/web/api/views/origin_save.py
90 ↗(On Diff #20286)

oops ;)

ardumont accepted this revision.May 5 2021, 2:54 PM

lgtm, a couple of question/suggestion and one spurious print to drop inline ;)

swh/web/tests/misc/test_origin_save.py
28

I did not immediately get what you added at the end (connecting the
user and filtering only on their input).
Might be describing a bit the test would be nice?

This revision is now accepted and ready to land.May 5 2021, 2:54 PM
vlorentz added a subscriber: vlorentz.EditedMay 5 2021, 2:57 PM

(I did not finish reviewing, but I'm marking this as "request changes" now so you don't merge it immediately)

No API endpoint for this feature?

Possibly a dumb question, but why do we have classes like this:

<div class="custom-control custom-checkbox swhid-option">
  <input class="custom-control-input">
  <label class="custom-control-label" ...>

Can't the CSS refer to custom-control input and custom-control label instead of custom-control-input and custom-control-label?

assets/src/bundles/save/index.js
40

might be a bit clearer like this

79–81

I was about to ask about this.

I still don't understand what is happening here after reading that page. Could you explain it with a comment in the code?

cypress/integration/origin-save.spec.js
429–469

could you add some comments inside this test to explain the steps?

swh/web/api/views/origin_save.py
90 ↗(On Diff #20286)

forgot to remove this

swh/web/templates/misc/origin-save.html
99–100
vlorentz requested changes to this revision.May 5 2021, 2:57 PM
This revision now requires changes to proceed.May 5 2021, 2:57 PM
anlambert added a comment.May 5 2021, 3:22 PM

No API endpoint for this feature?

Ah right we could add a /origin/save/requests endpoint that lists submitted requests in a paginated way with query parameters to filter the results in a similar way than the Web UI.

This could be a nice easy hack task.

vlorentz added a comment.May 5 2021, 3:44 PM

I'm done now.

Last comment: when someone creates a Save request and it remains in status "not yet scheduled", and a logged in user clicks "Save again", it does not appear when this user selects "show only your requests".
I did not try with other statuses, though.

Is it on purpose?

anlambert added a comment.May 5 2021, 4:06 PM
In D5673#144347, @vlorentz wrote:

I'm done now.

Last comment: when someone creates a Save request and it remains in status "not yet scheduled", and a logged in user clicks "Save again", it does not appear when this user selects "show only your requests".
I did not try with other statuses, though.

Is it on purpose?

Yes, if someone tries to create a request for an origin but there is already one in pending state, the request will not be created again.
Proper solution would be to store a list of user ids in the save request model using a django ArrayField.

anlambert planned changes to this revision.May 5 2021, 4:09 PM
anlambert added inline comments.
assets/src/bundles/save/index.js
79–81

sure

cypress/integration/origin-save.spec.js
429–469

ack, @ardumont also found some were missing.

swh/web/api/views/origin_save.py
90 ↗(On Diff #20286)

whoopsie

swh/web/templates/misc/origin-save.html
99–100

ack

swh/web/tests/misc/test_origin_save.py
28

In fact I was just lazy to write a new test function but I should have.

anlambert added a comment.EditedMay 5 2021, 4:20 PM

Proper solution would be to store a list of user ids in the save request model using a django ArrayField.

Unfortunately, this is PostgreSQL specific. I guess I can use a TextField then and concatenates the user ids separated by commas.

anlambert added a comment.May 5 2021, 5:28 PM

Can't the CSS refer to custom-control input and custom-control label instead of custom-control-input and custom-control-label?

I just followed bootstrap doc here.

anlambert updated this revision to Diff 20308.May 5 2021, 6:07 PM

Update: Adapt according to reviews

anlambert planned changes to this revision.May 5 2021, 6:11 PM
swh-public-ci added a comment.May 5 2021, 6:17 PM

Build is green

Patch application report for D5673 (id=20308)

Rebasing onto 934cb65cdf...

First, rewinding head to replay your work on top of it...
Applying: origin_save: Enable to filter user submitted save requests in Web UI
Changes applied before test
commit 9295176739ede407cc0c753c08a16b8fc2cdde86
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/784/ for more details.

Harbormaster completed remote builds in B21290: Diff 20308.May 5 2021, 6:17 PM
anlambert updated this revision to Diff 20313.May 5 2021, 6:55 PM

Fix migrations

anlambert added inline comments.May 5 2021, 6:57 PM
swh/web/common/migrations/0011_saveoriginrequest_user_ids.py
1–22

Note that migration number 10 did not get deployed to production yet, it could be removed and that migration will become number 10.

swh-public-ci added a comment.May 5 2021, 7:05 PM

Build is green

Patch application report for D5673 (id=20313)

Rebasing onto 934cb65cdf...

First, rewinding head to replay your work on top of it...
Applying: origin_save: Enable to filter user submitted save requests in Web UI
Changes applied before test
commit c820e3e5b3f280a5b5afbe19665aee7216196462
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/786/ for more details.

Harbormaster completed remote builds in B21295: Diff 20313.May 5 2021, 7:05 PM
vlorentz accepted this revision.May 6 2021, 10:52 AM

thanks

This revision is now accepted and ready to land.May 6 2021, 10:52 AM
anlambert updated this revision to Diff 20331.May 6 2021, 11:08 AM

Rebase and improve if condition

swh-public-ci added a comment.May 6 2021, 11:16 AM

Build is green

Patch application report for D5673 (id=20331)

Rebasing onto 934cb65cdf...

Current branch diff-target is up to date.
Changes applied before test
commit 43636f47d5626fb56d99a90b64e10bf39de9f6d1
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Tue May 4 14:50:53 2021 +0200

    origin_save: Enable to filter user submitted save requests in Web UI
    
    If a user has submitted save code now requests while being authenticated,
    he will be able to filter those requests through a new dedicated checkbox
    in the "Browse save requests" tab of the Save code now Web UI.
    
    Related to T3272

See https://jenkins.softwareheritage.org/job/DWAPPS/job/tests-on-diff/789/ for more details.

Harbormaster completed remote builds in B21313: Diff 20331.May 6 2021, 11:16 AM
Closed by commit rDWAPPS43636f47d562: origin_save: Enable to filter user submitted save requests in Web UI (authored by anlambert). · Explain WhyMay 6 2021, 11:21 AM
This revision was automatically updated to reflect the committed changes.
anlambert added a commit: rDWAPPS43636f47d562: origin_save: Enable to filter user submitted save requests in Web UI.

Revision Contents
Changeset List

PathSize
1 line
assets/
src/
bundles/
save/
33 lines
cypress/
integration/
59 lines
support/
14 lines
swh/
web/
common/
migrations/
22 lines
5 lines
12 lines
misc/
6 lines
templates/
misc/
3 lines
tests/
api/
views/
25 lines
16 lines
misc/
57 lines
15 lines

Diff 20333

View Options

Makefile.local

Loading...
View Options

assets/src/bundles/save/index.js

Loading...
View Options

cypress/integration/origin-save.spec.js

Loading...
View Options

cypress/support/index.js

Loading...
View Options

swh/web/common/migrations/0011_saveoriginrequest_user_ids.py

Loading...
View Options

swh/web/common/models.py

Loading...
View Options

swh/web/common/origin_save.py

Loading...
View Options

swh/web/misc/origin_save.py

Loading...
View Options

swh/web/templates/misc/origin-save.html

Loading...
View Options

swh/web/tests/api/views/test_origin_save.py

Loading...
View Options

swh/web/tests/create_test_users.py

Loading...
View Options

swh/web/tests/misc/test_origin_save.py

Loading...
View Options

swh/web/tests/test_migrations.py

Loading...
About · Developer information · Legal