Page MenuHomeSoftware Heritage
Differential D7431

Allow filtering add-forge-now requests in listing view
ClosedPublic
Actions

Authored by ardumont on Mar 25 2022, 12:26 PM.

Details

Reviewers
anlambert
Group Reviewers
Reviewers
Maniphest Tasks
T4011: [Add forge now] Filter user requests
Commits
rDWAPPS6b5aa57b3f33: Filter user add-forge-now requests when authenticated
Summary

This introduces a checkbox to allow users to filter their own requests. It's turned on
by default. The checkbox is not shown when connected anonymously.

Either browsing anonymously or unchecking the box (when connected) allows to browse all
requests.

This also unifies the rendering with the save code now view:

  • same datatable layout
  • the spinner logo during computation

screenshots:

user connected (checked by default, list user requests, as they have none, it's empty)

user connected (unchecked, list all requests)

anonymous (list all requests)

Related to T4011
Depends on D7438

Test Plan

cypress

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

ardumont created this revision.Mar 25 2022, 12:26 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptMar 25 2022, 12:26 PM
ardumont edited the summary of this revision. (Show Details)Mar 25 2022, 12:32 PM
ardumont edited the summary of this revision. (Show Details)
swh-public-ci added a comment.Mar 25 2022, 12:46 PM

Build is green

Patch application report for D7431 (id=26893)

Could not rebase; Attempt merge onto 8d5f258e31...

Updating 8d5f258e..602af514
Fast-forward
 assets/src/bundles/add_forge/create-request.js     | 30 +++++++++++++++++++---
 assets/src/bundles/save/index.js                   | 19 ++++++--------
 assets/src/utils/requests-filter-checkbox.ejs      | 17 ++++++++++++
 .../add-forge-now-request-create.spec.js           | 20 +++++++++++++++
 4 files changed, 72 insertions(+), 14 deletions(-)
 create mode 100644 assets/src/utils/requests-filter-checkbox.ejs
Changes applied before test
commit 602af51488d1d8ebfda8927c5451045f5c0f791a
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 25 11:09:56 2022 +0100

    Allow filtering add-forge-now requests in listing view
    
    This also changes to filter user requests by default.
    
    Related to T4011

commit 1ffff63f70226bd41eb59803b8d47a5d7dcbeb06
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 25 10:34:10 2022 +0100

    save-code-now: Extract the checkbox filtering into a js template
    
    This will allow to reuse that part inside the add-forge-now form as well.
    
    Related to T4011

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

Harbormaster completed remote builds in B27807: Diff 26893.Mar 25 2022, 12:46 PM
ardumont requested review of this revision.Mar 25 2022, 12:46 PM
anlambert added a subscriber: anlambert.Mar 25 2022, 1:30 PM
anlambert added inline comments.
assets/src/bundles/add_forge/create-request.js
110–115

Could you update the layout to match other datatables ? Search box should be on the right and number of rows selector on the left.

ardumont added inline comments.Mar 25 2022, 2:14 PM
assets/src/bundles/add_forge/create-request.js
110–115

yes, i'll try.

It's all configured with that 'dom' key entry, right?

anlambert added inline comments.Mar 25 2022, 2:23 PM
assets/src/bundles/add_forge/create-request.js
110–115

Yes, you can inspire from the one of SCN datatables.

ardumont edited the summary of this revision. (Show Details)Mar 25 2022, 2:37 PM
ardumont edited the summary of this revision. (Show Details)
ardumont marked 2 inline comments as done.Mar 25 2022, 3:35 PM
ardumont added inline comments.
assets/src/bundles/add_forge/create-request.js
110–115

done, not updated the diff yet (i'm still fighting the last test...)

ardumont updated this revision to Diff 26915.Mar 25 2022, 4:11 PM
ardumont marked an inline comment as done.
ardumont edited the summary of this revision. (Show Details)
  • rebase
  • Add last test on filtering scenario
  • Unify datatable layout
ardumont edited the summary of this revision. (Show Details)Mar 25 2022, 4:13 PM
ardumont edited the summary of this revision. (Show Details)
anlambert added inline comments.Mar 25 2022, 4:15 PM
cypress/integration/add-forge-now-request-create.spec.js
9–10

In order to avoid flaky tests and weird behavior when using the type command, I advise you to pass these options to it as second parameter: {delay: 0, force: true}.

ardumont added inline comments.Mar 25 2022, 4:17 PM
cypress/integration/add-forge-now-request-create.spec.js
10–15

you mean like this?

cy.get('#swh-input-forge-url').clear().type(url, {delay: 0, force: true});
ardumont updated this revision to Diff 26917.Mar 25 2022, 4:19 PM
ardumont edited the summary of this revision. (Show Details)

Apply suggestion

swh-public-ci added a comment.Mar 25 2022, 4:21 PM

Build has FAILED

Patch application report for D7431 (id=26917)

Rebasing onto 6f1a974c1f...

Current branch diff-target is up to date.
Changes applied before test
commit 2783ff28d63e58237d1b03cda897deceeabdf2ad
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 25 11:09:56 2022 +0100

    Filter user add-forge-now requests when authenticated
    
    This introduces a checkbox to allow users to filter their own requests. It's turned on
    by default. The checkbox is not shown when connected anonymously.
    
    Either browsing anonymously or unchecking the box (when connected) allows to browse all
    requests.
    
    This also unifies the rendering with the save code now view:
    - same datatable layout
    - the spinner logo during computation
    
    Related to T4011

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

Harbormaster failed remote builds in B27834: Diff 26917!Mar 25 2022, 4:21 PM
swh-public-ci added a comment.Mar 25 2022, 4:31 PM

Build has FAILED

Patch application report for D7431 (id=26915)

Rebasing onto 6f1a974c1f...

Current branch diff-target is up to date.
Changes applied before test
commit 3777f9e68be0125b97f4ec86790b2930cad44064
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 25 11:09:56 2022 +0100

    Filter user add-forge-now requests when authenticated
    
    This introduces a checkbox to allow users to filter their own requests. It's turned on
    by default. The checkbox is not shown when connected anonymously.
    
    Either browsing anonymously or unchecking the box (when connected) allows to browse all
    requests.
    
    This also unifies the rendering with the save code now view:
    - same datatable layout
    - the spinner logo during computation
    
    Related to T4011

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

Harbormaster failed remote builds in B27832: Diff 26915!Mar 25 2022, 4:31 PM
ardumont updated this revision to Diff 26918.Mar 25 2022, 4:39 PM

Trigger build

swh-public-ci added a comment.Mar 25 2022, 4:58 PM

Build has FAILED

Patch application report for D7431 (id=26918)

Rebasing onto 6f1a974c1f...

Current branch diff-target is up to date.
Changes applied before test
commit 2783ff28d63e58237d1b03cda897deceeabdf2ad
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 25 11:09:56 2022 +0100

    Filter user add-forge-now requests when authenticated
    
    This introduces a checkbox to allow users to filter their own requests. It's turned on
    by default. The checkbox is not shown when connected anonymously.
    
    Either browsing anonymously or unchecking the box (when connected) allows to browse all
    requests.
    
    This also unifies the rendering with the save code now view:
    - same datatable layout
    - the spinner logo during computation
    
    Related to T4011

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

Harbormaster failed remote builds in B27835: Diff 26918!Mar 25 2022, 4:59 PM
ardumont edited the summary of this revision. (Show Details)Mar 25 2022, 5:37 PM
ardumont added a parent revision: D7438: Fix flaky test in the request dashboard spec.
ardumont updated this revision to Diff 26928.Mar 25 2022, 5:38 PM
ardumont edited the summary of this revision. (Show Details)

Rebase on the fixing diff D7438

ardumont mentioned this in D7438: Fix flaky test in the request dashboard spec.Mar 25 2022, 5:40 PM
anlambert accepted this revision.Mar 25 2022, 5:41 PM
This revision is now accepted and ready to land.Mar 25 2022, 5:41 PM
swh-public-ci added a comment.Mar 25 2022, 5:56 PM

Build is green

Patch application report for D7431 (id=26928)

Could not rebase; Attempt merge onto 6f1a974c1f...

Updating 6f1a974c..6b5aa57b
Fast-forward
 assets/src/bundles/add_forge/create-request.js     | 35 ++++++++--
 .../add-forge-now-request-create.spec.js           | 80 ++++++++++++++++++++--
 .../add-forge-now-request-dashboard.spec.js        |  5 ++
 cypress/plugins/index.js                           |  8 +++
 cypress/support/index.js                           |  4 ++
 swh/web/tests/create_test_users.py                 |  3 +-
 6 files changed, 126 insertions(+), 9 deletions(-)
Changes applied before test
commit 6b5aa57b3f33491df10dd5a83f22ed091dc7885f
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 25 11:09:56 2022 +0100

    Filter user add-forge-now requests when authenticated
    
    This introduces a checkbox to allow users to filter their own requests. It's turned on
    by default. The checkbox is not shown when connected anonymously.
    
    Either browsing anonymously or unchecking the box (when connected) allows to browse all
    requests.
    
    This also unifies the rendering with the save code now view:
    - same datatable layout
    - the spinner logo during computation
    
    Related to T4011

commit 930ab5ed5725d1a9254987da8d41a3954b30ea99
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri Mar 25 17:34:22 2022 +0100

    Fix flaky test in the request dashboard spec

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

Harbormaster completed remote builds in B27845: Diff 26928.Mar 25 2022, 5:56 PM
Closed by commit rDWAPPS6b5aa57b3f33: Filter user add-forge-now requests when authenticated (authored by ardumont). · Explain WhyMar 25 2022, 5:57 PM
This revision was automatically updated to reflect the committed changes.
ardumont added a commit: rDWAPPS6b5aa57b3f33: Filter user add-forge-now requests when authenticated.

Revision Contents
Changeset List

PathSize
assets/
src/
bundles/
add_forge/
35 lines
cypress/
integration/
80 lines
plugins/
8 lines
support/
4 lines
swh/
web/
tests/
3 lines

Diff 26930

View Options

assets/src/bundles/add_forge/create-request.js

Loading...
View Options

cypress/integration/add-forge-now-request-create.spec.js

Loading...
View Options

cypress/plugins/index.js

Loading...
View Options

cypress/support/index.js

Loading...
View Options

swh/web/tests/create_test_users.py

Loading...
About · Developer information · Legal