[PR #5756] fix: reset individual shortcut #6992

New issue

Open

opened 2026-03-23 23:17:37 +00:00 by mirror · 0 comments

mirror commented

2026-03-23 23:17:37 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/AppFlowy-IO/AppFlowy/pull/5756
Author: @MayurSMahajan
Created: 7/17/2024
Status: 🔄 Open

Base: main ← Head: fix_reset_single_shortcut_5684

📝 Commits (10+)

446d892 feat: reset individual shortcut
a1ee51d test: reset individual shortcut
ab06a66 Merge remote-tracking branch 'upstream/main' into fix_reset_single_shortcut_5684
3ec3af6 chore: fix the integration test
92311b3 chore: add appropriate localized strings
26dbca5 chore: merge branch 'upstream/main' into HEAD
ead32f2 feat: disable reset shortcut when already default
cbc735a Merge remote-tracking branch 'upstream/main' into fix_reset_single_shortcut_5684
3cd5fe4 refactor: extract edit and reset btns as widgets
a4fef1b Merge remote-tracking branch 'upstream/main' into fix_reset_single_shortcut_5684

📊 Changes

6 files changed (+335 additions, -47 deletions)

View changed files

📝 frontend/appflowy_flutter/integration_test/desktop/settings/shortcuts_settings_test.dart (+76 -0)
📝 frontend/appflowy_flutter/lib/workspace/application/settings/shortcuts/settings_shortcuts_cubit.dart (+40 -1)
📝 frontend/appflowy_flutter/lib/workspace/application/settings/shortcuts/settings_shortcuts_service.dart (+14 -8)
📝 frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_shortcuts_view.dart (+109 -37)
📝 frontend/appflowy_flutter/test/bloc_test/shortcuts_test/shortcuts_cubit_test.dart (+91 -0)
📝 frontend/resources/translations/en.json (+5 -1)

📄 Description

Solves: #5684

Added a new method to the cubit with appropriate error handling
Added cubit tests and an integration test to test the fix
Added appropriate localization.

Feature Preview

Here is a feature preview:

https://github.com/user-attachments/assets/8097048b-f574-4972-b2a4-b73c7cf7e75a

PR Checklist

My code adheres to AppFlowy's Conventions
I've listed at least one issue this PR fixes in the description above.
I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes.
All existing tests are passing.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/AppFlowy-IO/AppFlowy/pull/5756 **Author:** [@MayurSMahajan](https://github.com/MayurSMahajan) **Created:** 7/17/2024 **Status:** 🔄 Open **Base:** `main` ← **Head:** `fix_reset_single_shortcut_5684` --- ### 📝 Commits (10+) - [`446d892`](https://github.com/AppFlowy-IO/AppFlowy/commit/446d892e8140fd7888b503f9e423af8b9edb3f9c) feat: reset individual shortcut - [`a1ee51d`](https://github.com/AppFlowy-IO/AppFlowy/commit/a1ee51d054a146d26195cfe26f373becdd1751be) test: reset individual shortcut - [`ab06a66`](https://github.com/AppFlowy-IO/AppFlowy/commit/ab06a661e93dbd3a2f4b65b5c10dfa35c7af40a0) Merge remote-tracking branch 'upstream/main' into fix_reset_single_shortcut_5684 - [`3ec3af6`](https://github.com/AppFlowy-IO/AppFlowy/commit/3ec3af633dc94be974f4f1400833066b1ab0fa53) chore: fix the integration test - [`92311b3`](https://github.com/AppFlowy-IO/AppFlowy/commit/92311b3ae1f2b96ae91d3342b8b9f6722e76f2e3) chore: add appropriate localized strings - [`26dbca5`](https://github.com/AppFlowy-IO/AppFlowy/commit/26dbca53e43b9b61e1f31f6401d66f03da29d99e) chore: merge branch 'upstream/main' into HEAD - [`ead32f2`](https://github.com/AppFlowy-IO/AppFlowy/commit/ead32f2a786666c42930375b42a5b55cc76e1891) feat: disable reset shortcut when already default - [`cbc735a`](https://github.com/AppFlowy-IO/AppFlowy/commit/cbc735ae14edded97a6938d9870c7f8b7efceaaa) Merge remote-tracking branch 'upstream/main' into fix_reset_single_shortcut_5684 - [`3cd5fe4`](https://github.com/AppFlowy-IO/AppFlowy/commit/3cd5fe44c8648b381cc5ea39d6016abcceb58943) refactor: extract edit and reset btns as widgets - [`a4fef1b`](https://github.com/AppFlowy-IO/AppFlowy/commit/a4fef1bab3714e589e74c3269e0ff9e2d4312422) Merge remote-tracking branch 'upstream/main' into fix_reset_single_shortcut_5684 ### 📊 Changes **6 files changed** (+335 additions, -47 deletions) <details> <summary>View changed files</summary> 📝 `frontend/appflowy_flutter/integration_test/desktop/settings/shortcuts_settings_test.dart` (+76 -0) 📝 `frontend/appflowy_flutter/lib/workspace/application/settings/shortcuts/settings_shortcuts_cubit.dart` (+40 -1) 📝 `frontend/appflowy_flutter/lib/workspace/application/settings/shortcuts/settings_shortcuts_service.dart` (+14 -8) 📝 `frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_shortcuts_view.dart` (+109 -37) 📝 `frontend/appflowy_flutter/test/bloc_test/shortcuts_test/shortcuts_cubit_test.dart` (+91 -0) 📝 `frontend/resources/translations/en.json` (+5 -1) </details> ### 📄 Description  Solves: #5684 - [x] Added a new method to the cubit with appropriate error handling - [x] Added cubit tests and an integration test to test the fix - [x] Added appropriate localization.  ### Feature Preview Here is a feature preview: https://github.com/user-attachments/assets/8097048b-f574-4972-b2a4-b73c7cf7e75a  ---  #### PR Checklist - [x] My code adheres to [AppFlowy's Conventions](https://docs.appflowy.io/docs/documentation/software-contributions/conventions) - [x] I've listed at least one issue this PR fixes in the description above. - [x] I've added a test(s) to validate changes in this PR, or this PR only contains semantic changes. - [x] All existing tests are passing. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>