vmario/wisemapping-frontend
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-frontend.git synced 2024-11-22 06:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor account component and complete account loading

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2021-02-07 09:59:45 -08:00
parent 4b1c92757f
commit 40e89a58d4
7 changed files with 72 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/webapp/src/components/maps-page/client-health-sentinel/index.tsx → packages/webapp/src/client/client-health-sentinel/index.tsx
View File

@ -1,11 +1,11 @@
import { useSelector } from 'react-redux';
import React from "react";
import { activeInstanceStatus, ClientStatus } from '../../../redux/clientSlice';
import { activeInstanceStatus, ClientStatus } from '../../redux/clientSlice';
import { Button, Dialog, DialogActions, DialogContent, DialogTitle } from '@material-ui/core';
import { FormattedMessage } from 'react-intl';
import { Alert, AlertTitle } from '@material-ui/lab';
const ClientHealthChecker = () => {
const ClientHealthSentinel = () => {
const status: ClientStatus = useSelector(activeInstanceStatus);
const handleOnClose = () => {
@ -44,4 +44,4 @@ const ClientHealthChecker = () => {
</div>
)
};
export default ClientHealthChecker;
export default ClientHealthSentinel;

13
packages/webapp/src/client/index.ts
View File

@ -48,6 +48,11 @@ export type ErrorInfo = {
fields?: Map<String, String>;
}
export type AccountInfo = {
firstName: string;
lastName: string;
email: string;
}
interface Client {
createMap(map: BasicMapInfo): Promise<number>;
@ -57,18 +62,18 @@ interface Client {
fetchAllMaps(): Promise<MapInfo[]>;
duplicateMap(id: number, basicInfo: BasicMapInfo): Promise<number>;
changeStarred(id: number, starred: boolean): Promise<void>;
updateStarred(id: number, starred: boolean): Promise<void>;
updateMapToPublic(id: number, starred: boolean): Promise<void>;
fetchLabels(): Promise<Label[]>;
// createLabel(label: Label): Promise<void>;
deleteLabel(id: number): Promise<void>;
fetchAccountInfo():Promise<AccountInfo>;
registerNewUser(user: NewUser): Promise<void>;
resetPassword(email: string): Promise<void>;
fetchHistory(id:number):Promise<ChangeHistory[]>;
revertHistory(id:number,cid:number): Promise<void>
fetchHistory(id: number): Promise<ChangeHistory[]>;
revertHistory(id: number, cid: number): Promise<void>
}

11
packages/webapp/src/client/mock-client/index.ts
View File

@ -1,4 +1,4 @@
import Client, { BasicMapInfo, ChangeHistory, Label, MapInfo, NewUser } from '..';
import Client, { AccountInfo, BasicMapInfo, ChangeHistory, Label, MapInfo, NewUser } from '..';
class MockClient implements Client {
private maps: MapInfo[] = [];
@ -34,6 +34,13 @@ class MockClient implements Client {
];
}
fetchAccountInfo(): Promise<AccountInfo> {
return Promise.resolve({
firstName: 'Costme',
lastName: 'Fulanito',
email: 'test@example.com'
});
}
deleteMaps(ids: number[]): Promise<void> {
ids.forEach(id => this.deleteMap(id));
return Promise.resolve();
@ -59,7 +66,7 @@ class MockClient implements Client {
return Promise.resolve();
}
changeStarred(id: number, starred: boolean): Promise<void> {
updateStarred(id: number, starred: boolean): Promise<void> {
const mapInfo = this.maps.find(m => m.id == id);
if (!mapInfo) {
console.log(`Could not find the map iwth id ${id}`);

28
packages/webapp/src/client/rest-client/index.ts
View File

@ -1,5 +1,5 @@
import axios from 'axios';
import Client, { ErrorInfo, MapInfo, BasicMapInfo, NewUser, Label, ChangeHistory } from '..';
import Client, { ErrorInfo, MapInfo, BasicMapInfo, NewUser, Label, ChangeHistory, AccountInfo } from '..';
export default class RestClient implements Client {
private baseUrl: string;
@ -10,6 +10,28 @@ export default class RestClient implements Client {
this.sessionExpired = sessionExpired;
}
fetchAccountInfo(): Promise<AccountInfo> {
const handler = (success: (account: AccountInfo) => void, reject: (error: ErrorInfo) => void) => {
axios.get(
this.baseUrl + '/c/restful/account',
{
headers: { 'Content-Type': 'application/json' }
}
).then(response => {
const account = response.data;
success({
lastName: account.lastName,
firstName: account.fistName,
email: account.email,
});
}).catch(error => {
const errorInfo = this.parseResponseOnError(error.response);
reject(errorInfo);
});
}
return new Promise(handler);
}
deleteMaps(ids: number[]): Promise<void> {
const handler = (success: () => void, reject: (error: ErrorInfo) => void) => {
axios.delete(this.baseUrl + `/c/restful/maps/batch?ids=${ids.join()}`,
@ -204,7 +226,7 @@ export default class RestClient implements Client {
return new Promise(handler);
}
changeStarred(id: number, starred: boolean): Promise<void> {
updateStarred(id: number, starred: boolean): Promise<void> {
const handler = (success: () => void, reject: (error: ErrorInfo) => void) => {
axios.put(this.baseUrl + `/c/restful/maps/${id}/starred`,
starred,
@ -220,9 +242,7 @@ export default class RestClient implements Client {
return new Promise(handler);
}
fetchLabels(): Promise<Label[]> {
const handler = (success: (labels: Label[]) => void, reject: (error: ErrorInfo) => void) => {
axios.get(
this.baseUrl + '/c/restful/labels/',

28
packages/webapp/src/components/maps-page/account-menu/index.tsx
View File

@ -1,9 +1,18 @@
import { Button, Link, ListItemIcon, Menu, MenuItem, Tooltip } from "@material-ui/core";
import { AccountCircle, ExitToAppOutlined, SettingsApplicationsOutlined } from "@material-ui/icons";
import { Button, IconButton, Link, ListItemIcon, Menu, MenuItem, Tooltip } from '@material-ui/core';
import { AccountCircle, ExitToAppOutlined, SettingsApplicationsOutlined } from '@material-ui/icons';
import React from "react";
import { FormattedMessage } from "react-intl";
import { useQuery, useQueryClient } from "react-query";
import Client, { ErrorInfo, AccountInfo } from "../../../client";
import { useSelector } from 'react-redux';
import { activeInstance } from '../../../redux/clientSlice';
const AccountMenu = () => {
const client: Client = useSelector(activeInstance);
const queryClient = useQueryClient();
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
const open = Boolean(anchorEl);
@ -14,15 +23,18 @@ const AccountMenu = () => {
setAnchorEl(null);
};
const { isLoading, error, data } = useQuery<unknown, ErrorInfo, AccountInfo>('account', () => {
return client.fetchAccountInfo();
});
const account = data;
return (
<span>
<Tooltip title="Paulo Veiga <pveiga@gmail.com>">
<Button
aria-haspopup="true"
<Tooltip title={`${account?.firstName} ${account?.lastName} <${account?.email}>`}>
<IconButton
onClick={handleMenu}>
<AccountCircle fontSize="large" />
Paulo Veiga
</Button >
<AccountCircle fontSize="large" style={{color:'black'}}/>
</IconButton >
</Tooltip>
<Menu id="appbar-profile"
anchorEl={anchorEl}

2
packages/webapp/src/components/maps-page/index.tsx
View File

@ -19,7 +19,7 @@ import Client, { Label } from '../../client';
import ActionDispatcher from './action-dispatcher';
import { ActionType } from './action-chooser';
import AccountMenu from './account-menu';
import ClientHealthSentinel from './client-health-sentinel';
import ClientHealthSentinel from '../../client/client-health-sentinel';
import HelpMenu from '../help-menu';
const logoIcon = require('../../images/logo-small.svg');

17
packages/webapp/src/components/maps-page/maps-list/index.tsx
View File

@ -1,4 +1,4 @@
import React, { useEffect } from 'react'
import React, { useEffect,CSSProperties } from 'react';
import { useStyles } from './styled';
import Table from '@material-ui/core/Table';
@ -16,7 +16,6 @@ import IconButton from '@material-ui/core/IconButton';
import Tooltip from '@material-ui/core/Tooltip';
import StarRateRoundedIcon from '@material-ui/icons/StarRateRounded';
import MoreHorizIcon from '@material-ui/icons/MoreHoriz';
import { CSSProperties } from 'react';
import { useSelector } from 'react-redux';
import { activeInstance } from '../../../redux/clientSlice';
import { useMutation, useQuery, useQueryClient } from 'react-query';
@ -30,7 +29,6 @@ import moment from 'moment'
import { Filter, LabelFilter } from '..';
import { FormattedMessage, useIntl } from 'react-intl';
import { DeleteOutlined, LabelTwoTone } from '@material-ui/icons';
import Alert from '@material-ui/lab/Alert';
function descendingComparator<T>(a: T, b: T, orderBy: keyof T) {
@ -213,7 +211,7 @@ export const MapsList = (props: MapsListProps) => {
}, [props.filter.type, (props.filter as LabelFilter).label]);
const { isLoading, error, data } = useQuery<unknown, ErrorInfo, MapInfo[]>('maps', async () => {
const { isLoading, data } = useQuery<unknown, ErrorInfo, MapInfo[]>('maps', async () => {
return await client.fetchAllMaps();
});
const mapsInfo: MapInfo[] = data ? data.filter(mapsFilter(filter, searchCondition)) : [];
@ -284,13 +282,13 @@ export const MapsList = (props: MapsListProps) => {
const starredMultation = useMutation<void, ErrorInfo, number>((id: number) => {
const map = mapsInfo.find(m => m.id == id);
return client.changeStarred(id, !Boolean(map?.starred));
return client.updateStarred(id, !Boolean(map?.starred));
},
{
onSuccess: () => {
queryClient.invalidateQueries('maps');
},
onError: (error) => {
onError: () => {
// setError(error);
}
}
@ -317,7 +315,7 @@ export const MapsList = (props: MapsListProps) => {
setSearchCondition(e.target.value);
}
const handleDeleteClick = (event: React.MouseEvent<HTMLButtonElement>) => {
const handleDeleteClick = () => {
setActiveDialog({
actionType: 'delete',
mapsId: selected
@ -496,8 +494,3 @@ export const MapsList = (props: MapsListProps) => {
);
}
const ErrorDialog = (props) => {
return (<Alert severity="error">This is an error alert — check it out!</Alert>);
}