Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add export started message when exporting data #3913

Merged
merged 1 commit into from
Oct 6, 2023

Conversation

nboisteault
Copy link
Member

@nboisteault nboisteault commented Oct 5, 2023

Ticket : support 2512

Funded by CD84

simplescreenrecorder-2023-10-05_17.32.10.mp4

@mdouchin
Copy link
Collaborator

mdouchin commented Oct 6, 2023

If you can catch when the download ended successfully, maybe disable the button during the export process and reactivate it when the export has been done ?

@nboisteault
Copy link
Member Author

If you can catch when the download ended successfully, maybe disable the button during the export process and reactivate it when the export has been done ?

Done!

@nboisteault nboisteault added the run end2end If the PR must run end2end tests or not label Oct 6, 2023
@nboisteault nboisteault merged commit 514e3d1 into 3liz:master Oct 6, 2023
11 checks passed
@nboisteault nboisteault deleted the add-export-started-message branch October 6, 2023 11:27
@3liz-bot
Copy link
Contributor

3liz-bot commented Oct 6, 2023

The backport to release_3_6 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply bc03fe2d7... Add export started message when importing data
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging assets/src/legacy/attributeTable.js
Auto-merging assets/src/legacy/map.js
CONFLICT (content): Merge conflict in assets/src/legacy/map.js
Auto-merging assets/src/legacy/switcher-layers-actions.js
Auto-merging lizmap/modules/view/locales/en_US/dictionnary.UTF-8.properties

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-release_3_6 release_3_6
# Navigate to the new working tree
cd .worktrees/backport-release_3_6
# Create a new branch
git switch --create backport-3913-to-release_3_6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick bc03fe2d720a883829e0337619817ec1f0df5801
# Push it to GitHub
git push --set-upstream origin backport-3913-to-release_3_6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release_3_6

Then, create a pull request where the base branch is release_3_6 and the compare/head branch is backport-3913-to-release_3_6.

@Gustry Gustry changed the title Add export started message when importing data Add export started message when exporting data Nov 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement failed backport Feature Request run end2end If the PR must run end2end tests or not sponsored development This development has been funded user interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants