15088: Changes link account page times to local. Adds cancel snackbar.
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Wed, 22 May 2019 15:47:25 +0000 (11:47 -0400)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Wed, 22 May 2019 15:47:25 +0000 (11:47 -0400)
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

src/store/link-account-panel/link-account-panel-actions.ts
src/views/link-account-panel/link-account-panel-root.tsx

index 9f94fa75f9cab6ab1ceec0f838ad4a51dffc1345..57f0681acd0c762a74ce30ccceb9ab71a19ef08f 100644 (file)
@@ -227,10 +227,12 @@ export const cancelLinking = (reload: boolean = false) =>
         }
         finally {
             if (reload) {
+                services.linkAccountService.saveLinkOpStatus(LinkAccountStatus.CANCELLED);
                 location.reload();
             }
             else {
                 dispatch(progressIndicatorActions.STOP_WORKING(WORKBENCH_LOADING_SCREEN));
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Account link cancelled!", kind: SnackbarKind.INFO, hideDuration: 3000 }));
             }
         }
     };
index c38cbe643d5fbf0173a1ced83e942f065efc5bc7..a5b1e35e053292d409a24b597a0c6c3712f8eb41 100644 (file)
@@ -56,7 +56,7 @@ function displayUser(user: UserResource, showCreatedAt: boolean = false, showClu
         disp.push(<span> hosted on cluster <b>{homeCluster}</b> and </span>);
     }
     if (showCreatedAt) {
-        disp.push(<span> created on <b>{formatDate(user.createdAt, true)}</b></span>);
+        disp.push(<span> created on <b>{formatDate(user.createdAt)}</b></span>);
     }
     return disp;
 }