|
|
@ -2,10 +2,12 @@ import * as React from 'react';
|
|
|
|
import { Route, Switch } from 'react-router';
|
|
|
|
import { Route, Switch } from 'react-router';
|
|
|
|
import RaisedButton from 'material-ui/RaisedButton';
|
|
|
|
import RaisedButton from 'material-ui/RaisedButton';
|
|
|
|
import IconEdit from 'material-ui/svg-icons/editor/mode-edit';
|
|
|
|
import IconEdit from 'material-ui/svg-icons/editor/mode-edit';
|
|
|
|
|
|
|
|
import IconChangeHistory from 'material-ui/svg-icons/action/change-history';
|
|
|
|
|
|
|
|
|
|
|
|
import * as EteSync from '../api/EteSync';
|
|
|
|
import * as EteSync from '../api/EteSync';
|
|
|
|
|
|
|
|
|
|
|
|
import { createSelector } from 'reselect';
|
|
|
|
import { createSelector } from 'reselect';
|
|
|
|
|
|
|
|
import { pure } from 'recompose';
|
|
|
|
|
|
|
|
|
|
|
|
import { History } from 'history';
|
|
|
|
import { History } from 'history';
|
|
|
|
|
|
|
|
|
|
|
@ -13,6 +15,7 @@ import { ContactType, EventType } from '../pim-types';
|
|
|
|
|
|
|
|
|
|
|
|
import Container from '../widgets/Container';
|
|
|
|
import Container from '../widgets/Container';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import JournalEntries from '../components/JournalEntries';
|
|
|
|
import ContactEdit from '../components/ContactEdit';
|
|
|
|
import ContactEdit from '../components/ContactEdit';
|
|
|
|
import Contact from '../components/Contact';
|
|
|
|
import Contact from '../components/Contact';
|
|
|
|
import EventEdit from '../components/EventEdit';
|
|
|
|
import EventEdit from '../components/EventEdit';
|
|
|
@ -65,6 +68,28 @@ const itemsSelector = createSelector(
|
|
|
|
return { collectionsAddressBook, collectionsCalendar, addressBookItems, calendarItems };
|
|
|
|
return { collectionsAddressBook, collectionsCalendar, addressBookItems, calendarItems };
|
|
|
|
},
|
|
|
|
},
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const ItemChangeLog = pure((props: any) => {
|
|
|
|
|
|
|
|
const {
|
|
|
|
|
|
|
|
syncInfo,
|
|
|
|
|
|
|
|
items,
|
|
|
|
|
|
|
|
uid,
|
|
|
|
|
|
|
|
} = props;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const journalItem = syncInfo.get((items[uid] as any).journalUid);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
|
|
|
<React.Fragment>
|
|
|
|
|
|
|
|
<h2>Item Change History</h2>
|
|
|
|
|
|
|
|
<JournalEntries
|
|
|
|
|
|
|
|
journal={journalItem.journal}
|
|
|
|
|
|
|
|
entries={journalItem.entries}
|
|
|
|
|
|
|
|
uid={uid}
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</React.Fragment>
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
class Pim extends React.PureComponent {
|
|
|
|
class Pim extends React.PureComponent {
|
|
|
|
props: {
|
|
|
|
props: {
|
|
|
|
etesync: CredentialsData;
|
|
|
|
etesync: CredentialsData;
|
|
|
@ -151,16 +176,40 @@ class Pim extends React.PureComponent {
|
|
|
|
</Container>
|
|
|
|
</Container>
|
|
|
|
)}
|
|
|
|
)}
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
|
|
|
|
<Route
|
|
|
|
|
|
|
|
path={routeResolver.getRoute('pim.contacts._id.log')}
|
|
|
|
|
|
|
|
exact={true}
|
|
|
|
|
|
|
|
render={({match}) => (
|
|
|
|
|
|
|
|
<Container>
|
|
|
|
|
|
|
|
<ItemChangeLog
|
|
|
|
|
|
|
|
syncInfo={this.props.syncInfo}
|
|
|
|
|
|
|
|
items={addressBookItems}
|
|
|
|
|
|
|
|
uid={match.params.contactUid}
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</Container>
|
|
|
|
|
|
|
|
)}
|
|
|
|
|
|
|
|
/>
|
|
|
|
<Route
|
|
|
|
<Route
|
|
|
|
path={routeResolver.getRoute('pim.contacts._id')}
|
|
|
|
path={routeResolver.getRoute('pim.contacts._id')}
|
|
|
|
exact={true}
|
|
|
|
exact={true}
|
|
|
|
render={({match, history}) => (
|
|
|
|
render={({match, history}) => (
|
|
|
|
<Container>
|
|
|
|
<Container>
|
|
|
|
<div style={{textAlign: 'right'}}>
|
|
|
|
<div style={{textAlign: 'right', marginBottom: 15}}>
|
|
|
|
|
|
|
|
<RaisedButton
|
|
|
|
|
|
|
|
label="Change History"
|
|
|
|
|
|
|
|
style={{marginLeft: 15}}
|
|
|
|
|
|
|
|
icon={<IconChangeHistory />}
|
|
|
|
|
|
|
|
onClick={() =>
|
|
|
|
|
|
|
|
history.push(routeResolver.getRoute(
|
|
|
|
|
|
|
|
'pim.contacts._id.log',
|
|
|
|
|
|
|
|
{contactUid: match.params.contactUid}))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
|
|
<RaisedButton
|
|
|
|
<RaisedButton
|
|
|
|
label="Edit"
|
|
|
|
label="Edit"
|
|
|
|
secondary={true}
|
|
|
|
secondary={true}
|
|
|
|
style={{marginBottom: 15}}
|
|
|
|
style={{marginLeft: 15}}
|
|
|
|
icon={<IconEdit />}
|
|
|
|
icon={<IconEdit />}
|
|
|
|
onClick={() =>
|
|
|
|
onClick={() =>
|
|
|
|
history.push(routeResolver.getRoute(
|
|
|
|
history.push(routeResolver.getRoute(
|
|
|
@ -196,16 +245,40 @@ class Pim extends React.PureComponent {
|
|
|
|
</Container>
|
|
|
|
</Container>
|
|
|
|
)}
|
|
|
|
)}
|
|
|
|
/>
|
|
|
|
/>
|
|
|
|
|
|
|
|
<Route
|
|
|
|
|
|
|
|
path={routeResolver.getRoute('pim.events._id.log')}
|
|
|
|
|
|
|
|
exact={true}
|
|
|
|
|
|
|
|
render={({match}) => (
|
|
|
|
|
|
|
|
<Container>
|
|
|
|
|
|
|
|
<ItemChangeLog
|
|
|
|
|
|
|
|
syncInfo={this.props.syncInfo}
|
|
|
|
|
|
|
|
items={calendarItems}
|
|
|
|
|
|
|
|
uid={match.params.eventUid}
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
</Container>
|
|
|
|
|
|
|
|
)}
|
|
|
|
|
|
|
|
/>
|
|
|
|
<Route
|
|
|
|
<Route
|
|
|
|
path={routeResolver.getRoute('pim.events._id')}
|
|
|
|
path={routeResolver.getRoute('pim.events._id')}
|
|
|
|
exact={true}
|
|
|
|
exact={true}
|
|
|
|
render={({match, history}) => (
|
|
|
|
render={({match, history}) => (
|
|
|
|
<Container>
|
|
|
|
<Container>
|
|
|
|
<div style={{textAlign: 'right'}}>
|
|
|
|
<div style={{textAlign: 'right', marginBottom: 15}}>
|
|
|
|
|
|
|
|
<RaisedButton
|
|
|
|
|
|
|
|
label="Change History"
|
|
|
|
|
|
|
|
style={{marginLeft: 15}}
|
|
|
|
|
|
|
|
icon={<IconChangeHistory />}
|
|
|
|
|
|
|
|
onClick={() =>
|
|
|
|
|
|
|
|
history.push(routeResolver.getRoute(
|
|
|
|
|
|
|
|
'pim.events._id.log',
|
|
|
|
|
|
|
|
{eventUid: match.params.eventUid}))
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/>
|
|
|
|
|
|
|
|
|
|
|
|
<RaisedButton
|
|
|
|
<RaisedButton
|
|
|
|
label="Edit"
|
|
|
|
label="Edit"
|
|
|
|
secondary={true}
|
|
|
|
secondary={true}
|
|
|
|
style={{marginBottom: 15}}
|
|
|
|
style={{marginLeft: 15}}
|
|
|
|
icon={<IconEdit />}
|
|
|
|
icon={<IconEdit />}
|
|
|
|
onClick={() =>
|
|
|
|
onClick={() =>
|
|
|
|
history.push(routeResolver.getRoute(
|
|
|
|
history.push(routeResolver.getRoute(
|
|
|
|