GNIP-84: Upload Page Enhancements #7154 #7204

afabiani · 2021-03-30T14:20:10Z

GNIP-84: Upload Page Enhancements #7154

Checklist

Reviewing is a process done by project maintainers, mostly on a volunteer basis. We try to keep the overhead as small as possible and appreciate if you help us to do so by completing the following items. Feel free to ask in a comment if you have troubles with any of them.

For all pull requests:

Confirm you have read the contribution guidelines
You have sent a Contribution Licence Agreement (CLA) as necessary (not required for small changes, e.g., fixing typos in the documentation)
Make sure the first PR targets the master branch, eventual backports will be managed later. This can be ignored if the PR is fixing an issue that only happens in a specific branch, but not in newer ones.

The following are required only for core and extension modules (they are welcomed, but not required, for contrib modules):

There is a ticket in https://github.com/GeoNode/geonode/issues describing the issue/improvement/feature (a notable exemption is, changes not visible to end-users)
The issue connected to the PR must have Labels and Milestone assigned
PR for bug fixes and small new features are presented as a single commit
Commit message must be in the form "[Fixes #<issue_number>] Title of the Issue"
New unit tests have been added covering the changes, unless there is an explanation on why the tests are not necessary/implemented
This PR passes all existing unit tests (test results will be reported by travis-ci after opening this PR)
This PR passes the QA checks: flake8 geonode
Commits changing the settings, UI, existing user workflows, or adding new functionality, need to include documentation updates
Commits adding new texts do use gettext and have updated .po / .mo files (without location infos)

Submitting the PR does not require you to check all items, but by the time it gets merged, they should be either satisfied or inapplicable.

…de Layer"

…E_7154

lgtm-com · 2021-03-30T14:33:18Z

This pull request introduces 1 alert when merging 8d48634 into 8454e63 - view on LGTM.com

new alerts:

1 for Unused import

codecov · 2021-03-30T16:53:17Z

Codecov Report

Merging #7204 (d146965) into master (c1007fc) will decrease coverage by 33.52%.
The diff coverage is 21.01%.

@@             Coverage Diff             @@
##           master    #7204       +/-   ##
===========================================
- Coverage   59.07%   25.55%   -33.53%     
===========================================
  Files         565      576       +11     
  Lines       39827    40865     +1038     
  Branches     5282     5374       +92     
===========================================
- Hits        23527    10442    -13085     
- Misses      14935    29998    +15063     
+ Partials     1365      425      -940

…E_7154

lgtm-com · 2021-03-31T13:14:38Z

This pull request introduces 1 alert when merging 8d58cf5 into de14a2f - view on LGTM.com

new alerts:

1 for Unused import

lgtm-com · 2021-03-31T23:44:26Z

This pull request introduces 1 alert when merging 7b46b2f into 8fcd482 - view on LGTM.com

new alerts:

1 for Unused import

lgtm-com · 2021-04-01T09:17:56Z

This pull request introduces 1 alert when merging 10e7041 into 8fcd482 - view on LGTM.com

new alerts:

1 for Unused import

lgtm-com · 2021-04-01T11:54:10Z

This pull request introduces 2 alerts when merging 633585e into 8fcd482 - view on LGTM.com

new alerts:

1 for Unused local variable
1 for Unused import

…ascade is invoked everytime

lgtm-com · 2021-04-01T13:34:14Z

This pull request introduces 2 alerts when merging f9e2c81 into 8fcd482 - view on LGTM.com

new alerts:

1 for Unused local variable
1 for Unused import

…orter session

lgtm-com · 2021-04-01T13:57:46Z

This pull request introduces 2 alerts when merging 6f00756 into 8fcd482 - view on LGTM.com

new alerts:

1 for Unused local variable
1 for Unused import

lgtm-com · 2021-04-01T14:25:24Z

This pull request introduces 1 alert when merging 51f4715 into 8fcd482 - view on LGTM.com

new alerts:

1 for Unused import

…ted to layer uploads

lgtm-com · 2021-04-01T15:09:23Z

This pull request introduces 1 alert when merging 2ab778a into 8fcd482 - view on LGTM.com

new alerts:

1 for Unused import

lgtm-com · 2021-04-01T16:01:06Z

This pull request introduces 1 alert when merging 3daf698 into 8fcd482 - view on LGTM.com

new alerts:

1 for Unused import

lgtm-com · 2021-04-06T13:37:19Z

This pull request fixes 5 alerts when merging 3ce7a45 into 073d9a5 - view on LGTM.com

fixed alerts:

5 for Unused import

lgtm-com · 2021-04-06T21:39:23Z

This pull request fixes 5 alerts when merging f6551a5 into 073d9a5 - view on LGTM.com

fixed alerts:

5 for Unused import

