diff --git a/src/Pim/PimMain.tsx b/src/Pim/PimMain.tsx index 26d5195..85dd486 100644 --- a/src/Pim/PimMain.tsx +++ b/src/Pim/PimMain.tsx @@ -10,8 +10,6 @@ import { Theme, withTheme } from '@material-ui/core/styles'; import * as ICAL from 'ical.js'; -import * as EteSync from 'etesync'; - import { Location, History } from 'history'; import Container from '../widgets/Container'; @@ -20,7 +18,7 @@ import SearchableAddressBook from '../components/SearchableAddressBook'; import Calendar from '../components/Calendar'; import TaskList from '../components/Tasks/TaskList'; -import { EventType, ContactType, TaskType, PimType } from '../pim-types'; +import { EventType, ContactType, TaskType } from '../pim-types'; import { routeResolver } from '../App'; @@ -39,8 +37,6 @@ interface PropsType { location?: Location; history?: History; theme: Theme; - collectionsTaskList: EteSync.CollectionInfo[]; - onItemSave: (item: PimType, journalUid: string, originalItem?: PimType) => void; } class PimMain extends React.PureComponent { @@ -150,9 +146,7 @@ class PimMain extends React.PureComponent { {tab === 2 && } diff --git a/src/Pim/index.tsx b/src/Pim/index.tsx index 393f068..c1c6869 100644 --- a/src/Pim/index.tsx +++ b/src/Pim/index.tsx @@ -110,7 +110,7 @@ type CollectionRoutesPropsType = RouteComponentProps<{}> & { componentEdit: any; componentView: any; items: {[key: string]: PimType}; - onItemSave: (item: PimType, journalUid: string, originalItem?: PimType) => void; + onItemSave: (item: PimType, journalUid: string, originalContact?: PimType) => void; onItemDelete: (item: PimType, journalUid: string) => void; onItemCancel: () => void; classes: any; diff --git a/src/components/Tasks/QuickAdd.tsx b/src/components/Tasks/QuickAdd.tsx deleted file mode 100644 index f15b6a2..0000000 --- a/src/components/Tasks/QuickAdd.tsx +++ /dev/null @@ -1,57 +0,0 @@ -import * as React from 'react'; - -import * as EteSync from 'etesync'; - -import ICAL from 'ical.js'; - -import uuid from 'uuid'; - -import Checkbox from '@material-ui/core/Checkbox'; -import TextField from '@material-ui/core/TextField'; - -import { TaskType, PimType } from '../../pim-types'; -import { ListItem } from '../../widgets/List'; - -interface PropsType { - onSubmit: (item: PimType, journalUid: string, originalItem?: PimType) => void; - defaultCollection: EteSync.CollectionInfo; -} - -const QuickAdd = (props: PropsType) => { - const [title, setTitle] = React.useState(''); - const { onSubmit: save, defaultCollection } = props; - - - const handleChange = (e: React.ChangeEvent) => { - setTitle(e.target.value); - }; - - const handleKeyPress = (e: React.KeyboardEvent) => { - if (e.key === 'Enter') { - e.preventDefault(); - - const task = new TaskType(null); - task.uid = uuid.v4(); - task.title = title; - task.lastModified = ICAL.Time.now(); - - save(task, defaultCollection.uid, undefined); - - setTitle(''); - } - }; - - - return ( - }> - - - ); -}; - -export default QuickAdd; \ No newline at end of file diff --git a/src/components/Tasks/TaskList.tsx b/src/components/Tasks/TaskList.tsx index e03baea..92283bc 100644 --- a/src/components/Tasks/TaskList.tsx +++ b/src/components/Tasks/TaskList.tsx @@ -5,17 +5,14 @@ import * as React from 'react'; import { createSelector } from 'reselect'; -import * as EteSync from 'etesync'; - import { List } from '../../widgets/List'; -import { TaskType, PimType } from '../../pim-types'; +import { TaskType } from '../../pim-types'; import FormControlLabel from '@material-ui/core/FormControlLabel'; import Checkbox from '@material-ui/core/Checkbox'; import Divider from '@material-ui/core/Divider'; import TaskListItem from './TaskListItem'; -import QuickAdd from './QuickAdd'; const sortSelector = createSelector( (entries: TaskType[]) => entries, @@ -24,9 +21,7 @@ const sortSelector = createSelector( interface PropsType { entries: TaskType[]; - collections: EteSync.CollectionInfo[]; onItemClick: (entry: TaskType) => void; - onItemSave: (item: PimType, journalUid: string, originalItem?: PimType) => void; } export default React.memo(function TaskList(props: PropsType) { @@ -60,8 +55,6 @@ export default React.memo(function TaskList(props: PropsType) { {itemList} - - ); diff --git a/src/pim-types.ts b/src/pim-types.ts index 8728d6a..56614ae 100644 --- a/src/pim-types.ts +++ b/src/pim-types.ts @@ -83,10 +83,6 @@ export class EventType extends ICAL.Event implements PimType { return this.summary; } - set title(title: string) { - this.summary = title; - } - get start() { return this.startDate.toJSDate(); } @@ -103,14 +99,6 @@ export class EventType extends ICAL.Event implements PimType { return this.description; } - get lastModified() { - return this.component.getFirstPropertyValue('last-modified'); - } - - set lastModified(time: ICAL.Time) { - this.component.updatePropertyWithValue('last-modified', time); - } - public toIcal() { const comp = new ICAL.Component(['vcalendar', [], []]); comp.updatePropertyWithValue('prodid', PRODID);