Page MenuHomeSoftware Heritage
Differential D6502

assets/origin-save: Display rejection reason in request info popover
ClosedPublic
Actions

Authored by anlambert on Oct 19 2021, 11:21 AM.

Details

Reviewers
ardumont
Group Reviewers
Reviewers
Maniphest Tasks
T3256: Propose reason for rejecting a save code now
Commits
rDWAPPS96b3d287ed50: assets/origin-save: Display rejection reason in request info popover
Summary

When a save request has been rejected, the rejection note can be displayed
by clicking on the info icon in the save request tables.

Related to T3256

Depends on D6501

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.Oct 19 2021, 11:21 AM
Herald added a reviewer: Reviewers. · View Herald TranscriptOct 19 2021, 11:21 AM
swh-public-ci added a comment.Oct 19 2021, 11:35 AM

Build has FAILED

Patch application report for D6502 (id=23617)

Could not rebase; Attempt merge onto 61b80b8b23...

Updating 61b80b8b..4c9548e1
Fast-forward
 Makefile.local                           |   2 +-
 assets/src/bundles/admin/origin-save.js  | 102 ++++++++++++++++++++++++-------
 assets/src/bundles/save/index.js         |  12 ++--
 cypress/integration/admin.spec.js        |  59 ++++++++++++++++++
 swh/web/common/origin_save.py            |  67 ++++++++++++--------
 swh/web/templates/admin/origin-save.html |   1 +
 6 files changed, 192 insertions(+), 51 deletions(-)
Changes applied before test
commit 4c9548e153b6bc42906e74242864a9035af8c83a
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Mon Oct 18 17:51:24 2021 +0200

    assets/origin-save: Display rejection reason in request info popover
    
    When a save request has been rejected, the rejection note can be displayed
    by clicking on the info icon in the save request tables.
    
    Related to T3256

commit a314f8d0cd234154c4ec9d2721f11125bd710951
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Oct 15 16:13:38 2021 +0200

    assets/admin/origin-save: Enable to add note when rejecting a request
    
    In the save code now administation page, display a new modal when
    rejecting a save request enabling to add a rejection note through
    the use of a text area.
    
    Default behavior is to enter a custom note but a couple of prefilled
    rejection notes can be selected for the following cases:
    
      - the origin URL is not a repository link
      - the visit type for the origin URL is not valid
      - the origin URL cannot be found
    
    Related to T3256
    Related to T3257

commit deb77b1c79895c01b5acf7769249dc615ca943d6
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Mon Oct 18 15:37:34 2021 +0200

    Makefile.local: Remove correct sqlite tests database
    
    File has been renamed in a recent commit.

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

Harbormaster returned this revision to the author for changes because remote builds failed.Oct 19 2021, 11:35 AM
Harbormaster failed remote builds in B24508: Diff 23617!
anlambert updated this revision to Diff 23619.Oct 19 2021, 12:14 PM

Rebase

swh-public-ci added a comment.Oct 19 2021, 12:30 PM

Build is green

Patch application report for D6502 (id=23619)

Could not rebase; Attempt merge onto 61b80b8b23...

Updating 61b80b8b..a7267646
Fast-forward
 Makefile.local                           |   2 +-
 assets/src/bundles/admin/origin-save.js  | 102 ++++++++++++++++++++++++-------
 assets/src/bundles/save/index.js         |  12 ++--
 cypress/integration/admin.spec.js        |  74 ++++++++++++++++++++++
 swh/web/common/origin_save.py            |  67 ++++++++++++--------
 swh/web/templates/admin/origin-save.html |   5 +-
 6 files changed, 209 insertions(+), 53 deletions(-)
Changes applied before test
commit a72676463654e9d95d85a79aaac4f5f1314cd158
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Mon Oct 18 17:51:24 2021 +0200

    assets/origin-save: Display rejection reason in request info popover
    
    When a save request has been rejected, the rejection note can be
    displayed by clicking on the info icon in the save request tables.
    
    Related to T3256