lgtm-com · 2021-04-07T08:43:49Z

This pull request fixes 5 alerts when merging d9d789b into 073d9a5 - view on LGTM.com

fixed alerts:

5 for Unused import

lgtm-com · 2021-04-07T09:40:00Z

This pull request fixes 5 alerts when merging 1583250 into 52340e4 - view on LGTM.com

fixed alerts:

5 for Unused import

…E_7154

lgtm-com · 2021-04-07T13:41:34Z

This pull request fixes 5 alerts when merging 9f7b798 into 947bea7 - view on LGTM.com

fixed alerts:

5 for Unused import

lgtm-com · 2021-04-07T15:19:44Z

This pull request fixes 5 alerts when merging cd6ed69 into 947bea7 - view on LGTM.com

fixed alerts:

5 for Unused import

lgtm-com · 2021-04-07T20:16:41Z

This pull request fixes 5 alerts when merging 705473d into 947bea7 - view on LGTM.com

fixed alerts:

5 for Unused import

lgtm-com · 2021-04-08T08:53:28Z

This pull request fixes 5 alerts when merging 343a629 into 947bea7 - view on LGTM.com

fixed alerts:

5 for Unused import

…E_7154 # Conflicts: # geonode/api/resourcebase_api.py

lgtm-com · 2021-04-08T09:49:42Z

This pull request fixes 5 alerts when merging d146965 into abdf3ed - view on LGTM.com

fixed alerts:

5 for Unused import

github-actions · 2021-04-08T12:54:31Z

The backport to 3.2.x failed:

The process 'git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-3.2.x 3.2.x
# Navigate to the new working tree
cd .worktrees/backport-3.2.x
# Create a new branch
git switch --create backport-7204-to-3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 14070b203dfff64baa53788a890ff86e1657050a
# Push it to GitHub
git push --set-upstream origin backport-7204-to-3.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-3.2.x

Then, create a pull request where the base branch is 3.2.x and the compare/head branch is backport-7204-to-3.2.x.

