Snapshots, dialogs and UI revisit #5685

torchiaf · 2023-10-09T14:01:04Z

Fixes #5677

Screenshots

Empty page

Cards

Cards + notes

Confirm delete

Confirm Restore

Creation dialog

Restoring dialog

Creating/Restoring dialog at startup

Error example

rak-phillip

Waiting on rebase of #5671 before giving a more thorough review, but I think we can improve some of the messages used throughout the dialogs.

pkg/rancher-desktop/assets/translations/en-us.yaml

torchiaf · 2023-10-12T16:02:36Z

@rak-phillip I added the title bar to confirmation dialogs. Blocking dialogs ATM are still not-movable and not-closable.

rak-phillip

Testing on Windows 11: Taking a snapshot fails (which is fine regarding the scope of this PR), but I'm unable to close the create dialog. I expect to be able to close the dialog on an error.

rak-phillip · 2023-10-12T21:54:17Z

background.ts

+
+    if (options.format.type !== 'question') {
+      /** On Linux it does nothing */
+      mainWindow.setOpacity(0.7);


I'm not sure if changing the opacity generates the desired effect here. The entire main window becomes transparent, where I'm thinking that the intent is to dim the main window as a means to communicate that it is "disabled" while the modal is open

We might need to create some form of overlay using an electron BrowserView¹, via css, or some other method

Footnotes

https://www.electronjs.org/docs/latest/api/browser-view ↩

Thank you Phil.

I've fixed the close button on Windows; it was caused by closable: true option, which is not required in the snapshots case.

I've fixed the dialog position on windows, now it should be always in the middle of the mainWindow.

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

- Implement dialog workflow - Implement dialog structure Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

- Clear old banners on handling dialogs - clean-up code Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Co-authored-by: Phillip Rak <rak.phillip@gmail.com> Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

- Fix dialog position on Windows - Fix close button on Windows - Remove opacity on Windows - Code refactoring Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

torchiaf · 2023-10-13T14:34:56Z

Tested on Linux/MacOS/Windows

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

rak-phillip

Looks good overall. Just a few comments to address.

pkg/rancher-desktop/assets/translations/en-us.yaml

rak-phillip · 2023-10-13T17:46:19Z

pkg/rancher-desktop/components/SnapshotCard.vue

+          <span
+            v-if="snapshot.formattedCreateDate"
+            class="value"
+            v-html="t('snapshots.card.created', { date: snapshot.formattedCreateDate.date, time: snapshot.formattedCreateDate.time }, true)"


We will need to make sure that we follow up with #4323 in our next release.

pkg/rancher-desktop/components/SnapshotCard.vue

pkg/rancher-desktop/window/index.ts

Co-authored-by: Phillip Rak <rak.phillip@gmail.com> Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

torchiaf · 2023-10-16T07:46:42Z

Thanks @rak-phillip , I've pushed the requested changes +

Corrected bold strings
Replaced the info banner with a simple message into Restore confirmation dialog.

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

rak-phillip

LGTM

torchiaf requested review from rak-phillip and ericpromislow October 9, 2023 14:01

torchiaf changed the title ~~Snapshots, dialogs~~ Snapshots, dialogs and UI workflow Oct 9, 2023

torchiaf force-pushed the feature/snapshots-dialogs branch 11 times, most recently from 23f2a73 to d400172 Compare October 11, 2023 17:02

gaktive removed the request for review from ericpromislow October 11, 2023 18:14

rak-phillip reviewed Oct 11, 2023

View reviewed changes

jandubois force-pushed the feature/snapshots-dialogs branch from d400172 to c9f2096 Compare October 12, 2023 04:29

torchiaf force-pushed the feature/snapshots-dialogs branch 4 times, most recently from 972538f to d8f5d5b Compare October 12, 2023 14:19

torchiaf changed the title ~~Snapshots, dialogs and UI workflow~~ Snapshots, dialogs and UI revisit Oct 12, 2023

rak-phillip requested changes Oct 12, 2023

View reviewed changes

torchiaf force-pushed the feature/snapshots-dialogs branch from 18fb357 to 351e0ab Compare October 13, 2023 07:46

torchiaf added 4 commits October 13, 2023 09:46

Implement Snapshots dialog's skeleton

989b72e

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Snapshots dialog

e00054a

- Implement dialog workflow - Implement dialog structure Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Show blocking window if snapshots operation is in progress

9d15a19

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Close preferences on snapshot create/restore

012c0c6

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

torchiaf and others added 12 commits October 13, 2023 09:47

Banners:

aab55a3

- Clear old banners on handling dialogs - clean-up code Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Lock screenshots dialog to main window

3ef083e

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Code clean-up

64eeea7

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Make confirmation dialogs closable

1233367

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Update pkg/rancher-desktop/assets/translations/en-us.yaml

b8261cb

Co-authored-by: Phillip Rak <rak.phillip@gmail.com> Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Update pkg/rancher-desktop/assets/translations/en-us.yaml

53f15ce

Co-authored-by: Phillip Rak <rak.phillip@gmail.com> Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Update pkg/rancher-desktop/assets/translations/en-us.yaml

44ee7da

Co-authored-by: Phillip Rak <rak.phillip@gmail.com> Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Update pkg/rancher-desktop/assets/translations/en-us.yaml

fa6931e

Co-authored-by: Phillip Rak <rak.phillip@gmail.com> Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Update pkg/rancher-desktop/assets/translations/en-us.yaml

89072f5

Co-authored-by: Phillip Rak <rak.phillip@gmail.com> Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Fix translations

7ddccef

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Fix show logs button

3f5f0ef

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Bold restoring dialog action

f6a516a

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

torchiaf force-pushed the feature/snapshots-dialogs branch from 351e0ab to f6a516a Compare October 13, 2023 07:47

Dialogs behavior

6d806bf

- Fix dialog position on Windows - Fix close button on Windows - Remove opacity on Windows - Code refactoring Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

torchiaf force-pushed the feature/snapshots-dialogs branch from d5d7b16 to 6d806bf Compare October 13, 2023 12:13

torchiaf requested a review from rak-phillip October 13, 2023 12:16

lint

7f70543

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

rak-phillip requested changes Oct 13, 2023

View reviewed changes

torchiaf and others added 2 commits October 16, 2023 09:20

Update pkg/rancher-desktop/assets/translations/en-us.yaml

95d7c15

Co-authored-by: Phillip Rak <rak.phillip@gmail.com> Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Clean comments

06c47de

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

torchiaf requested a review from rak-phillip October 16, 2023 07:45

torchiaf added 3 commits October 16, 2023 11:49

Fix dialogs escape button

34d1484

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Fix translations

bdc7fb4

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

Remove info banner from restore confirmation dialog

7799752

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

torchiaf force-pushed the feature/snapshots-dialogs branch from 999b148 to 7799752 Compare October 16, 2023 09:49

rak-phillip approved these changes Oct 16, 2023

View reviewed changes

rak-phillip merged commit 84302c7 into rancher-sandbox:main Oct 16, 2023
10 checks passed

rak-phillip mentioned this pull request Oct 25, 2023

Snapshot fails to be created, but UI shows message of success #5744

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Snapshots, dialogs and UI revisit #5685

Snapshots, dialogs and UI revisit #5685

torchiaf commented Oct 9, 2023 •

edited

Loading

rak-phillip left a comment

torchiaf commented Oct 12, 2023

rak-phillip left a comment

rak-phillip Oct 12, 2023

torchiaf Oct 13, 2023

torchiaf commented Oct 13, 2023

rak-phillip left a comment

rak-phillip Oct 13, 2023

torchiaf commented Oct 16, 2023

rak-phillip left a comment

Snapshots, dialogs and UI revisit #5685

Snapshots, dialogs and UI revisit #5685

Conversation

torchiaf commented Oct 9, 2023 • edited Loading

Screenshots

rak-phillip left a comment

Choose a reason for hiding this comment

torchiaf commented Oct 12, 2023

rak-phillip left a comment

Choose a reason for hiding this comment

rak-phillip Oct 12, 2023

Choose a reason for hiding this comment

Footnotes

torchiaf Oct 13, 2023

Choose a reason for hiding this comment

torchiaf commented Oct 13, 2023

rak-phillip left a comment

Choose a reason for hiding this comment

rak-phillip Oct 13, 2023

Choose a reason for hiding this comment

torchiaf commented Oct 16, 2023

rak-phillip left a comment

Choose a reason for hiding this comment

torchiaf commented Oct 9, 2023 •

edited

Loading