feat(Onboarding): implement the KeycardFactoryReset flow #17167
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
caybro
commented
Jan 30, 2025
| @@ -47,7 +47,7 @@ SQUtils.QObject { | |||
|
|
|||
| function finishWithFactoryReset() { | |||
| root.keycardFactoryResetRequested() | |||
| root.finished() | |||
| root.finished(false) | |||
There was a problem hiding this comment.
We don't want to proceed with the original flow when we request a Factory reset
There was a problem hiding this comment.
Would it be better to emit a different signal then?
caybro
commented
Jan 30, 2025
| @@ -86,16 +85,10 @@ Control { | |||
| } | |||
| MaybeOutlineButton { | |||
| width: parent.width | |||
| visible: root.keycardState === Onboarding.KeycardState.BlockedPIN | |||
| visible: root.keycardState === Onboarding.KeycardState.BlockedPIN || root.keycardState === Onboarding.KeycardState.BlockedPUK | |||
There was a problem hiding this comment.
"Unblock with recovery phrase" is always visible on the Login screen
caybro
commented
Jan 30, 2025
| text: qsTr("Unblock with recovery phrase") | ||
| onClicked: root.unblockWithSeedphraseRequested() | ||
| } | ||
| MaybeOutlineButton { |
There was a problem hiding this comment.
.. and Factory reset never visible on the Login screen
Jenkins BuildsClick to see older builds (45)
|
caybro
force-pushed
the
17094-onboarding-factory-reset-keycard-flow
branch
3 times, most recently
from
88c35d7 to
2beff66
Compare
caybro
force-pushed
the
17094-onboarding-factory-reset-keycard-flow
branch
3 times, most recently
from
866faf0 to
13d0c83
Compare
igor-sirotin
approved these changes
Feb 3, 2025
ui/StatusQ/src/onboarding/enums.h
Outdated
| @@ -66,6 +66,7 @@ class OnboardingEnums: public QObject | |||
| MaxPairingSlotsReached, | |||
| BlockedPIN, // PIN remaining attempts == 0 | |||
| BlockedPUK, // PUK remaining attempts == 0 | |||
| FactoryResetting, | |||
There was a problem hiding this comment.
If merged after #17127, please add it to here as well:
There was a problem hiding this comment.
Alright, I can wait, will add this state
There was a problem hiding this comment.
@igor-sirotin what about the missing startKeycardFactoryReset() NIM method?
There was a problem hiding this comment.
Alright, I added the state in my PR: 2a25314
There was a problem hiding this comment.
@caybro What's the startKeycardFactoryReset, I have no idea about it
There was a problem hiding this comment.
This should invoke the actual factory reset method on the backend side, via the respective store function
| @@ -47,7 +47,7 @@ SQUtils.QObject { | |||
|
|
|||
| function finishWithFactoryReset() { | |||
| root.keycardFactoryResetRequested() | |||
| root.finished() | |||
| root.finished(false) | |||
There was a problem hiding this comment.
Would it be better to emit a different signal then?
micieslak
approved these changes
Feb 3, 2025
Yeah I will add an extra issue/task to extend the QML tests with these "unblock" flows; afaik we don't really test any of these yet |
caybro
force-pushed
the
17094-onboarding-factory-reset-keycard-flow
branch
from
13d0c83 to
7f39e36
Compare
|
|
- in other words, stop if we want some other flow instead, e.g. the factory reset
- integrate it into the UI and StoryBook - a new keycardState is introduced: `FactoryResetting` (matching the backend) - a new store method introduced: `startKeycardFactoryReset()` Fixes: #17094
caybro
force-pushed
the
17094-onboarding-factory-reset-keycard-flow
branch
from
7f39e36 to
82a21b1
Compare
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.
What does the PR do
FactoryResetting(matching the backend)startKeycardFactoryReset()Fixes: #17094
Affected areas
Onboarding
Architecture compliance
My PR is consistent with this document: Status Desktop Architecture Guide
Screenshot of functionality (including design for comparison)
Zaznam.obrazovky.z.2025-01-31.15-20-57.mp4