From: Eric Biagiotti Date: Wed, 22 May 2019 15:47:25 +0000 (-0400) Subject: 15088: Changes link account page times to local. Adds cancel snackbar. X-Git-Tag: 1.4.0~1^2~2 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/6cbd20e54c830bbd70b6c314c53e95cf06c4e4ed 15088: Changes link account page times to local. Adds cancel snackbar. Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti --- diff --git a/src/store/link-account-panel/link-account-panel-actions.ts b/src/store/link-account-panel/link-account-panel-actions.ts index 9f94fa75..57f0681a 100644 --- a/src/store/link-account-panel/link-account-panel-actions.ts +++ b/src/store/link-account-panel/link-account-panel-actions.ts @@ -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 })); } } }; diff --git a/src/views/link-account-panel/link-account-panel-root.tsx b/src/views/link-account-panel/link-account-panel-root.tsx index c38cbe64..a5b1e35e 100644 --- a/src/views/link-account-panel/link-account-panel-root.tsx +++ b/src/views/link-account-panel/link-account-panel-root.tsx @@ -56,7 +56,7 @@ function displayUser(user: UserResource, showCreatedAt: boolean = false, showClu disp.push( hosted on cluster {homeCluster} and ); } if (showCreatedAt) { - disp.push( created on {formatDate(user.createdAt, true)}); + disp.push( created on {formatDate(user.createdAt)}); } return disp; }