Skip to content

Commit

Permalink
Merge pull request #181 from cabcookie/split-notes-in-blocks
Browse files Browse the repository at this point in the history
fix: clean up
  • Loading branch information
cabcookie authored Aug 26, 2024
2 parents bac5582 + 6b42fba commit 8e618d8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 58 deletions.
34 changes: 0 additions & 34 deletions components/ui-elements/editors/helpers/blocks-cud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,40 +160,6 @@ const mapUpdateSet = (content: JSONContent): TBlockUpdateSet => {
};
};

const mapLevel2 =
(changedBlocks: TBlockUpdateSet[]) =>
(level2: JSONContent): JSONContent => {
const block = changedBlocks.find(
(b) => b.blockId === level2.attrs?.blockId
);
if (!block)
return {
...level2,
content: level2.content?.map(mapLevel2(changedBlocks)),
};
return {
...level2,
...JSON.parse(block.content),
};
};

const mapLevel1 =
(changedBlocks: TBlockUpdateSet[]) =>
(level1: JSONContent): JSONContent => {
const block = changedBlocks.find(
(b) => b.blockId === level1.attrs?.blockId
);
if (!block)
return {
...level1,
content: level1.content?.map(mapLevel2(changedBlocks)),
};
return {
...level1,
...JSON.parse(block.content),
};
};

export const updateBlock = async ({
blockId,
content,
Expand Down
24 changes: 0 additions & 24 deletions components/ui-elements/editors/helpers/todos-cud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,30 +130,6 @@ const mapUpdateSet = (content: JSONContent): TTodoUpdateSet => {
};
};

const mapTaskItem = (changedTodos: TTodoUpdateSet[], taskItem: JSONContent) => {
const todo = changedTodos.find((t) => t.todoId === taskItem.attrs?.todoId);
if (!todo) return taskItem;
const content = JSON.parse(todo.content) as JSONContent;
return {
...content,
attrs: {
...taskItem.attrs,
...content.attrs,
},
};
};

const mapLevel2 = (changedTodos: TTodoUpdateSet[]) => (level2: JSONContent) =>
level2.type !== "taskItem" || !level2.attrs?.todoId
? level2
: mapTaskItem(changedTodos, level2);

const mapLevel1 =
(changedTodos: TTodoUpdateSet[]) => (level1: JSONContent) => ({
...level1,
content: level1.content?.map(mapLevel2(changedTodos)),
});

export const updateTodo = async ({ todoId, content, done }: TTodoUpdateSet) => {
const { data, errors } = await client.models.Todo.update({
id: todoId,
Expand Down

0 comments on commit 8e618d8

Please sign in to comment.