Skip to content

[MS] Update organization recovery page#12588

Merged
fabienSvtr merged 1 commit intomasterfrom
ms-organization-recovery-page
Apr 20, 2026
Merged

[MS] Update organization recovery page#12588
fabienSvtr merged 1 commit intomasterfrom
ms-organization-recovery-page

Conversation

@fabienSvtr
Copy link
Copy Markdown
Contributor

image

closes #12566

@fabienSvtr fabienSvtr force-pushed the ms-organization-recovery-page branch 2 times, most recently from b816537 to 00cbcd8 Compare April 10, 2026 14:50
@fabienSvtr fabienSvtr marked this pull request as ready for review April 10, 2026 14:50
@fabienSvtr fabienSvtr requested a review from a team as a code owner April 10, 2026 14:50
@fabienSvtr fabienSvtr force-pushed the ms-organization-recovery-page branch from d4d758f to c73c724 Compare April 13, 2026 06:02
Copy link
Copy Markdown
Contributor

@Max-7 Max-7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You took the wrong path by replacing OrganizationRecoveryPage, and creating ExportRecoveryDeviceModal that's basically a copy of it. It makes the changes very hard to read (and therefor test and validate).
Instead, you should rename OrganizationRecoveryPage to DeviceRecoveryPage, add a DeviceRecoveryModal that basically just uses the DeviceRecoveryPage, and then add a new OrganizationRecoveryPage that groups everything (hoping that git will notice the renaming and not create diffs).

Comment thread client/src/views/devices/DevicesPage.vue
Comment thread client/src/views/devices/utils.ts Outdated
Comment thread client/src/views/users/MyProfilePage.vue Outdated
@fabienSvtr fabienSvtr force-pushed the ms-organization-recovery-page branch 3 times, most recently from 80671a5 to 09314db Compare April 17, 2026 05:20
Comment thread client/src/locales/en-US.json Outdated
Comment thread client/src/locales/en-US.json Outdated
Comment thread client/src/locales/en-US.json Outdated
Comment thread client/src/locales/en-US.json Outdated
Comment thread client/src/locales/fr-FR.json Outdated
Comment thread client/src/locales/en-US.json Outdated
Comment thread client/src/locales/fr-FR.json Outdated
Comment thread client/src/locales/fr-FR.json Outdated
Comment thread client/src/views/totp/ActivateTotpModal.vue
Comment thread client/src/views/profile/ExportRecoveryDevice.vue
Comment thread client/src/locales/en-US.json Outdated
Comment thread client/src/locales/en-US.json Outdated
"adviceDone": "You have already created recovery files.",
"file": {
"title": "Recovery files",
"description": "A recovery file and a secret key allow you to regain access to your data once assembled.",
Copy link
Copy Markdown
Contributor

@Ironicbay Ironicbay Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"description": "A recovery file and a secret key allow you to regain access to your data once assembled.",
"description": "A recovery file combined with a secret key allow you to restore access to your data once assembled.",

Comment thread client/src/locales/en-US.json Outdated
Comment thread client/src/locales/en-US.json Outdated
Comment thread client/src/locales/fr-FR.json Outdated
Comment thread client/src/locales/fr-FR.json Outdated
Comment thread client/src/locales/fr-FR.json Outdated
@fabienSvtr fabienSvtr force-pushed the ms-organization-recovery-page branch from c48a456 to f669886 Compare April 20, 2026 06:44
@fabienSvtr fabienSvtr added this pull request to the merge queue Apr 20, 2026
Merged via the queue into master with commit 5138ba5 Apr 20, 2026
16 checks passed
@fabienSvtr fabienSvtr deleted the ms-organization-recovery-page branch April 20, 2026 07:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Update OrganizationRecoveryPage with Recovery sections

3 participants