Page MenuHomeSoftware Heritage

browse/revision: Refactor metadata handling and add typing
ClosedPublic

Authored by anlambert on Apr 29 2020, 7:39 PM.

Details

Summary

Final diff related to archived object metadata refactoring processing revision view.

While doing that, I noticed possible issues while trying to browse a content from a
revision view so I also fix these. I can split the diff if needed (but tomorrow).

Related to T2330

Depends on D3094.

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.Apr 29 2020, 7:39 PM

Build is green

Patch application report for D3096 (id=11012)

Could not rebase; Attempt merge onto c8bca2af35...

Merge made by the 'recursive' strategy.
 cypress/integration/persistent-identifiers.spec.js |  11 ++
 swh/web/assets/src/bundles/webapp/webapp-utils.js  |  21 +++
 swh/web/browse/snapshot_context.py                 | 182 +++++++++++----------
 swh/web/browse/views/content.py                    |  60 ++++---
 swh/web/browse/views/directory.py                  |  20 ++-
 swh/web/browse/views/release.py                    |  88 +++++-----
 swh/web/browse/views/revision.py                   |  82 ++++------
 swh/web/common/typing.py                           |  72 ++++++++
 swh/web/templates/browse/release.html              |   2 +-
 swh/web/templates/browse/revision.html             |   4 +-
 swh/web/templates/includes/content-display.html    |  14 +-
 swh/web/templates/includes/show-swh-ids.html       |   3 +
 swh/web/tests/browse/views/test_revision.py        |   4 +-
 13 files changed, 342 insertions(+), 221 deletions(-)
Changes applied before test
commit 65542367ffd7b68a4b0dbeae78abc14fab990e27
Merge: c8bca2af 7b5a47a0
Author: Jenkins user <jenkins@localhost>
Date:   Wed Apr 29 18:03:00 2020 +0000

    Merge branch 'diff-target' into HEAD

commit 7b5a47a0e51917151d4ead84a9294dfa3e9c91d0
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 18:56:27 2020 +0200

    browse/revision: Refactor metadata handling and add typing
    
    Also ensure a content can be successfully browsed from revision view.
    
    Related to T2330

commit da6f94224e9c7f5473189a0d5fce345c3930634e
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 16:54:45 2020 +0200

    browse/release: Refactor metadata handling and add typing
    
    Related to T2330

commit 60016e97ed53b224a75a7c38a8a69a9d2af688c3
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 16:20:48 2020 +0200

    browse/directory: Refactor metadata handling and add typing
    
    Related to T2330

commit 8f118ab40bbf5ce8f209d3b3b798097122b78c57
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 14:57:39 2020 +0200

    browse/content: Refactor metadata handling and add typing
    
    Related to T2330

commit cf53eb0d21f2674e480d99af4a699b695b56daa5
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 14:33:52 2020 +0200

    assets/webapp: Add SWHIDs context related functions
    
    Enable to get SWHIDs context from JavaScript for the currently
    browsed object.
    
    Related to T2330

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

ardumont accepted this revision.Apr 30 2020, 10:12 AM
ardumont added a subscriber: ardumont.

Sounds good.

One question in the diff ;)

swh/web/templates/browse/revision.html
23

shouldn't this be a link to the author/committer instead of the plain url?
(source the author/committer url, the author/committer name as displayed information)

This revision is now accepted and ready to land.Apr 30 2020, 10:12 AM
anlambert added inline comments.Apr 30 2020, 11:38 AM
swh/web/templates/browse/revision.html
23

The author/commiter url is a simple mailto:<email> link here as it was prior that diff. I used the _url suffix for consistency with other objects metadata.

ardumont added inline comments.Apr 30 2020, 11:45 AM
swh/web/templates/browse/revision.html
23

ok, thx for clarifying ;)

Build is green

Patch application report for D3096 (id=11019)

Could not rebase; Attempt merge onto c8bca2af35...

Updating c8bca2af..12280e36
Fast-forward
 cypress/integration/persistent-identifiers.spec.js |  11 ++
 swh/web/assets/src/bundles/webapp/webapp-utils.js  |  21 +++
 swh/web/browse/snapshot_context.py                 | 182 +++++++++++----------
 swh/web/browse/views/content.py                    |  60 ++++---
 swh/web/browse/views/directory.py                  |  20 ++-
 swh/web/browse/views/release.py                    |  88 +++++-----
 swh/web/browse/views/revision.py                   |  82 ++++------
 swh/web/common/typing.py                           |  72 ++++++++
 swh/web/templates/browse/release.html              |   2 +-
 swh/web/templates/browse/revision.html             |   4 +-
 swh/web/templates/includes/content-display.html    |  14 +-
 swh/web/templates/includes/show-swh-ids.html       |   3 +
 swh/web/tests/browse/views/test_revision.py        |   4 +-
 13 files changed, 342 insertions(+), 221 deletions(-)
Changes applied before test
commit 12280e362e3c7c731d6b82faf3423b7f7c4b9625
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 18:56:27 2020 +0200

    browse/revision: Refactor metadata handling and add typing
    
    Also ensure a content can be successfully browsed from revision view.
    
    Related to T2330

commit aa735b9339acb6179e8cbc9f8ad59638c9d513df
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 16:54:45 2020 +0200

    browse/release: Refactor metadata handling and add typing
    
    Related to T2330

commit 897d81f1b0dfbcc04e0bca554017db8cd3518461
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 16:20:48 2020 +0200

    browse/directory: Refactor metadata handling and add typing
    
    Related to T2330

commit 7bbd64d4e63e3ed454aac0e07544e3845278625e
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 14:57:39 2020 +0200

    browse/content: Refactor metadata handling and add typing
    
    Related to T2330

commit 51f2af1e78cddedea597bb8770d51da73a4352d7
Author: Antoine Lambert <antoine.lambert@inria.fr>
Date:   Wed Apr 29 14:33:52 2020 +0200

    assets/webapp: Add SWHIDs context related functions
    
    Enable to get SWHIDs context from JavaScript for the currently
    browsed object.
    
    Related to T2330

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