commit c0d56bf7840956f9d4deab2d4be5611f157cb393
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Oct 15 16:13:38 2021 +0200

    assets/admin/origin-save: Enable to add note when rejecting a request
    
    In the save code now administation page, display a new modal when
    rejecting a save request enabling to add a rejection note through
    the use of a text area.
    
    Default behavior is to enter a custom note but a couple of prefilled
    rejection notes can be selected for the following cases:
    
      - the origin URL is not a repository link
      - the visit type for the origin URL is not valid
      - the origin URL cannot be found
    
    Related to T3256
    Related to T3257

commit deb77b1c79895c01b5acf7769249dc615ca943d6
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Mon Oct 18 15:37:34 2021 +0200

    Makefile.local: Remove correct sqlite tests database
    
    File has been renamed in a recent commit.

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

Harbormaster completed remote builds in B24510: Diff 23619.Oct 19 2021, 12:30 PM
anlambert requested review of this revision.Oct 19 2021, 12:30 PM
anlambert edited the summary of this revision. (Show Details)Oct 19 2021, 12:33 PM
ardumont accepted this revision.Oct 19 2021, 3:44 PM
ardumont added a subscriber: ardumont.

lgtm

This revision is now accepted and ready to land.Oct 19 2021, 3:44 PM
anlambert added a comment.Oct 19 2021, 3:48 PM
In D6502#168732, @ardumont wrote:

lgtm

Cool, will rebase the two diffs on master, land them then tag and deploy.

anlambert updated this revision to Diff 23627.Oct 19 2021, 3:54 PM

Rebase

swh-public-ci added a comment.Oct 19 2021, 4:10 PM

Build is green

Patch application report for D6502 (id=23627)

Could not rebase; Attempt merge onto b72fd7f917...

Updating b72fd7f9..96b3d287
Fast-forward
 Makefile.local                           |   2 +-
 assets/src/bundles/admin/origin-save.js  | 102 ++++++++++++++++++++++++-------
 assets/src/bundles/save/index.js         |  12 ++--
 cypress/integration/admin.spec.js        |  74 ++++++++++++++++++++++
 swh/web/common/origin_save.py            |  67 ++++++++++++--------
 swh/web/templates/admin/origin-save.html |   5 +-
 6 files changed, 209 insertions(+), 53 deletions(-)
Changes applied before test
commit 96b3d287ed50ce5ca9e7007d62dbec52be8bc163
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Mon Oct 18 17:51:24 2021 +0200

    assets/origin-save: Display rejection reason in request info popover
    
    When a save request has been rejected, the rejection note can be
    displayed by clicking on the info icon in the save request tables.
    
    Related to T3256

commit 6c2792e9090f72dde075d96380605eb7269b9fac
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Fri Oct 15 16:13:38 2021 +0200

    assets/admin/origin-save: Enable to add note when rejecting a request
    
    In the save code now administation page, display a new modal when
    rejecting a save request enabling to add a rejection note through
    the use of a text area.
    
    Default behavior is to enter a custom note but a couple of prefilled
    rejection notes can be selected for the following cases:
    
      - the origin URL is not a repository link
      - the visit type for the origin URL is not valid
      - the origin URL cannot be found
    
    Related to T3256
    Related to T3257

commit 9cf83ddceafe502c9aca8b5972805f38924f2d97
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Mon Oct 18 15:37:34 2021 +0200

    Makefile.local: Remove correct sqlite tests database
    
    File has been renamed in a recent commit.

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

Harbormaster completed remote builds in B24518: Diff 23627.Oct 19 2021, 4:10 PM
Closed by commit rDWAPPS96b3d287ed50: assets/origin-save: Display rejection reason in request info popover (authored by anlambert). · Explain WhyOct 19 2021, 4:12 PM
This revision was automatically updated to reflect the committed changes.
anlambert added a commit: rDWAPPS96b3d287ed50: assets/origin-save: Display rejection reason in request info popover.

Revision Contents
Changeset List

PathSize
assets/
src/
bundles/
admin/
30 lines
save/
12 lines
cypress/
integration/
14 lines
swh/
web/
common/
53 lines
templates/
admin/
1 line

Diff 23630

View Options

assets/src/bundles/admin/origin-save.js

Loading...
View Options

assets/src/bundles/save/index.js

Loading...
View Options

cypress/integration/admin.spec.js

Loading...
View Options

swh/web/common/origin_save.py

Loading...
View Options

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

Loading...
About · Developer information · Legal