Page MenuHomeSoftware Heritage
Differential D7396

admin: Add mailmaps administration Web UI
ClosedPublic
Actions

Authored by anlambert on Mar 18 2022, 5:51 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDWAPPSfe137e22529f: admin: Add mailmaps administration Web UI
Summary

Add a new administration view to manage the mailmaps in the
archive.

The view allows to add new mailmaps or update existing ones.

It requires a special user permission swh.web.admin.mailmap
to be used.

Only mailmaps created by users with that permission will be
displayed in that view.



Diff Detail

Repository
rDWAPPS Web applications
Branch
mailmap-admin-ui
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 27711
Build 43370: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 43369: arc lint + arc unit

Unit TestsFailed
View All

TimeTest
4,380 msJenkins > should not send request to the search endpoint::Tests / Cypress tests / Run cypress tests / Test origin-search Test valid SWHIDs should not send request to the search endpoint
AssertionError: expected [ Array(2) ] to have a length of 1 but got 2 at Context.eval (http://localhost:5004/__cypress/tests?p=cypress/support/index.js:119:58)
314 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.add_forge_now.tests.test_migration::Tests / Python tests / test_add_forge_now_allow_no_comment
976 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.add_forge_now.tests.test_migration::Tests / Python tests / test_add_forge_now_initial_migration
273 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.add_forge_now.tests.test_migration::Tests / Python tests / test_add_forge_now_store_submitter_forward_username
178 msJenkins > .tox.py3.lib.python3.7.site-packages.swh.web.tests.add_forge_now.test_models::Tests / Python tests / test_allowed_next_statuses[RequestStatus.PENDING-allowed_next_statuses0]
View Full Test Results (1 Failed · 937 Passed · 5 Skipped)

Event Timeline

anlambert created this revision.Mar 18 2022, 5:51 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptMar 18 2022, 5:51 PM
swh-public-ci added a comment.Mar 18 2022, 6:10 PM

Build is green

Patch application report for D7396 (id=26726)

Rebasing onto dfccbcf9bd...

Current branch diff-target is up to date.
Changes applied before test
commit 9013bc94cbe8a4c7bdd58a19e1dacffba53b2745
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:49:19 2022 +0100

    admin: Add mailmaps administration Web UI
    
    Add a new administration view to manage the mailmaps in the
    archive.
    
    The view allows to add new mailmaps or update existing ones.
    
    It requires a special user permission "swh.web.admin.mailmap"
    to be used.
    
    Only mailmaps created by users with that permission will be
    displayed in that view.

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

Harbormaster completed remote builds in B27621: Diff 26726.Mar 18 2022, 6:10 PM
anlambert requested review of this revision.Mar 18 2022, 6:10 PM
anlambert updated this revision to Diff 26742.Mar 21 2022, 4:09 PM

Update:

  • rebase
  • fix issues in datatables endpoint implementation
  • add missing tests for better coverage
swh-public-ci added a comment.Mar 21 2022, 4:28 PM

Build has FAILED

Patch application report for D7396 (id=26742)

Rebasing onto f232481f96...

Current branch diff-target is up to date.
Changes applied before test
commit 3d7f2250ab249370ab8055f4cdd3ed265cef4ac3
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:49:19 2022 +0100

    admin: Add mailmaps administration Web UI
    
    Add a new administration view to manage the mailmaps in the
    archive.
    
    The view allows to add new mailmaps or update existing ones.
    
    It requires a special user permission "swh.web.admin.mailmap"
    to be used.
    
    Only mailmaps created by users with that permission will be
    displayed in that view.

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

Harbormaster failed remote builds in B27637: Diff 26742!Mar 21 2022, 4:28 PM
swh-public-ci added a comment.Mar 21 2022, 4:46 PM

Build is green

Patch application report for D7396 (id=26742)

Rebasing onto 82d7c4bd39...

First, rewinding head to replay your work on top of it...
Applying: admin: Add mailmaps administration Web UI
Changes applied before test
commit c7be089336a9b7ba866a6a35dbc2a90d87b9c716
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:49:19 2022 +0100

    admin: Add mailmaps administration Web UI
    
    Add a new administration view to manage the mailmaps in the
    archive.
    
    The view allows to add new mailmaps or update existing ones.
    
    It requires a special user permission "swh.web.admin.mailmap"
    to be used.
    
    Only mailmaps created by users with that permission will be
    displayed in that view.

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

Harbormaster completed remote builds in B27637: Diff 26742.Mar 21 2022, 4:47 PM
vlorentz added a subscriber: vlorentz.Mar 22 2022, 11:06 AM
vlorentz added inline comments.
assets/src/bundles/admin/mailmap-form.ejs
16

To make it clear this expects name + email

assets/src/bundles/admin/mailmap.js
144

that's clearer IMO

swh/web/auth/mailmap.py
66

If admin-created mailmaps have a NULL user_id, then we need a DB migration.

swh/web/templates/admin/mailmap.html
43

hmm, I don't know if "effective" is clear enough for users; but I don't have a better suggestion

anlambert added inline comments.Mar 22 2022, 2:34 PM
assets/src/bundles/admin/mailmap-form.ejs
16

Good idea.

assets/src/bundles/admin/mailmap.js
144

ack

swh/web/auth/mailmap.py
66

No we are good here, this is already handled by the UserMailmap model.

swh/web/templates/admin/mailmap.html
43

Applied ?

anlambert updated this revision to Diff 26770.Mar 22 2022, 3:06 PM

Rebase and address some @vlorentz comments

vlorentz added inline comments.Mar 22 2022, 3:07 PM
swh/web/auth/mailmap.py
66

I mean that mailmap entries I already created as admin are not NULL.

anlambert added inline comments.Mar 22 2022, 3:09 PM
swh/web/auth/mailmap.py
66

Ok, got it.

swh-public-ci added a comment.Mar 22 2022, 3:27 PM

Build was aborted

Patch application report for D7396 (id=26770)

Rebasing onto ac5e79103c...

Current branch diff-target is up to date.
Changes applied before test
commit 4b6f0654969a983a03d63a78445ee600cbb8c7ba
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:49:19 2022 +0100

    admin: Add mailmaps administration Web UI
    
    Add a new administration view to manage the mailmaps in the
    archive.
    
    The view allows to add new mailmaps or update existing ones.
    
    It requires a special user permission "swh.web.admin.mailmap"
    to be used.
    
    Only mailmaps created by users with that permission will be
    displayed in that view.

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

Harbormaster failed remote builds in B27691: Diff 26770!Mar 22 2022, 3:27 PM
anlambert updated this revision to Diff 26790.Mar 22 2022, 4:20 PM

Rebase and add new database migration changing user_id of existing mailmaps in production to None to indicate they have been created by an administrator.

swh-public-ci added a comment.Mar 22 2022, 4:38 PM

Build has FAILED

Patch application report for D7396 (id=26790)

Rebasing onto d6605c7a7e...

Current branch diff-target is up to date.
Changes applied before test
commit 0b804f1dc9258799f961e616b66d233c982e13e5
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:49:19 2022 +0100

    admin: Add mailmaps administration Web UI
    
    Add a new administration view to manage the mailmaps in the
    archive.
    
    The view allows to add new mailmaps or update existing ones.
    
    It requires a special user permission "swh.web.admin.mailmap"
    to be used.
    
    Only mailmaps created by users with that permission will be
    displayed in that view.

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

Harbormaster failed remote builds in B27711: Diff 26790!Mar 22 2022, 4:38 PM
anlambert updated this revision to Diff 26832.Mar 23 2022, 4:30 PM

Rebase

swh-public-ci added a comment.Mar 23 2022, 4:48 PM

Build is green

Patch application report for D7396 (id=26832)

Rebasing onto 6f0cc70fdd...

Current branch diff-target is up to date.
Changes applied before test
commit fe137e22529f9e1d51957209120f0eb0ad01ff40
Author: Antoine Lambert <anlambert@softwareheritage.org>
Date:   Thu Feb 3 13:49:19 2022 +0100

    admin: Add mailmaps administration Web UI
    
    Add a new administration view to manage the mailmaps in the
    archive.
    
    The view allows to add new mailmaps or update existing ones.
    
    It requires a special user permission "swh.web.admin.mailmap"
    to be used.
    
    Only mailmaps created by users with that permission will be
    displayed in that view.

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

Harbormaster completed remote builds in B27753: Diff 26832.Mar 23 2022, 4:48 PM
vlorentz accepted this revision.Mar 24 2022, 10:20 AM

thanks!

This revision is now accepted and ready to land.Mar 24 2022, 10:20 AM
Closed by commit rDWAPPSfe137e22529f: admin: Add mailmaps administration Web UI (authored by anlambert). · Explain WhyMar 24 2022, 1:57 PM
This revision was automatically updated to reflect the committed changes.
anlambert added a commit: rDWAPPSfe137e22529f: admin: Add mailmaps administration Web UI.
anlambert mentioned this in D7429: keycloak: Add swh.web.admin.mailmap role.Mar 25 2022, 10:53 AM

Revision Contents
Changeset List

PathSize
assets/
src/
bundles/
admin/
3 lines
29 lines
159 lines
cypress/
integration/
226 lines
plugins/
22 lines
support/
3 lines
1 line
swh/
web/
admin/
16 lines
1 line
auth/
113 lines
migrations/
41 lines
17 lines
common/
2 lines
templates/
admin/
53 lines
20 lines
tests/
auth/
421 lines
38 lines
23 lines
8 lines
4 lines
323 lines

Diff 26790

View Options

assets/src/bundles/admin/index.js

Loading...
View Options

assets/src/bundles/admin/mailmap-form.ejs

Loading...
View Options

assets/src/bundles/admin/mailmap.js

Loading...
View Options

cypress/integration/mailmap.spec.js

Loading...
View Options

cypress/plugins/index.js

Loading...
View Options

cypress/support/index.js

Loading...
View Options

package.json

Loading...
View Options

swh/web/admin/mailmap.py

Loading...
View Options

swh/web/admin/urls.py

Loading...
View Options

swh/web/auth/mailmap.py

Loading...
View Options

swh/web/auth/migrations/0006_fix_mailmap_admin_user_id.py

Loading...
View Options

swh/web/auth/utils.py

Loading...
View Options

swh/web/common/utils.py

Loading...
View Options

swh/web/templates/admin/mailmap.html

Loading...
View Options

swh/web/templates/layout.html

Loading...
View Options

swh/web/tests/auth/test_mailmap.py

Loading...
View Options

swh/web/tests/auth/test_migrations.py

Loading...
View Options

swh/web/tests/conftest.py

Loading...
View Options

swh/web/tests/create_test_users.py

Loading...
View Options

swh/web/tests/utils.py

Loading...
View Options

yarn.lock

Loading...
About · Developer information · Legal