Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Subtask-related features #262

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Subtask-related features #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3daf033
Tasks edit: Added parent task selector
MangoCubes Jul 16, 2023
f245798
Tasks edit: Basic functionality for task selector
MangoCubes Jul 16, 2023
ee51609
Tasks edit: Simplified task selection
MangoCubes Jun 7, 2023
98ddff8
Tasks edit: Added toggle switch for hidden and completed tasks
MangoCubes Jul 21, 2023
7e8684f
Merge pull request #2 from MangoCubes/subtask
MangoCubes Jul 21, 2023
bb49a9a
Helper functions: Functions updated to allow multiple edits/deletes
MangoCubes Jul 23, 2023
e3efe13
Tasks edit: Added components for subtask list in the edit screen
MangoCubes Jul 23, 2023
8cf3c35
Tasks edit: Implemented core functionality of the subtask creation fe…
MangoCubes Jul 23, 2023
a102534
Tasks edit: Added supporting features (Press enter to create new subt…
MangoCubes Jul 23, 2023
2a63b04
Tasks: Added a way to view tasks with missing parent
MangoCubes Jul 23, 2023
2d4de66
Tasks edit: Merged parent selector feature into subtask list feature
MangoCubes Jul 23, 2023
d1d380d
Tasks edit: Fixing layout for delete confirmation dialog
MangoCubes Jul 23, 2023
b018e6c
Merge branch 'create-subtask'
MangoCubes Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/Calendars/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,17 @@ export default function CalendarsMain() {

async function onItemSave(item: PimType, collectionUid: string, originalItem?: PimType): Promise<void> {
const collection = collections!.find((x) => x.uid === collectionUid)!;
await itemSave(etebase, collection, items!, item, collectionUid, originalItem);
await itemSave(etebase, collection, items!, collectionUid,
[{
original: originalItem,
new: item,
}]
);
}

async function onItemDelete(item: PimType, collectionUid: string) {
const collection = collections!.find((x) => x.uid === collectionUid)!;
await itemDelete(etebase, collection, items!, item, collectionUid);
await itemDelete(etebase, collection, items!, [item], collectionUid);

history.push(routeResolver.getRoute("pim.events"));
}
Expand Down
9 changes: 7 additions & 2 deletions src/Contacts/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,17 @@ export default function ContactsMain() {

async function onItemSave(item: PimType, collectionUid: string, originalItem?: PimType): Promise<void> {
const collection = collections!.find((x) => x.uid === collectionUid)!;
await itemSave(etebase, collection, items!, item, collectionUid, originalItem);
await itemSave(etebase, collection, items!, collectionUid,
[{
original: originalItem,
new: item,
}]
);
}

async function onItemDelete(item: PimType, collectionUid: string) {
const collection = collections!.find((x) => x.uid === collectionUid)!;
await itemDelete(etebase, collection, items!, item, collectionUid);
await itemDelete(etebase, collection, items!, [item], collectionUid);

history.push(routeResolver.getRoute("pim.contacts"));
}
Expand Down
71 changes: 38 additions & 33 deletions src/Pim/helpers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import memoize from "memoizee";

import * as Etebase from "etebase";

import { PimType } from "../pim-types";
import { PimChanges, PimType } from "../pim-types";
import { getCollectionManager } from "../etebase-helpers";
import { asyncDispatch, store } from "../store";
import { itemBatch, appendError } from "../store/actions";
Expand Down Expand Up @@ -85,47 +85,52 @@ export function getDecryptItemsFunction<T extends PimType>(_colType: string, par
);
}

export async function itemSave(etebase: Etebase.Account, collection: Etebase.Collection, items: Map<string, Map<string, Etebase.Item>>, item: PimType, collectionUid: string, originalItem?: PimType): Promise<void> {
const itemUid = originalItem?.itemUid;
export async function itemSave(etebase: Etebase.Account, collection: Etebase.Collection, items: Map<string, Map<string, Etebase.Item>>, collectionUid: string, changes: PimChanges[]): Promise<void> {
const colMgr = getCollectionManager(etebase);
const itemMgr = colMgr.getItemManager(collection);

const mtime = (new Date()).getTime();
const content = item.toIcal();

let eteItem;
if (itemUid) {
// Existing item
eteItem = items!.get(collectionUid)?.get(itemUid)!;
await eteItem.setContent(content);
const meta = eteItem.getMeta();
meta.mtime = mtime;
eteItem.setMeta(meta);
} else {
// New
const meta: Etebase.ItemMetadata = {
mtime,
name: item.uid,
};
eteItem = await itemMgr.create(meta, content);
const itemList = [];
for (const item of changes) {
const itemUid = item.original?.itemUid;
const content = item.new.toIcal();
let eteItem;
if (itemUid) {
// Existing item
eteItem = items!.get(collectionUid)?.get(itemUid)!;
await eteItem.setContent(content);
const meta = eteItem.getMeta();
meta.mtime = mtime;
eteItem.setMeta(meta);
} else {
// New
const meta: Etebase.ItemMetadata = {
mtime,
name: item.new.uid,
};
eteItem = await itemMgr.create(meta, content);
}
itemList.push(eteItem);
}

await asyncDispatch(itemBatch(collection, itemMgr, [eteItem]));
await asyncDispatch(itemBatch(collection, itemMgr, itemList));
}

export async function itemDelete(etebase: Etebase.Account, collection: Etebase.Collection, items: Map<string, Map<string, Etebase.Item>>, item: PimType, collectionUid: string) {
const itemUid = item.itemUid!;
export async function itemDelete(etebase: Etebase.Account, collection: Etebase.Collection, items: Map<string, Map<string, Etebase.Item>>, itemsToDelete: PimType[], collectionUid: string) {
const colMgr = getCollectionManager(etebase);
const itemMgr = colMgr.getItemManager(collection);
const itemList = [];
for (const item of itemsToDelete) {
const itemUid = item.itemUid!;
const eteItem = items!.get(collectionUid)?.get(itemUid)!;
const mtime = (new Date()).getTime();
const meta = eteItem.getMeta();
meta.mtime = mtime;
eteItem.setMeta(meta);
eteItem.delete(true);
itemList.push(eteItem);
}


const eteItem = items!.get(collectionUid)?.get(itemUid)!;
const mtime = (new Date()).getTime();
const meta = eteItem.getMeta();
meta.mtime = mtime;
eteItem.setMeta(meta);
eteItem.delete(true);

await asyncDispatch(itemBatch(collection, itemMgr, [eteItem]));
await asyncDispatch(itemBatch(collection, itemMgr, itemList));
}

interface PimFabPropsType {
Expand Down
43 changes: 33 additions & 10 deletions src/Tasks/Main.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Button, useTheme } from "@material-ui/core";
import IconEdit from "@material-ui/icons/Edit";
import IconChangeHistory from "@material-ui/icons/ChangeHistory";

import { TaskType, PimType } from "../pim-types";
import { TaskType, PimType, PimChanges } from "../pim-types";
import { useCredentials } from "../credentials";
import { useItems, useCollections } from "../etebase-helpers";
import { routeResolver } from "../App";
Expand Down Expand Up @@ -57,28 +57,47 @@ export default function TasksMain() {
}

async function onItemSave(item: PimType, collectionUid: string, originalItem?: PimType): Promise<void> {
const collection = collections!.find((x) => x.uid === collectionUid)!;
await itemSave(etebase, collection, items!, item, collectionUid, originalItem);
await onMultipleItemsSave([{
original: originalItem,
new: item,
}], collectionUid);
}

async function onItemDelete(item: PimType, collectionUid: string) {
async function onMultipleItemsSave(changes: PimChanges[], collectionUid: string): Promise<void> {
const collection = collections!.find((x) => x.uid === collectionUid)!;
await itemDelete(etebase, collection, items!, item, collectionUid);

history.push(routeResolver.getRoute("pim.tasks"));
await itemSave(etebase, collection, items!, collectionUid, changes);
}

function onCancel() {
history.goBack();
}

const flatEntries = [];
const flatEntries: TaskType[] = [];
for (const col of entries.values()) {
for (const item of col.values()) {
flatEntries.push(item);
}
}

async function onItemDelete(item: PimType, collectionUid: string, redirect = true, recursive = false) {
const collection = collections!.find((x) => x.uid === collectionUid)!;
if (recursive) {
let index = 0;
const deleteTarget = [item];
while (index < deleteTarget.length) {
const current = deleteTarget[index++];
const children = flatEntries.filter((i) => i.relatedTo === current.uid);
deleteTarget.push(...children);
}
await itemDelete(etebase, collection, items!, deleteTarget, collectionUid);
} else {
await itemDelete(etebase, collection, items!, [item], collectionUid);
}
if (redirect) {
history.push(routeResolver.getRoute("pim.tasks"));
}
}

const styles = {
button: {
marginLeft: theme.spacing(1),
Expand Down Expand Up @@ -113,8 +132,10 @@ export default function TasksMain() {
exact
>
<TaskEdit
directChildren={[]}
entries={flatEntries}
collections={cachedCollections}
onSave={onItemSave}
onSave={onMultipleItemsSave}
onDelete={onItemDelete}
onCancel={onCancel}
history={history}
Expand Down Expand Up @@ -154,11 +175,13 @@ export default function TasksMain() {
exact
>
<TaskEdit
directChildren={flatEntries.filter((t) => t.relatedTo === item.uid)}
entries={flatEntries}
key={itemUid}
initialCollection={item.collectionUid}
item={item}
collections={cachedCollections}
onSave={onItemSave}
onSave={onMultipleItemsSave}
onDelete={onItemDelete}
onCancel={onCancel}
history={history}
Expand Down
Loading