Page MenuHomeSoftware Heritage
Differential D2320

Integrate swh badges in Permalinks tab
ClosedPublic
Actions

Authored by anlambert on Nov 21 2019, 12:17 PM.

Details

Reviewers
vlorentz
Group Reviewers
Reviewers
Commits
rDWAPPS42168a7686e1: templates: Integrate swh badges in Permalinks tab
Summary

Add swh badges for each type of browsed objects in the Permalinks tab
accessible from the handle on the right of the web UI.

When clicking on one of those badge, a modal detailing how to integrate
it in a README file will be displayed.

Related to T2092

Depends on D2310

Test Plan

Cypress tests have been added.

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.Nov 21 2019, 12:17 PM
Herald added a reviewer: Reviewers. · View Herald TranscriptNov 21 2019, 12:17 PM
anlambert edited the summary of this revision. (Show Details)Nov 21 2019, 12:19 PM
swh-public-ci added a comment.Nov 21 2019, 12:21 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/775/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/775/console

Harbormaster failed remote builds in B9206: Diff 7990!Nov 21 2019, 12:21 PM
swh-public-ci added a comment.Nov 21 2019, 12:27 PM

Build has FAILED

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

anlambert updated this revision to Diff 7992.Nov 21 2019, 1:10 PM

Update: Remove extra </a> in template file

swh-public-ci added a comment.Nov 21 2019, 1:14 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/776/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/776/console

Harbormaster failed remote builds in B9208: Diff 7992!Nov 21 2019, 1:14 PM
anlambert edited the summary of this revision. (Show Details)Nov 21 2019, 1:19 PM
anlambert added a parent revision: D2310: Add new endpoints to generate swh badges.
swh-public-ci added a comment.Nov 21 2019, 1:20 PM

Build has FAILED

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

anlambert updated this revision to Diff 8012.Nov 21 2019, 2:08 PM

Rebase

Harbormaster failed remote builds in B9258: Diff 8012!Nov 21 2019, 2:14 PM
swh-public-ci added a comment.Nov 21 2019, 2:14 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/778/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/778/console

swh-public-ci added a comment.Nov 21 2019, 2:22 PM

Build has FAILED

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

anlambert updated this revision to Diff 8014.Nov 21 2019, 2:28 PM

Rebase

Harbormaster failed remote builds in B9271: Diff 8014!Nov 21 2019, 2:33 PM
swh-public-ci added a comment.Nov 21 2019, 2:33 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/780/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/780/console

swh-public-ci added a comment.Nov 21 2019, 2:41 PM

Build has FAILED

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

vlorentz added a subscriber: vlorentz.Nov 21 2019, 3:00 PM
vlorentz added inline comments.
cypress/integration/persistent-identifiers.spec.js
229–243

Are these .wait(500) needed? cy.get should already waits as long as needed

253

Why is this one needed?

anlambert added inline comments.Nov 21 2019, 3:18 PM
cypress/integration/persistent-identifiers.spec.js
253

Because there is some fade in / fade out animations with bootstrap modals when displaying / closing them that mess up with cypress. Tests were failing without these wait instructions.

anlambert updated this revision to Diff 8017.Nov 21 2019, 3:21 PM

Rebase

Harbormaster failed remote builds in B9274: Diff 8017!Nov 21 2019, 3:24 PM
swh-public-ci added a comment.Nov 21 2019, 3:24 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/782/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/782/console

anlambert updated this revision to Diff 8018.Nov 21 2019, 3:31 PM

Rebase to the right commit

swh-public-ci added a comment.Nov 21 2019, 3:31 PM

Build has FAILED

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

Harbormaster failed remote builds in B9275: Diff 8018!Nov 21 2019, 3:32 PM
swh-public-ci added a comment.Nov 21 2019, 3:32 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/783/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/783/console

swh-public-ci added a comment.Nov 21 2019, 3:32 PM

Build has FAILED

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

swh-public-ci added a comment.Nov 21 2019, 3:41 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/784/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/784/console

anlambert updated this revision to Diff 8021.Nov 21 2019, 3:47 PM
anlambert mentioned this in D2310: Add new endpoints to generate swh badges.

Rebase

Harbormaster failed remote builds in B9278: Diff 8021!Nov 21 2019, 3:54 PM
swh-public-ci added a comment.Nov 21 2019, 3:54 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/787/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/787/console

anlambert added a comment.Nov 21 2019, 4:00 PM

I messed up somewhere when updating that diff and now arc patch fails on Jenkins.

Calling arc patch --diff 8021 --nocommit --nobranch --force locally on my master branch works so I don't know what's wrong here.

swh-public-ci added a comment.Nov 21 2019, 4:08 PM

Build has FAILED

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

vlorentz added a comment.Nov 21 2019, 6:32 PM

The problem is: "Base commit is not in local repository; trying to fetch.". You should rebase on a commit in master.

anlambert updated this revision to Diff 8070.Nov 22 2019, 4:18 PM

Rebase

Harbormaster failed remote builds in B9341: Diff 8070!Nov 22 2019, 4:26 PM
swh-public-ci added a comment.Nov 22 2019, 4:26 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/793/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/793/console

swh-public-ci added a comment.Nov 22 2019, 4:34 PM

Build has FAILED

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

vlorentz accepted this revision.Nov 22 2019, 4:54 PM
This revision is now accepted and ready to land.Nov 22 2019, 4:54 PM
anlambert updated this revision to Diff 8096.Nov 25 2019, 4:14 PM

Rebase

Harbormaster failed remote builds in B9372: Diff 8096!Nov 25 2019, 4:18 PM
swh-public-ci added a comment.Nov 25 2019, 4:18 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/799/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/799/console

swh-public-ci added a comment.Nov 25 2019, 4:24 PM

Build has FAILED

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

swh-public-ci added a comment.Nov 25 2019, 4:42 PM

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/800/ for more details.

anlambert added a comment.EditedNov 25 2019, 4:57 PM

I messed up somewhere when updating that diff and now arc patch fails on Jenkins.
Calling arc patch --diff 8021 --nocommit --nobranch --force locally on my master branch works so I don't know what's wrong here.

The problem is: "Base commit is not in local repository; trying to fetch.". You should rebase on a commit in master.

So arc patch previously failed for that diff because of the following: D2320 depends on D2310, itself depending on D2309.
But D2309 has landed on master since then and as it was still declared in the dependency chain of D2320, arc patch will try to
unconditionally cherry-pick the associated commit to the current master branch which will fail as the commit already exists.

There is a related task opened on Phabricator forge but no action have been taken so far.

Hopefully, there is a mean to update a diff dependency chain from the Phabricator Web UI (removing Depends on DXXX from the task
description is not enough).

In our case we want to remove D2309 as parent diff of D2310. In the Web UI for D2310, click on Edit Related Revisions
then Edit Parent Revisions. We can then remove D2309 as parent diff and save the changes. Rebuilding the diff on Jenkins
will now successfully apply arc patch \o/.

swh-public-ci added a comment.Nov 25 2019, 5:07 PM

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/399/ for more details.

Harbormaster completed remote builds in B9372: Diff 8096.Nov 25 2019, 5:07 PM
anlambert updated this revision to Diff 8347.Nov 28 2019, 10:52 AM

Rebase

swh-public-ci added a comment.Nov 28 2019, 10:59 AM

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/813/ for more details.

swh-public-ci added a comment.Nov 28 2019, 11:12 AM

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/412/ for more details.

Harbormaster completed remote builds in B9418: Diff 8347.Nov 28 2019, 11:12 AM
anlambert updated this revision to Diff 8397.Dec 2 2019, 3:58 PM

Rebase

swh-public-ci added a comment.Dec 2 2019, 4:06 PM

Build has FAILED

Link to build: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/823/
See console output for more information: https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/823/console

Harbormaster failed remote builds in B9471: Diff 8397!Dec 2 2019, 4:06 PM
swh-public-ci added a comment.Dec 2 2019, 4:11 PM

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/tox/824/ for more details.

swh-public-ci added a comment.Dec 2 2019, 4:20 PM

Build is green
See https://jenkins.softwareheritage.org/job/DWAPPS/job/cypress-diff/422/ for more details.

Harbormaster completed remote builds in B9471: Diff 8397.Dec 2 2019, 4:21 PM
Closed by commit rDWAPPS42168a7686e1: templates: Integrate swh badges in Permalinks tab (authored by anlambert). · Explain WhyDec 2 2019, 4:29 PM
This revision was automatically updated to reflect the committed changes.
anlambert added a commit: rDWAPPS42168a7686e1: templates: Integrate swh badges in Permalinks tab.

Revision Contents
Changeset List

PathSize
cypress/
integration/
169 lines
swh/
web/
assets/
src/
bundles/
browse/
1 line
webapp/
44 lines
1 line
6 lines
12 lines
browse/
1 line
templates/
includes/
45 lines
9 lines

Diff 8400

View Options

cypress/integration/persistent-identifiers.spec.js

Loading...
View Options

swh/web/assets/src/bundles/browse/swh-ids-utils.js

Loading...
View Options

swh/web/assets/src/bundles/webapp/badges.js

Loading...
View Options

swh/web/assets/src/bundles/webapp/index.js

Loading...
View Options

swh/web/assets/src/bundles/webapp/webapp-utils.js

Loading...
View Options

swh/web/assets/src/bundles/webapp/webapp.css

Loading...
View Options

swh/web/browse/utils.py

Loading...
View Options

swh/web/templates/includes/global-modals.html

Loading...
View Options

swh/web/templates/includes/show-swh-ids.html

Loading...
About · Developer information · Legal