fix(files): failsafe when executing actions methods #49685
Merged
+51
−19
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
skjnldsv
requested review from
susnux and
sorbaugh
and removed request for
a team
skjnldsv
force-pushed
the
fix/fail-safe-files-actions
branch
from
1a3fca5 to
0d7e5ae
Compare
skjnldsv
changed the title
|
/backport to stable30 |
|
/backport to stable29 |
|
/backport to stable28 |
blizzz
approved these changes
Dec 6, 2024
susnux
previously requested changes
Dec 6, 2024
| return action.displayName([this.source], this.currentView) | ||
| } catch (e) { | ||
| logger.error('Error while getting action display name', { action, e }) | ||
| return '' |
There was a problem hiding this comment.
There should be at least some name, the empty string is not a good state also for ux.
Maybe use the ID.
| if (title) return title | ||
| } | ||
| return action.displayName([this.source], this.currentView) | ||
| } catch (e) { |
There was a problem hiding this comment.
Suggested change
| } catch (e) { | |
| } catch (error) { |
So the key in the logger context is meaningful
| } | ||
| return action.displayName([this.source], this.currentView) | ||
| } catch (e) { | ||
| logger.error('Error while getting action display name', { action, e }) |
There was a problem hiding this comment.
Suggested change
| logger.error('Error while getting action display name', { action, e }) | |
| logger.error('Error while getting action display name', { action, error }) |
| try { | ||
| return action?.inline?.(this.source, this.currentView) | ||
| } catch (e) { | ||
| logger.error('Error while checking if action is inline', { action, e }) |
There was a problem hiding this comment.
Suggested change
| logger.error('Error while checking if action is inline', { action, e }) | |
| logger.error('Error while checking if action is inline', { action, error }) |
| let displayName = action.id | ||
| try { | ||
| displayName = action.displayName([this.source], this.currentView) | ||
| } catch (e) { |
There was a problem hiding this comment.
Suggested change
| } catch (e) { | |
| } catch (error) { |
| try { | ||
| displayName = action.displayName([this.source], this.currentView) | ||
| } catch (e) { | ||
| logger.error('Error while getting action display name', { action, e }) |
There was a problem hiding this comment.
Suggested change
| logger.error('Error while getting action display name', { action, e }) | |
| logger.error('Error while getting action display name', { action, error }) |
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
skjnldsv
force-pushed
the
fix/fail-safe-files-actions
branch
from
0d7e5ae to
4470dd6
Compare
|
/compile |
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2 tasks
This was referenced Dec 11, 2024
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.
Should avoid breaking the files app entirely when an external app have written invalid code.