Page MenuHomeSoftware Heritage

wip: Add new bundle type
Changes PlannedPublicDraft

Authored by ardumont on Tue, May 4, 7:15 PM.

Details

Summary

This is preparatory work:

  • not yet tested
  • nor completely ok in terms of ui (e.g. some data is hard-coded to ease manual input, some input is not ok regarding css).

Remains to:

  • add tests
  • make the bundle type only show up when a user is connected and and is an actual ambassador

Related to T3213

Diff Detail

Repository
rDWAPPS Web applications
Branch
add-new-bundle
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 21269
Build 33028: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 33027: arc lint + arc unit

Unit TestsFailed

TimeTest
0 msJenkins > should create save request for authenticated user::Tests / Cypress tests / Run cypress tests / Origin Save Tests should create save request for authenticated user
CypressError: Timed out retrying after 20000ms: `cy.wait()` timed out waiting `20000ms` for the 1st request to the route: `saveRequest`. No request ever occurred. https://on.cypress.io/wait
0 msJenkins > should display accepted message when accepted::Tests / Cypress tests / Run cypress tests / Origin Save Tests should display accepted message when accepted
CypressError: Timed out retrying after 20000ms: `cy.wait()` timed out waiting `20000ms` for the 1st request to the route: `saveRequest`. No request ever occurred. https://on.cypress.io/wait
0 msJenkins > should display warning message when pending::Tests / Cypress tests / Run cypress tests / Origin Save Tests should display warning message when pending
CypressError: Timed out retrying after 20000ms: `cy.wait()` timed out waiting `20000ms` for the 1st request to the route: `saveRequest`. No request ever occurred. https://on.cypress.io/wait
0 msJenkins > should select correct visit type if possible when clicking on "Save again" button::Tests / Cypress tests / Run cypress tests / Origin Save Tests should select correct visit type if possible when clicking on "Save again" button
CypressError: Timed out retrying after 20000ms: `cy.wait()` timed out waiting `20000ms` for the 1st request to the route: `saveRequest`. No request ever occurred. https://on.cypress.io/wait
0 msJenkins > should show error when csrf validation failed (status: 403)::Tests / Cypress tests / Run cypress tests / Origin Save Tests should show error when csrf validation failed (status: 403)
CypressError: Timed out retrying after 20000ms: `cy.wait()` timed out waiting `20000ms` for the 1st request to the route: `saveRequest`. No request ever occurred. https://on.cypress.io/wait
View Full Test Results (11 Failed · 651 Passed · 5 Skipped)

Event Timeline

Build has FAILED

Patch application report for D5676 (id=20274)

Rebasing onto f8c750b65a...

First, rewinding head to replay your work on top of it...
Applying: wip: Add new bundle type
Using index info to reconstruct a base tree...
M	assets/src/bundles/save/index.js
M	swh/web/api/views/origin_save.py
M	swh/web/common/origin_save.py
Falling back to patching base and 3-way merge...
Auto-merging swh/web/common/origin_save.py
CONFLICT (content): Merge conflict in swh/web/common/origin_save.py
Auto-merging swh/web/api/views/origin_save.py
CONFLICT (content): Merge conflict in swh/web/api/views/origin_save.py
Auto-merging assets/src/bundles/save/index.js
CONFLICT (content): Merge conflict in assets/src/bundles/save/index.js
Patch failed at 0001 wip: Add new bundle type

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

Rebase failed (ret=1)!

Could not rebase; Attempt merge onto f8c750b65a...

Already up to date.
Changes applied before test
commit da40e8c2d26a960564ea9b35402d5fe762a1f0c9
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue May 4 14:45:36 2021 +0200

    wip: Add new bundle type
    
    This is preparatory work:
    - not yet tested
    - nor completely ok in terms of ui (e.g. some data is hard-coded to ease manual input,
      some input is not ok regarding css).
    
    Remains to:
    - add tests
    - make the bundle type only show up when a user is connected and and is an actual ambassador
    
    Related to T3213

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

Harbormaster returned this revision to the author for changes because remote builds failed.Tue, May 4, 7:16 PM
Harbormaster failed remote builds in B21261: Diff 20274!
assets/src/bundles/save/index.js
357

We'll probably need to not display the "save again" button for the origins with type 'bundle' (as we do not store the extra arguments in the save code now backend).

  • Rebase
  • Fix parsing date and serialization issue
  • successful run through docker

Still remains to add tests

Build has FAILED

Patch application report for D5676 (id=20283)

Rebasing onto f8c750b65a...

Current branch diff-target is up to date.
Changes applied before test
commit 0e8c84a4681a782a12323381a1e2dec727d9225f
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Tue May 4 14:45:36 2021 +0200

    wip: Add new bundle type
    
    This is preparatory work:
    - not yet tested
    - nor completely ok in terms of ui (e.g. some data is hard-coded to ease manual input,
      some input is not ok regarding css).
    
    Remains to:
    - add tests
    - make the bundle type only show up when a user is connected and and is an actual ambassador
    
    Related to T3213

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

Harbormaster returned this revision to the author for changes because remote builds failed.Wed, May 5, 12:11 PM
Harbormaster failed remote builds in B21269: Diff 20283!