User Friendly Merge File Selection #1204
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…he merging process
t71rs
changed the title
|
UI has been updated can you confirm this works with latest updates |
|
Yes I have just tested it locally with the new UI (looks very nice btw :) ) and it still works! |
Tae1998
approved these changes
May 21, 2024
Frooodle
approved these changes
May 21, 2024
Frooodle
reviewed
May 21, 2024
| if (duplicateFiles.length > 1) { | ||
| const warning = document.createElement("span"); | ||
| warning.className = "duplicate-warning"; | ||
| warning.textContent = "(Duplicate)"; |
There was a problem hiding this comment.
Should be translatable and dynamic
There was a problem hiding this comment.
will add as todo before next release
There was a problem hiding this comment.
Somehow did not think about that. I can try and do that as well.
szinn
pushed a commit
to szinn/k8s-homelab
that referenced
this pull request
May 23, 2024
…0.24.5 ) (#3716) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [ghcr.io/stirling-tools/s-pdf](https://togithub.com/Stirling-Tools/Stirling-PDF) | patch | `0.24.4` -> `0.24.5` | --- ### Release Notes <details> <summary>Stirling-Tools/Stirling-PDF (ghcr.io/stirling-tools/s-pdf)</summary> ### [`v0.24.5`](https://togithub.com/Stirling-Tools/Stirling-PDF/releases/tag/v0.24.5): 0.24.5 reverse proxy fix and czech added [Compare Source](https://togithub.com/Stirling-Tools/Stirling-PDF/compare/v0.24.4...v0.24.5) Czech language added Reverse proxy fix for non security mode User Friendly Merge File Selection (needs a translation but reverse proxy release is more urgent) #### What's Changed - Add missing Turkish translation by [@​limonkufu](https://togithub.com/limonkufu) in [Stirling-Tools/Stirling-PDF#1255 - Czech translations by [@​Houba28](https://togithub.com/Houba28) in [Stirling-Tools/Stirling-PDF#1263 - Amended typo: trailing space by [@​zallaevan](https://togithub.com/zallaevan) in [Stirling-Tools/Stirling-PDF#1256 - User Friendly Merge File Selection by [@​t71rs](https://togithub.com/t71rs) in [Stirling-Tools/Stirling-PDF#1204 - Updated ReadMe Screenshot by [@​t71rs](https://togithub.com/t71rs) in [Stirling-Tools/Stirling-PDF#1272 - Add in oauth scope environment variable to docker-compose example by [@​pcanham](https://togithub.com/pcanham) in [Stirling-Tools/Stirling-PDF#1265 - cleanup html for reverse proxy by [@​Frooodle](https://togithub.com/Frooodle) in [Stirling-Tools/Stirling-PDF#1274 - 💾 Update Version by [@​github-actions](https://togithub.com/github-actions) in [Stirling-Tools/Stirling-PDF#1275 #### New Contributors - [@​limonkufu](https://togithub.com/limonkufu) made their first contribution in [Stirling-Tools/Stirling-PDF#1255 - [@​Houba28](https://togithub.com/Houba28) made their first contribution in [Stirling-Tools/Stirling-PDF#1263 - [@​zallaevan](https://togithub.com/zallaevan) made their first contribution in [Stirling-Tools/Stirling-PDF#1256 - [@​pcanham](https://togithub.com/pcanham) made their first contribution in [Stirling-Tools/Stirling-PDF#1265 **Full Changelog**: Stirling-Tools/Stirling-PDF@v0.24.4...v0.24.5 </details> <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNzQuMyIsInVwZGF0ZWRJblZlciI6IjM3LjM3NC4zIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZS9jb250YWluZXIiLCJ0eXBlL3BhdGNoIl19--> Co-authored-by: repo-jeeves[bot] <106431701+repo-jeeves[bot]@users.noreply.github.com>
|
This has broken logic for ALL other form inputs with files, now each forms inputs doesnt wipe the previous causing very bad usage for others |
|
reverting until it can be fixed! :) |
|
Damn I'm sorry, I will look into it and think of a solution that wont affect anything else since I quite liked this change. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
User Friendly Merge File Selction
If you had already added files to Merge them, but forgot one or more files and you went ahead and pressed the "Select Files" button, all previously selected Files were deleted.
I fixed that and made it possible to add Files "File by File". Additionally if someone should add the same File twice, a duplicate warning is now displayed, which is removed, if the duplicates are removed. Merging duplicates is possibel though if someone should want to do that. To work with duplicates I added a unique id for each added FIle in the merging process. This makes it possible to differ between files that have the same Name.
Closes #1174
Checklist:
Contributor License Agreement
By submitting this pull request, I acknowledge and agree that my contributions will be included in Stirling-PDF and that they can be relicensed in the future under the MPL 2.0 (Mozilla Public License Version 2.0) license.
(This does not change the general open-source nature of Stirling-PDF, simply moving from one license to another license)