Merge pull request #179 from cabcookie:split-notes-in-blocks

Notizen in separaten Blöcken speichern

.gitignore

@@ -40,3 +40,4 @@ next-env.d.ts
 amplify_outputs*
 scripts/import-data/*
 scripts/env.json
+components/ui-elements/notes-writer/mentions/example

amplify/backend.ts

@@ -10,12 +10,16 @@ const backend = defineBackend({
   storage,
 });
 
-const dataResources = backend.data.resources;
-
-Object.values(dataResources.cfnResources.amplifyDynamoDbTables).forEach(
-  (table) => {
-    table.pointInTimeRecoveryEnabled = true;
-    table.deletionProtectionEnabled = true;
-    table.applyRemovalPolicy(RemovalPolicy.RETAIN);
-  }
+const backendType = backend.auth.resources.userPool.node.tryGetContext(
+  "amplify-backend-type"
 );
+if (backendType !== "sandbox") {
+  const dataResources = backend.data.resources;
+  Object.values(dataResources.cfnResources.amplifyDynamoDbTables).forEach(
+    (table) => {
+      table.pointInTimeRecoveryEnabled = true;
+      table.deletionProtectionEnabled = true;
+      table.applyRemovalPolicy(RemovalPolicy.RETAIN);
+    }
+  );
+}

amplify/data/activity-schema.ts

@@ -1,6 +1,7 @@
 import { a } from "@aws-amplify/backend";
 
 const activitySchema = {
+  TodoStatus: a.enum(["OPEN", "DONE"]),
   ProjectActivity: a
     .model({
       owner: a
@@ -13,27 +14,77 @@ const activitySchema = {
     })
     .secondaryIndexes((index) => [index("projectsId")])
     .authorization((allow) => [allow.owner()]),
+  NoteBlockPerson: a
+    .model({
+      owner: a
+        .string()
+        .authorization((allow) => [allow.owner().to(["read", "delete"])]),
+      personId: a.id().required(),
+      person: a.belongsTo("Person", "personId"),
+      noteBlockId: a.id().required(),
+      noteBlock: a.belongsTo("NoteBlock", "noteBlockId"),
+    })
+    .authorization((allow) => [allow.owner()]),
+  NoteBlock: a
+    .model({
+      owner: a
+        .string()
+        .authorization((allow) => [allow.owner().to(["read", "delete"])]),
+      content: a.json(),
+      type: a.string().required(),
+      formatVersion: a.integer().required(),
+      activityId: a.id().required(),
+      activity: a.belongsTo("Activity", "activityId"),
+      todoId: a.id(),
+      todo: a.belongsTo("Todo", "todoId"),
+      people: a.hasMany("NoteBlockPerson", "noteBlockId"),
+    })
+    .secondaryIndexes((index) => [index("type")])
+    .authorization((allow) => [allow.owner()]),
+  ProjectTodo: a
+    .model({
+      owner: a
+        .string()
+        .authorization((allow) => [allow.owner().to(["read", "delete"])]),
+      todoId: a.id().required(),
+      todo: a.belongsTo("Todo", "todoId"),
+      projectIdTodoStatus: a.string().required(),
+    })
+    .secondaryIndexes((index) => [
+      index("projectIdTodoStatus"),
+      index("todoId"),
+    ])
+    .authorization((allow) => [allow.owner()]),
+  Todo: a
+    .model({
+      owner: a
+        .string()
+        .authorization((allow) => [allow.owner().to(["read", "delete"])]),
+      todo: a.json().required(),
+      status: a.ref("TodoStatus").required(),
+      doneOn: a.date(),
+      activity: a.hasOne("NoteBlock", "todoId"),
+      projects: a.hasMany("ProjectTodo", "todoId"),
+      dailyTodos: a.hasMany("DailyPlanTodo", "todoId"),
+    })
+    .secondaryIndexes((index) => [index("status")])
+    .authorization((allow) => [allow.owner()]),
   Activity: a
     .model({
       owner: a
         .string()
         .authorization((allow) => [allow.owner().to(["read", "delete"])]),
       notionId: a.integer(),
-      notes: a.string(),
       formatVersion: a.integer().default(1),
-      notesJson: a.json(),
-      hasOpenTasks: a.string().required(),
       forProjects: a.hasMany("ProjectActivity", "activityId"),
       meetingActivitiesId: a.id(),
       forMeeting: a.belongsTo("Meeting", "meetingActivitiesId"),
       finishedOn: a.datetime(),
-      dailyTasks: a.hasMany("DailyPlanTask", "activityId"),
+      noteBlocks: a.hasMany("NoteBlock", "activityId"),
+      noteBlockIds: a.string().required().array(),
+      notes: a.string(), // DEPRECATED
+      notesJson: a.json(), // DEPRECATED
     })
-    .secondaryIndexes((index) => [
-      index("hasOpenTasks")
-        .sortKeys(["finishedOn"])
-        .queryField("listActivitiesByOpenTasks"),
-    ])
     .authorization((allow) => [allow.owner()]),
 };
 

amplify/data/person-schema.ts

@@ -88,6 +88,7 @@ const personSchmema = {
       details: a.hasMany("PersonDetail", "personId"),
       learnings: a.hasMany("PersonLearning", "personId"),
       profile: a.hasOne("User", "personId"),
+      noteBlocks: a.hasMany("NoteBlockPerson", "personId"),
     })
     .authorization((allow) => [allow.owner()]),
 };

amplify/data/planning-schema.ts

@@ -34,26 +34,22 @@ const planningSchema = {
       dayGoal: a.string().required(),
       context: a.ref("Context").required(),
       status: a.ref("DailyPlanStatus").required(),
-      tasks: a.hasMany("DailyPlanTask", "dailyPlanId"),
+      todos: a.hasMany("DailyPlanTodo", "dailyPlanId"),
     })
     .secondaryIndexes((index) => [
       index("status").sortKeys(["day"]).queryField("listByStatus"),
     ])
     .authorization((allow) => [allow.owner()]),
-  DailyPlanTask: a
+  DailyPlanTodo: a
     .model({
       owner: a
         .string()
         .authorization((allow) => [allow.owner().to(["read", "delete"])]),
       dailyPlanId: a.id().required(),
       dailyPlan: a.belongsTo("DailyPlan", "dailyPlanId"),
-      activityId: a.id().required(),
-      activity: a.belongsTo("Activity", "activityId"),
-      taskIndex: a.integer().required(),
-      isInFocus: a.boolean().required(),
-      task: a.json().required(),
+      todoId: a.id().required(),
+      todo: a.belongsTo("Todo", "todoId"),
     })
-    .identifier(["dailyPlanId", "activityId", "taskIndex"])
     .authorization((allow) => [allow.owner()]),
 };
 

amplify/data/resource.ts

@@ -25,7 +25,6 @@ const schema = a
         note: a.string(),
         formatVersion: a.integer().default(1),
         noteJson: a.json(),
-        hasOpenTasks: a.string().required(),
         status: a.id().required(),
         movedToActivityId: a.string(),
       })

api/ContextAccounts.tsx

@@ -1,15 +1,13 @@
 import { type Schema } from "@/amplify/data/resource";
+import { emptyDocument } from "@/components/ui-elements/editors/helpers/document";
 import { toast } from "@/components/ui/use-toast";
 import {
   calcAccountAndSubsidariesPipeline,
   calcOrder,
   getQuotaFromTerritoryOrSubsidaries,
 } from "@/helpers/accounts";
-import {
-  EditorJsonContent,
-  emptyDocument,
-  transformNotesVersion,
-} from "@/helpers/ui-notes-writer";
+import { transformNotesVersion } from "@/helpers/ui-notes-writer";
+import { JSONContent } from "@tiptap/core";
 import { SelectionSet, generateClient } from "aws-amplify/data";
 import { filter, flow, get, join, map, sortBy, sum } from "lodash/fp";
 import { FC, ReactNode, createContext, useContext } from "react";
@@ -21,7 +19,7 @@ type UpdateAccountProps = {
   id: string;
   name?: string;
   crmId?: string;
-  introduction?: EditorJsonContent;
+  introduction?: JSONContent;
 };
 
 interface AccountsContextType {
@@ -58,7 +56,7 @@ export type Account = {
   id: string;
   name: string;
   crmId?: string;
-  introduction: EditorJsonContent;
+  introduction: JSONContent;
   controller?: {
     id: string;
     name: string;
@@ -179,7 +177,7 @@ const addOrderNumberToAccounts = (
     []
   );
 
-const fetchAccounts = async () => {
+export const fetchAccounts = async () => {
   const { data, errors } = await client.models.Account.list({
     limit: 500,
     selectionSet,