* - Fix the "Upload" models fields and correctly link it to the "GeoNode Layer" * - Adding REST Interfaces for the "Upload" models * - [WIP] Upload api test cases * - [WIP] Hide non processed resources * - [WIP] Management of the Importer Session during Resume * - [WIP] Hide dirty resources to everyone / Make sure Upload delete cascade is invoked everytime * - [WIP] Update the UploaderSession state everytime we reload the importer session * - [WIP] Set Uploader Session state to INVALID if any error occurs * - [WIP] Get rid of incomplete uploads on templates that are not related to layer uploads * - [WIP] Exposing Upload resume, delete and import URLs via REST APIs * update workflow and ui of incomplete upload list * replace import_id with id for the request to the api * improve link button behaviour * - Adapt failing test cases to the new "dirty_state" filtering condition * - [WIP] Do not throw an exception when creating the "resume_url" * - [WIP] Move the "Layer Info" button to the upload list * add pagination and remove modal on list of incomplete upload * Revert " - Adapt failing test cases to the new "dirty_state" filtering condition" This reverts commit bee78bd. * - [WIP] Make the Upload return URLs "state" aware * - [WIP] Handle upload POST via REST interface * - [WIP] Make "resourcebase_api" use "get_visible_resources" more efficiently - General code optimization and test case fixing * - [WIP] Do not delete the Upload associated Layer * - [WIP] Adding Upload Test Cases * - Test fixes * - Test fixes * - Adding Upload Selenium Live Tests * add processed item to the upload table * - [WIP] Adding "create_date" to the Upload session * sort the table by created date * - Test fixes * - Updating translations * - Test fixes * - Test fixes Co-authored-by: allyoucanmap <[email protected]> (cherry picked from commit 14070b2) # Conflicts: # geonode/api/tests.py # geonode/locale/af/LC_MESSAGES/django.po # geonode/locale/af/LC_MESSAGES/djangojs.po # geonode/locale/al/LC_MESSAGES/django.po # geonode/locale/al/LC_MESSAGES/djangojs.po # geonode/locale/am/LC_MESSAGES/django.po # geonode/locale/am/LC_MESSAGES/djangojs.po # geonode/locale/ar/LC_MESSAGES/django.mo # geonode/locale/ar/LC_MESSAGES/django.po # geonode/locale/ar/LC_MESSAGES/djangojs.po # geonode/locale/bg_BG/LC_MESSAGES/django.po # geonode/locale/bg_BG/LC_MESSAGES/djangojs.po # geonode/locale/bn/LC_MESSAGES/django.po # geonode/locale/bn/LC_MESSAGES/djangojs.po # geonode/locale/de/LC_MESSAGES/django.mo # geonode/locale/de/LC_MESSAGES/django.po # geonode/locale/de/LC_MESSAGES/djangojs.po # geonode/locale/el/LC_MESSAGES/django.mo # geonode/locale/el/LC_MESSAGES/django.po # geonode/locale/el/LC_MESSAGES/djangojs.po # geonode/locale/en/LC_MESSAGES/django.mo # geonode/locale/en/LC_MESSAGES/django.po # geonode/locale/en/LC_MESSAGES/djangojs.po # geonode/locale/es/LC_MESSAGES/django.mo # geonode/locale/es/LC_MESSAGES/django.po # geonode/locale/es/LC_MESSAGES/djangojs.po # geonode/locale/fa/LC_MESSAGES/django.po # geonode/locale/fa/LC_MESSAGES/djangojs.po # geonode/locale/fa_IR/LC_MESSAGES/django.po # geonode/locale/fa_IR/LC_MESSAGES/djangojs.po # geonode/locale/fi/LC_MESSAGES/django.po # geonode/locale/fi/LC_MESSAGES/djangojs.po # geonode/locale/fil/LC_MESSAGES/django.po # geonode/locale/fil/LC_MESSAGES/djangojs.po # geonode/locale/fr/LC_MESSAGES/django.mo # geonode/locale/fr/LC_MESSAGES/django.po # geonode/locale/fr/LC_MESSAGES/djangojs.po # geonode/locale/hu/LC_MESSAGES/django.po # geonode/locale/hu/LC_MESSAGES/djangojs.po # geonode/locale/id/LC_MESSAGES/django.po # geonode/locale/id/LC_MESSAGES/djangojs.po # geonode/locale/it/LC_MESSAGES/django.mo # geonode/locale/it/LC_MESSAGES/django.po # geonode/locale/it/LC_MESSAGES/djangojs.mo # geonode/locale/it/LC_MESSAGES/djangojs.po # geonode/locale/ja/LC_MESSAGES/django.po # geonode/locale/ja/LC_MESSAGES/djangojs.po # geonode/locale/ka/LC_MESSAGES/django.po # geonode/locale/ka/LC_MESSAGES/djangojs.po # geonode/locale/km/LC_MESSAGES/django.po # geonode/locale/km/LC_MESSAGES/djangojs.po # geonode/locale/ko/LC_MESSAGES/django.po # geonode/locale/ko/LC_MESSAGES/djangojs.po # geonode/locale/lt/LC_MESSAGES/django.po # geonode/locale/lt/LC_MESSAGES/djangojs.po # geonode/locale/ne/LC_MESSAGES/django.po # geonode/locale/ne/LC_MESSAGES/djangojs.po # geonode/locale/nl_NL/LC_MESSAGES/django.po # geonode/locale/nl_NL/LC_MESSAGES/djangojs.po # geonode/locale/no/LC_MESSAGES/django.po # geonode/locale/no/LC_MESSAGES/djangojs.po # geonode/locale/pl/LC_MESSAGES/django.mo # geonode/locale/pl/LC_MESSAGES/django.po # geonode/locale/pl/LC_MESSAGES/djangojs.po # geonode/locale/pt/LC_MESSAGES/django.mo # geonode/locale/pt/LC_MESSAGES/django.po # geonode/locale/pt/LC_MESSAGES/djangojs.po # geonode/locale/pt_BR/LC_MESSAGES/django.po # geonode/locale/pt_BR/LC_MESSAGES/djangojs.po # geonode/locale/ro/LC_MESSAGES/django.po # geonode/locale/ro/LC_MESSAGES/djangojs.po # geonode/locale/ru/LC_MESSAGES/django.po # geonode/locale/ru/LC_MESSAGES/djangojs.po # geonode/locale/si/LC_MESSAGES/django.po # geonode/locale/si/LC_MESSAGES/djangojs.po # geonode/locale/sk/LC_MESSAGES/django.po # geonode/locale/sk/LC_MESSAGES/djangojs.po # geonode/locale/sq/LC_MESSAGES/django.po # geonode/locale/sq/LC_MESSAGES/djangojs.po # geonode/locale/sv/LC_MESSAGES/django.po # geonode/locale/sv/LC_MESSAGES/djangojs.po # geonode/locale/sw/LC_MESSAGES/django.po # geonode/locale/sw/LC_MESSAGES/djangojs.po # geonode/locale/ta/LC_MESSAGES/django.po # geonode/locale/ta/LC_MESSAGES/djangojs.po # geonode/locale/th/LC_MESSAGES/django.po # geonode/locale/th/LC_MESSAGES/djangojs.po # geonode/locale/tl/LC_MESSAGES/django.po # geonode/locale/tl/LC_MESSAGES/djangojs.po # geonode/locale/uk/LC_MESSAGES/django.po # geonode/locale/uk/LC_MESSAGES/djangojs.po # geonode/locale/vi/LC_MESSAGES/django.po # geonode/locale/vi/LC_MESSAGES/djangojs.po # geonode/locale/zh/LC_MESSAGES/django.po # geonode/locale/zh/LC_MESSAGES/djangojs.po

