-
-
Notifications
You must be signed in to change notification settings - Fork 3k
feat!: replace Abiword with LibreOffice and add DOCX export #7539
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
Open
JohnMcLear
wants to merge
7
commits into
develop
Choose a base branch
from
drop-abiword-add-docx
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d1f2826
feat!: replace Abiword with LibreOffice and add DOCX export (#4805)
JohnMcLear d012f90
feat: add docxExport feature flag and abiword deprecation WARN
Copilot 226c476
refactor: extract wordFormat variable and improve docxExport comment
Copilot 7bbaa26
fix: restore import-limitation message when no converter is configured
JohnMcLear f336f24
i18n: inline English fallback for noConverter import message
JohnMcLear 0fe537e
Revert "i18n: inline English fallback for noConverter import message"
JohnMcLear a534018
i18n: leave non-English locale files untouched
JohnMcLear File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,22 +28,22 @@ exports.expressCreateServer = (hookName:string, args:ArgsExpressType, cb:Functio | |
| args.app.use('/p/:pad{/:rev}/export/:type', limiter); | ||
| args.app.get('/p/:pad{/:rev}/export/:type', (req:any, res:any, next:Function) => { | ||
| (async () => { | ||
| const types = ['pdf', 'doc', 'txt', 'html', 'odt', 'etherpad']; | ||
| const types = ['pdf', 'doc', 'docx', 'txt', 'html', 'odt', 'etherpad']; | ||
| // send a 404 if we don't support this filetype | ||
| if (types.indexOf(req.params.type) === -1) { | ||
| return next(); | ||
| } | ||
|
|
||
| // if abiword is disabled, and this is a format we only support with abiword, output a message | ||
| // if soffice is disabled, and this is a format we only support with soffice, output a message | ||
| if (exportAvailable() === 'no' && | ||
| ['odt', 'pdf', 'doc'].indexOf(req.params.type) !== -1) { | ||
| ['odt', 'pdf', 'doc', 'docx'].indexOf(req.params.type) !== -1) { | ||
|
Comment on lines
+31
to
+39
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 1. doc export still enabled The export route still allows doc, so the system continues to expose/produce legacy DOC output instead of fully replacing it with DOCX. This violates the requirement to replace DOC with DOCX for the supported converter path(s). Agent Prompt
|
||
| console.error(`Impossible to export pad "${req.params.pad}" in ${req.params.type} format.` + | ||
| ' There is no converter configured'); | ||
|
|
||
| // ACHTUNG: do not include req.params.type in res.send() because there is | ||
| // no HTML escaping and it would lead to an XSS | ||
| res.send('This export is not enabled at this Etherpad instance. Set the path to Abiword' + | ||
| ' or soffice (LibreOffice) in settings.json to enable this feature'); | ||
| res.send('This export is not enabled at this Etherpad instance. Set the path to soffice ' + | ||
| '(LibreOffice) in settings.json to enable this feature'); | ||
| return; | ||
| } | ||
|
|
||
|
|
||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
3. abiword removed without warn
📘 Rule violation⚙ MaintainabilityAgent Prompt
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools