From: Pawel Kromplewski Date: Mon, 3 Dec 2018 07:29:41 +0000 (+0100) Subject: Merge branch 'master' into 14452-my-account X-Git-Tag: 1.4.0~92^2~6 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/4ea2ff188ec745966387ce8bbe14880bfeede863?hp=b223ff6adeb599c59346042a096fac309429db1f Merge branch 'master' into 14452-my-account refs #14452 Arvados-DCO-1.1-Signed-off-by: Pawel Kromplewski --- diff --git a/src/models/user.ts b/src/models/user.ts index 9f9c5347..dfb41889 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -4,12 +4,24 @@ import { Resource, ResourceKind } from '~/models/resource'; +export type userPrefs = { + profile?: { + organization?: string, + organization_email?: string, + lab?: string, + website_url?: string, + role?: string + } +}; + export interface User { email: string; firstName: string; lastName: string; uuid: string; ownerUuid: string; + identityUrl: string; + prefs: userPrefs; isAdmin: boolean; } diff --git a/src/routes/route-change-handlers.ts b/src/routes/route-change-handlers.ts index 22d0b7c7..1f3bd93f 100644 --- a/src/routes/route-change-handlers.ts +++ b/src/routes/route-change-handlers.ts @@ -4,6 +4,8 @@ import { History, Location } from 'history'; import { RootStore } from '~/store/store'; +import { matchProcessRoute, matchProcessLogRoute, matchProjectRoute, matchCollectionRoute, matchFavoritesRoute, matchTrashRoute, matchRootRoute, matchSharedWithMeRoute, matchRunProcessRoute, matchWorkflowRoute, matchSearchResultsRoute, matchSshKeysRoute, matchRepositoriesRoute, matchMyAccountRoute } from './routes'; +import { loadProject, loadCollection, loadFavorites, loadTrash, loadProcess, loadProcessLog, loadSshKeys, loadRepositories, loadMyAccount } from '~/store/workbench/workbench-actions'; import { matchProcessRoute, matchProcessLogRoute, matchProjectRoute, matchCollectionRoute, matchFavoritesRoute, matchTrashRoute, matchRootRoute, matchSharedWithMeRoute, matchRunProcessRoute, matchWorkflowRoute, matchSearchResultsRoute, matchSshKeysRoute, matchRepositoriesRoute, matchVirtualMachineRoute } from './routes'; import { loadProject, loadCollection, loadFavorites, loadTrash, loadProcess, loadProcessLog, loadSshKeys, loadRepositories, loadVirtualMachines } from '~/store/workbench/workbench-actions'; import { navigateToRootProject } from '~/store/navigation/navigation-action'; @@ -30,6 +32,7 @@ const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => { const virtualMachineMatch = matchVirtualMachineRoute(pathname); const workflowMatch = matchWorkflowRoute(pathname); const sshKeysMatch = matchSshKeysRoute(pathname); + const myAccountMatch = matchMyAccountRoute(pathname); if (projectMatch) { store.dispatch(loadProject(projectMatch.params.id)); @@ -59,5 +62,7 @@ const handleLocationChange = (store: RootStore) => ({ pathname }: Location) => { store.dispatch(loadRepositories); } else if (sshKeysMatch) { store.dispatch(loadSshKeys); + } else if (myAccountMatch) { + store.dispatch(loadMyAccount); } }; diff --git a/src/routes/routes.ts b/src/routes/routes.ts index 71cdfdac..a27b4274 100644 --- a/src/routes/routes.ts +++ b/src/routes/routes.ts @@ -22,7 +22,8 @@ export const Routes = { VIRTUAL_MACHINES: '/virtual-machines', WORKFLOWS: '/workflows', SEARCH_RESULTS: '/search-results', - SSH_KEYS: `/ssh-keys` + SSH_KEYS: `/ssh-keys`, + MY_ACCOUNT: '/my-account' }; export const getResourceUrl = (uuid: string) => { @@ -88,3 +89,6 @@ export const matchRepositoriesRoute = (route: string) => export const matchSshKeysRoute = (route: string) => matchPath(route, { path: Routes.SSH_KEYS }); + +export const matchMyAccountRoute = (route: string) => + matchPath(route, { path: Routes.MY_ACCOUNT }); diff --git a/src/services/auth-service/auth-service.ts b/src/services/auth-service/auth-service.ts index edc6e24f..6faaf99e 100644 --- a/src/services/auth-service/auth-service.ts +++ b/src/services/auth-service/auth-service.ts @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { User } from "~/models/user"; +import { User, userPrefs } from "~/models/user"; import { AxiosInstance } from "axios"; import { ApiActions, ProgressFn } from "~/services/api/api-actions"; import * as uuid from "uuid/v4"; @@ -14,6 +14,8 @@ export const USER_LAST_NAME_KEY = 'userLastName'; export const USER_UUID_KEY = 'userUuid'; export const USER_OWNER_UUID_KEY = 'userOwnerUuid'; export const USER_IS_ADMIN = 'isAdmin'; +export const USER_IDENTITY_URL = 'identityUrl'; +export const USER_PREFS = 'prefs'; export interface UserDetailsResponse { email: string; @@ -22,6 +24,8 @@ export interface UserDetailsResponse { uuid: string; owner_uuid: string; is_admin: boolean; + identity_url: string; + prefs: userPrefs; } export class AuthService { @@ -62,9 +66,11 @@ export class AuthService { const uuid = this.getUuid(); const ownerUuid = this.getOwnerUuid(); const isAdmin = this.getIsAdmin(); + const identityUrl = localStorage.getItem(USER_IDENTITY_URL); + const prefs = JSON.parse(localStorage.getItem(USER_PREFS) || '{"profile": {}}'); - return email && firstName && lastName && uuid && ownerUuid - ? { email, firstName, lastName, uuid, ownerUuid, isAdmin } + return email && firstName && lastName && uuid && ownerUuid && identityUrl && prefs + ? { email, firstName, lastName, uuid, ownerUuid, isAdmin, identityUrl, prefs } : undefined; } @@ -75,6 +81,8 @@ export class AuthService { localStorage.setItem(USER_UUID_KEY, user.uuid); localStorage.setItem(USER_OWNER_UUID_KEY, user.ownerUuid); localStorage.setItem(USER_IS_ADMIN, JSON.stringify(user.isAdmin)); + localStorage.setItem(USER_IDENTITY_URL, user.identityUrl); + localStorage.setItem(USER_PREFS, JSON.stringify(user.prefs)); } public removeUser() { @@ -84,6 +92,8 @@ export class AuthService { localStorage.removeItem(USER_UUID_KEY); localStorage.removeItem(USER_OWNER_UUID_KEY); localStorage.removeItem(USER_IS_ADMIN); + localStorage.removeItem(USER_IDENTITY_URL); + localStorage.removeItem(USER_PREFS); } public login() { @@ -103,13 +113,17 @@ export class AuthService { .get('/users/current') .then(resp => { this.actions.progressFn(reqId, false); + const prefs = resp.data.prefs.profile ? resp.data.prefs : { profile: {}}; + console.log(resp.data); return { email: resp.data.email, firstName: resp.data.first_name, lastName: resp.data.last_name, uuid: resp.data.uuid, ownerUuid: resp.data.owner_uuid, - isAdmin: resp.data.is_admin + isAdmin: resp.data.is_admin, + identityUrl: resp.data.identity_url, + prefs }; }) .catch(e => { diff --git a/src/store/auth/auth-action.ts b/src/store/auth/auth-action.ts index 28559b1a..a2046f33 100644 --- a/src/store/auth/auth-action.ts +++ b/src/store/auth/auth-action.ts @@ -161,5 +161,4 @@ export const loadSshKeysPanel = () => } }; - export type AuthAction = UnionOf; diff --git a/src/store/auth/auth-reducer.test.ts b/src/store/auth/auth-reducer.test.ts index a4017db3..b9f768f1 100644 --- a/src/store/auth/auth-reducer.test.ts +++ b/src/store/auth/auth-reducer.test.ts @@ -30,6 +30,8 @@ describe('auth-reducer', () => { lastName: "Doe", uuid: "uuid", ownerUuid: "ownerUuid", + identityUrl: "identityUrl", + prefs: {}, isAdmin: false }; const state = reducer(initialState, authActions.INIT({ user, token: "token" })); @@ -60,6 +62,8 @@ describe('auth-reducer', () => { lastName: "Doe", uuid: "uuid", ownerUuid: "ownerUuid", + identityUrl: "identityUrl", + prefs: {}, isAdmin: false }; diff --git a/src/store/my-account/my-account-panel-actions.ts b/src/store/my-account/my-account-panel-actions.ts new file mode 100644 index 00000000..cb1584cb --- /dev/null +++ b/src/store/my-account/my-account-panel-actions.ts @@ -0,0 +1,17 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +import { Dispatch } from "redux"; +import { RootState } from "~/store/store"; +import { ServiceRepository } from "~/services/services"; +import { setBreadcrumbs } from "~/store/breadcrumbs/breadcrumbs-actions"; + +export const loadMyAccountPanel = () => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + try { + dispatch(setBreadcrumbs([{ label: 'User profile'}])); + } catch (e) { + return; + } + }; \ No newline at end of file diff --git a/src/store/navigation/navigation-action.ts b/src/store/navigation/navigation-action.ts index 2bfd8b99..80a7f213 100644 --- a/src/store/navigation/navigation-action.ts +++ b/src/store/navigation/navigation-action.ts @@ -67,3 +67,5 @@ export const navigateToVirtualMachines = push(Routes.VIRTUAL_MACHINES); export const navigateToRepositories = push(Routes.REPOSITORIES); export const navigateToSshKeys= push(Routes.SSH_KEYS); + +export const navigateToMyAccount = push(Routes.MY_ACCOUNT); diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index 12dbe7b1..091a8ccc 100644 --- a/src/store/workbench/workbench-actions.ts +++ b/src/store/workbench/workbench-actions.ts @@ -40,6 +40,7 @@ import { loadSharedWithMePanel } from '~/store/shared-with-me-panel/shared-with- import { CopyFormDialogData } from '~/store/copy-dialog/copy-dialog'; import { loadWorkflowPanel, workflowPanelActions } from '~/store/workflow-panel/workflow-panel-actions'; import { loadSshKeysPanel } from '~/store/auth/auth-action'; +import { loadMyAccountPanel } from '~/store/my-account/my-account-panel-actions'; import { workflowPanelColumns } from '~/views/workflow-panel/workflow-panel-view'; import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions'; import { getProgressIndicator } from '~/store/progress-indicator/progress-indicator-reducer'; @@ -410,6 +411,11 @@ export const loadSshKeys = handleFirstTimeLoad( await dispatch(loadSshKeysPanel()); }); +export const loadMyAccount = handleFirstTimeLoad( + async (dispatch: Dispatch) => { + await dispatch(loadMyAccountPanel()); + }); + const finishLoadingProject = (project: GroupContentsResource | string) => async (dispatch: Dispatch) => { const uuid = typeof project === 'string' ? project : project.uuid; diff --git a/src/views-components/main-app-bar/account-menu.tsx b/src/views-components/main-app-bar/account-menu.tsx index ca88021c..0aedee90 100644 --- a/src/views-components/main-app-bar/account-menu.tsx +++ b/src/views-components/main-app-bar/account-menu.tsx @@ -12,7 +12,7 @@ import { logout } from '~/store/auth/auth-action'; import { RootState } from "~/store/store"; import { openCurrentTokenDialog } from '~/store/current-token-dialog/current-token-dialog-actions'; import { openRepositoriesPanel } from "~/store/repositories/repositories-actions"; -import { navigateToSshKeys } from '~/store/navigation/navigation-action'; +import { navigateToSshKeys, navigateToMyAccount } from '~/store/navigation/navigation-action'; import { openVirtualMachines } from "~/store/virtual-machines/virtual-machines-actions"; interface AccountMenuProps { @@ -37,7 +37,7 @@ export const AccountMenu = connect(mapStateToProps)( dispatch(openRepositoriesPanel())}>Repositories dispatch(openCurrentTokenDialog)}>Current token dispatch(navigateToSshKeys)}>Ssh Keys - My account + dispatch(navigateToMyAccount)}>My account dispatch(logout())}>Logout : null); diff --git a/src/views/my-account-panel/my-account-panel-root.tsx b/src/views/my-account-panel/my-account-panel-root.tsx new file mode 100644 index 00000000..c12f01aa --- /dev/null +++ b/src/views/my-account-panel/my-account-panel-root.tsx @@ -0,0 +1,119 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +import * as React from 'react'; +import { StyleRulesCallback, WithStyles, withStyles, Card, CardContent, TextField, Button, Typography, Grid, Table, TableHead, TableRow, TableCell, TableBody, Tooltip, IconButton } from '@material-ui/core'; +import { ArvadosTheme } from '~/common/custom-theme'; +import { User } from "~/models/user"; + +type CssRules = 'root' | 'gridItem' | 'title'; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + root: { + width: '100%', + overflow: 'auto' + }, + gridItem: { + minHeight: 45, + marginBottom: 20 + }, + title: { + marginBottom: theme.spacing.unit * 3, + color: theme.palette.grey["600"] + } +}); + +export interface MyAccountPanelRootActionProps {} + +export interface MyAccountPanelRootDataProps { + user?: User; +} + +type MyAccountPanelRootProps = MyAccountPanelRootActionProps & MyAccountPanelRootDataProps & WithStyles; + +export const MyAccountPanelRoot = withStyles(styles)( + ({ classes, user }: MyAccountPanelRootProps) => { + console.log(user); + return + + User profile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ;} +); \ No newline at end of file diff --git a/src/views/my-account-panel/my-account-panel.tsx b/src/views/my-account-panel/my-account-panel.tsx new file mode 100644 index 00000000..508a4c7e --- /dev/null +++ b/src/views/my-account-panel/my-account-panel.tsx @@ -0,0 +1,18 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +import { RootState } from '~/store/store'; +import { Dispatch } from 'redux'; +import { connect } from 'react-redux'; +import { MyAccountPanelRoot, MyAccountPanelRootDataProps, MyAccountPanelRootActionProps } from '~/views/my-account-panel/my-account-panel-root'; + +const mapStateToProps = (state: RootState): MyAccountPanelRootDataProps => ({ + user: state.auth.user +}); + +const mapDispatchToProps = (dispatch: Dispatch): MyAccountPanelRootActionProps => ({ + +}); + +export const MyAccountPanel = connect(mapStateToProps, mapDispatchToProps)(MyAccountPanelRoot); \ No newline at end of file diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx index 3914f646..2cff4317 100644 --- a/src/views/workbench/workbench.tsx +++ b/src/views/workbench/workbench.tsx @@ -45,6 +45,7 @@ import SplitterLayout from 'react-splitter-layout'; import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel'; import { SearchResultsPanel } from '~/views/search-results-panel/search-results-panel'; import { SshKeyPanel } from '~/views/ssh-key-panel/ssh-key-panel'; +import { MyAccountPanel } from '~/views/my-account-panel/my-account-panel'; import { SharingDialog } from '~/views-components/sharing-dialog/sharing-dialog'; import { AdvancedTabDialog } from '~/views-components/advanced-tab-dialog/advanced-tab-dialog'; import { ProcessInputDialog } from '~/views-components/process-input-dialog/process-input-dialog'; @@ -131,6 +132,7 @@ export const WorkbenchPanel = +