lgtm-com · 2021-04-08T13:15:16Z

This pull request fixes 5 alerts when merging 38de6fe into abdf3ed - view on LGTM.com

fixed alerts:

5 for Unused import

afabiani and others added 4 commits March 29, 2021 18:13

- Fix the "Upload" models fields and correctly link it to the "GeoNo…

dd4e49d

…de Layer"

Merge branch 'master' of https://github.com/GeoNode/geonode into ISSU…

8b73bcc

…E_7154

- Adding REST Interfaces for the "Upload" models

8264785

Merge branch 'master' of https://github.com/GeoNode/geonode into ISSU…

8d48634

…E_7154

afabiani added the backport 3.2.x PR should be backported to target version label Mar 30, 2021

afabiani added this to the 3.2 milestone Mar 30, 2021

afabiani self-assigned this Mar 30, 2021

cla-bot bot added the cla-signed CLA Bot: community license agreement signed label Mar 30, 2021

Merge branch 'master' of https://github.com/GeoNode/geonode into ISSU…

8d58cf5

…E_7154

- [WIP] Upload api test cases

7b46b2f

- [WIP] Hide non processed resources

10e7041

- [WIP] Management of the Importer Session during Resume

633585e

- [WIP] Hide dirty resources to everyone / Make sure Upload delete c…

f9e2c81

…ascade is invoked everytime

- [WIP] Update the UploaderSession state everytime we reload the imp…

6f00756

…orter session

- [WIP] Set Uploader Session state to INVALID if any error occurs

51f4715

afabiani added 2 commits April 1, 2021 16:30

- [WIP] Get rid of incomplete uploads on templates that are not rela…

755ce01

…ted to layer uploads

- [WIP] Exposing Upload resume, delete and import URLs via REST APIs

2ab778a

update workflow and ui of incomplete upload list

3daf698

replace import_id with id for the request to the api

eeac2b6

afabiani marked this pull request as ready for review April 6, 2021 13:12

afabiani requested review from giohappy, t-book and gannebamm April 6, 2021 13:12

- Adding Upload Selenium Live Tests

f6551a5

add processed item to the upload table

d9d789b

afabiani and others added 3 commits April 7, 2021 10:48

- [WIP] Adding "create_date" to the Upload session

91bb7f6

sort the table by created date

9a709fd

- Test fixes

1583250

afabiani added 2 commits April 7, 2021 14:59

Merge branch 'master' of https://github.com/GeoNode/geonode into ISSU…

6ac75f5

…E_7154

- Updating translations

a26e3c1

- Test fixes

343a629

afabiani force-pushed the ISSUE_7154 branch from 705473d to 343a629 Compare April 8, 2021 08:26

Merge branch 'master' of https://github.com/GeoNode/geonode into ISSU…

d146965

…E_7154 # Conflicts: # geonode/api/resourcebase_api.py

- Test fixes

38de6fe

afabiani merged commit 14070b2 into master Apr 8, 2021

afabiani deleted the ISSUE_7154 branch April 8, 2021 12:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GNIP-84: Upload Page Enhancements #7154 #7204

GNIP-84: Upload Page Enhancements #7154 #7204

afabiani commented Mar 30, 2021 •

edited

Loading

lgtm-com bot commented Mar 30, 2021

codecov bot commented Mar 30, 2021 •

edited

Loading

lgtm-com bot commented Mar 31, 2021

lgtm-com bot commented Mar 31, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 6, 2021

lgtm-com bot commented Apr 6, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 8, 2021

lgtm-com bot commented Apr 8, 2021

github-actions bot commented Apr 8, 2021

lgtm-com bot commented Apr 8, 2021

GNIP-84: Upload Page Enhancements #7154 #7204

GNIP-84: Upload Page Enhancements #7154 #7204

Conversation

afabiani commented Mar 30, 2021 • edited Loading

Checklist

lgtm-com bot commented Mar 30, 2021

codecov bot commented Mar 30, 2021 • edited Loading

Codecov Report

lgtm-com bot commented Mar 31, 2021

lgtm-com bot commented Mar 31, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 1, 2021

lgtm-com bot commented Apr 6, 2021

lgtm-com bot commented Apr 6, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 7, 2021

lgtm-com bot commented Apr 8, 2021

lgtm-com bot commented Apr 8, 2021

github-actions bot commented Apr 8, 2021

lgtm-com bot commented Apr 8, 2021

afabiani commented Mar 30, 2021 •

edited

Loading

codecov bot commented Mar 30, 2021 •

edited

Loading