finished UI

apps/server/prisma/schema.prisma

@@ -290,13 +290,15 @@ model Task {
   status   String?
   metadata Json    @default("{}")
 
+  // This is used in recurring tasks
   startTime    DateTime?
   endTime      DateTime?
   recurrence   String[]
   scheduleText String?
-  dueDate      DateTime?
-  remindAt     DateTime?
-  tags         String[]
+
+  dueDate  DateTime?
+  remindAt DateTime?
+  tags     String[]
 
   source Json?
 

apps/server/src/app.module.ts

@@ -27,7 +27,7 @@ import { ReplicationModule } from 'modules/replication/replication.module';
 import { SuggestionModule } from 'modules/suggestion/suggestion.module';
 import { SummaryModule } from 'modules/summary/summary.module';
 import { SyncActionsModule } from 'modules/sync-actions/sync-actions.module';
-import { TaskOccurenceModule } from 'modules/task-occurence/task-occurence.model';
+import { TaskOccurenceModule } from 'modules/task-occurrence/task-occurrence.model';
 import { TasksModule } from 'modules/tasks/tasks.module';
 import { TasksHookModule } from 'modules/tasks-hook/tasks-hooks.module';
 import { TriggerdevModule } from 'modules/triggerdev/triggerdev.module';

apps/server/src/modules/pages/pages.service.ts

@@ -158,14 +158,33 @@ export class PagesService {
       );
     }
 
-    return this.prisma.page.create({
-      data: {
-        ...pageData,
-        description: finalDescription,
-        workspace: { connect: { id: workspaceId } },
-        ...(parentId && { parent: { connect: { id: parentId } } }),
-      },
+    const page = await this.prisma.$transaction(async (tx) => {
+      // Try to find existing page
+      let page = await tx.page.findFirst({
+        where: {
+          title: pageData.title,
+          type: pageData.type,
+          workspaceId,
+          deleted: null,
+        },
+        select: PageSelect,
+      });
+
+      if (!page) {
+        page = await this.prisma.page.create({
+          data: {
+            ...pageData,
+            description: finalDescription,
+            workspace: { connect: { id: workspaceId } },
+            ...(parentId && { parent: { connect: { id: parentId } } }),
+          },
+        });
+      }
+
+      return page;
     });
+
+    return page;
   }
 
   async updatePage(

apps/server/src/modules/sync-actions/sync-actions.service.ts

@@ -62,7 +62,7 @@ export default class SyncActionsService {
       orderBy: {
         sequenceId: 'asc',
       },
-      distinct: ['modelName', 'workspaceId', 'modelId', 'action'],
+      distinct: ['modelId'],
     });
 
     const deleteModelIds = new Set(
@@ -98,7 +98,7 @@ export default class SyncActionsService {
       orderBy: {
         sequenceId: 'asc',
       },
-      distinct: ['modelId', 'modelName', 'workspaceId', 'action'],
+      distinct: ['modelId'],
     });
 
     return {

apps/server/src/modules/sync-actions/sync-actions.utils.ts

@@ -41,6 +41,12 @@ export async function getWorkspaceId(
       });
       return task.workspaceId;
 
+    case ModelName.TaskOccurrence:
+      const taskOccurrence = await prisma.taskOccurrence.findUnique({
+        where: { id: modelId },
+      });
+      return taskOccurrence.workspaceId;
+
     case ModelName.Template:
       const template = await prisma.template.findUnique({
         where: { id: modelId },
@@ -89,6 +95,7 @@ export async function getModelData(
     Template: prisma.template,
     Page: prisma.page,
     Task: prisma.task,
+    TaskOccurrence: prisma.taskOccurrence,
     Conversation: prisma.conversation,
     ConversationHistory: prisma.conversationHistory,
     List: prisma.list,

apps/server/src/modules/task-occurence/task-occurence.controller.ts → apps/server/src/modules/task-occurrence/task-occurrence.controller.ts

@@ -18,7 +18,7 @@ import {
 import { AuthGuard } from 'modules/auth/auth.guard';
 import { Workspace } from 'modules/auth/session.decorator';
 
-import { TaskOccurenceService } from './task-occurence.service';
+import { TaskOccurenceService } from './task-occurrence.service';
 
 @Controller({
   version: '1',

apps/server/src/modules/task-occurence/task-occurence.model.ts → apps/server/src/modules/task-occurrence/task-occurrence.model.ts

@@ -4,8 +4,8 @@ import { PrismaModule, PrismaService } from 'nestjs-prisma';
 import { PagesModule } from 'modules/pages/pages.module';
 import { UsersService } from 'modules/users/users.service';
 
-import { TaskOccurenceController } from './task-occurence.controller';
-import { TaskOccurenceService } from './task-occurence.service';
+import { TaskOccurenceController } from './task-occurrence.controller';
+import { TaskOccurenceService } from './task-occurrence.service';
 
 @Module({
   imports: [PrismaModule, PagesModule],

apps/server/src/modules/tasks-hook/tasks-hook.service.ts

@@ -7,7 +7,7 @@ import { generateSummaryTask } from 'triggers/task/generate-summary';
 
 import { IntegrationsService } from 'modules/integrations/integrations.service';
 import { PagesService } from 'modules/pages/pages.service';
-import { TaskOccurenceService } from 'modules/task-occurence/task-occurence.service';
+import { TaskOccurenceService } from 'modules/task-occurrence/task-occurrence.service';
 import { UsersService } from 'modules/users/users.service';
 
 import {

apps/server/src/modules/tasks-hook/tasks-hooks.module.ts

@@ -3,7 +3,7 @@ import { PrismaModule, PrismaService } from 'nestjs-prisma';
 
 import { IntegrationsService } from 'modules/integrations/integrations.service';
 import { PagesModule } from 'modules/pages/pages.module';
-import { TaskOccurenceService } from 'modules/task-occurence/task-occurence.service';
+import { TaskOccurenceService } from 'modules/task-occurrence/task-occurrence.service';
 import { UsersService } from 'modules/users/users.service';
 
 import { TaskHooksService } from './tasks-hook.service';

apps/server/src/modules/tasks/tasks.module.ts

@@ -6,7 +6,7 @@ import { ContentModule } from 'modules/content/content.module';
 import { ConversationModule } from 'modules/conversation/conversation.module';
 import { IntegrationsService } from 'modules/integrations/integrations.service';
 import { PagesService } from 'modules/pages/pages.service';
-import { TaskOccurenceService } from 'modules/task-occurence/task-occurence.service';
+import { TaskOccurenceService } from 'modules/task-occurrence/task-occurrence.service';
 import { UsersService } from 'modules/users/users.service';
 
 import { TasksAIController } from './tasks-ai.controller';

apps/server/src/modules/tasks/tasks.service.ts

@@ -13,7 +13,7 @@ import { PrismaService } from 'nestjs-prisma';
 
 import { IntegrationsService } from 'modules/integrations/integrations.service';
 import { PagesService } from 'modules/pages/pages.service';
-import { TaskOccurenceService } from 'modules/task-occurence/task-occurence.service';
+import { TaskOccurenceService } from 'modules/task-occurrence/task-occurrence.service';
 
 import {
   getCurrentTaskIds,

apps/webapp/common/editor/task-extension/task-component.tsx

@@ -10,12 +10,15 @@ import { getCreateTaskPropsOnSource } from 'modules/tasks/add-task/utils';
 
 import type { TaskType } from 'common/types';
 
+import { useApplication } from 'hooks/application';
+
 import { useCreateTaskMutation } from 'services/tasks';
 
 import { useContextStore } from 'store/global-context-provider';
 
 import { TaskMetadata } from './task-metadata';
 import { EditorContext } from '../editor-context';
+import { TaskInfo } from 'modules/tasks/task-info';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const TaskComponent = observer((props: any) => {
@@ -26,6 +29,7 @@ export const TaskComponent = observer((props: any) => {
 
   const { tasksStore } = useContextStore();
   const task = tasksStore.getTaskWithId(taskId);
+  const { selectedTasks, setHoverTask, hoverTask } = useApplication();
 
   const { mutate: addTaskMutation, isLoading } = useCreateTaskMutation({
     onSuccess: (data: TaskType) => {
@@ -40,7 +44,7 @@ export const TaskComponent = observer((props: any) => {
   }, 500);
 
   React.useEffect(() => {
-    if (!taskId && content && !content.includes('[') && !isLoading) {
+    if (!taskId && content && !isLoading) {
       debounceAddTask({
         title: content,
         ...getCreateTaskPropsOnSource(source, date),
@@ -56,6 +60,11 @@ export const TaskComponent = observer((props: any) => {
           'items-center inline-flex gap-2 pb-0.5 items-start px-2 hover:bg-grayAlpha-100 rounded w-fit',
           props.selected && 'bg-grayAlpha-300',
         )}
+        onMouseOver={() => {
+          if (selectedTasks.length === 0 && task.id !== hoverTask) {
+            setHoverTask(task.id);
+          }
+        }}
       >
         <div
           className={cn('flex items-start shrink-0 gap-2 py-1')}
@@ -70,6 +79,7 @@ export const TaskComponent = observer((props: any) => {
             className={cn('flex items-start shrink-0 gap-2 py-1')}
             contentEditable={false}
           >
+            <TaskInfo task={task} />
             <TaskMetadata taskId={task.id} />
           </div>
         )}

apps/webapp/common/types/index.ts

@@ -9,3 +9,4 @@ export * from './activity';
 export * from './task';
 export * from './conversation';
 export * from './list';
+export * from './task-occurrence';

apps/webapp/common/types/task-occurrence.ts

@@ -0,0 +1,11 @@
+export interface TaskOccurrenceType {
+  id: string;
+  createdAt: string;
+  updatedAt: string;
+  startTime?: string;
+  endTime?: string;
+  status?: string;
+  workspaceId: string;
+  pageId: string;
+  taskId: string;
+}

apps/webapp/common/wrappers/bootstrap-data.tsx

@@ -29,22 +29,22 @@ export function BootstrapWrapper({ children }: Props) {
     workspaceStore,
     integrationAccountsStore,
     pagesStore,
-    activityStore,
     tasksStore,
     conversationsStore,
     conversationHistoryStore,
     listsStore,
+    taskOccurrencesStore,
   } = useContextStore();
 
   const MODEL_STORE_MAP = {
     [MODELS.Workspace]: workspaceStore,
     [MODELS.IntegrationAccount]: integrationAccountsStore,
-    [MODELS.Activity]: activityStore,
     [MODELS.Task]: tasksStore,
     [MODELS.Page]: pagesStore,
     [MODELS.Conversation]: conversationsStore,
     [MODELS.ConversationHistory]: conversationHistoryStore,
     [MODELS.List]: listsStore,
+    [MODELS.TaskOccurrence]: taskOccurrencesStore,
   };
 
   React.useEffect(() => {

apps/webapp/common/wrappers/socket-data-sync.tsx

@@ -28,7 +28,7 @@ export const SocketDataSyncWrapper: React.FC<Props> = observer(
       integrationAccountsStore,
       pagesStore,
       tasksStore,
-      activityStore,
+      taskOccurrencesStore,
       conversationsStore,
       conversationHistoryStore,
       listsStore,
@@ -53,7 +53,7 @@ export const SocketDataSyncWrapper: React.FC<Props> = observer(
     async function initSocket() {
       const socket = io(publicRuntimeConfig.NEXT_PUBLIC_BACKEND_HOST, {
         query: {
-          workspaceId: workspaceStore.workspace.id,
+          workspaceId: user.workspace.id,
           userId: user.id,
         },
         withCredentials: true,
@@ -67,7 +67,7 @@ export const SocketDataSyncWrapper: React.FC<Props> = observer(
 
         [MODELS.Page]: pagesStore,
         [MODELS.Task]: tasksStore,
-        [MODELS.Activity]: activityStore,
+        [MODELS.TaskOccurrence]: taskOccurrencesStore,
         [MODELS.Conversation]: conversationsStore,
         [MODELS.ConversationHistory]: conversationHistoryStore,
         [MODELS.List]: listsStore,

apps/webapp/common/wrappers/socket-data-util.ts

@@ -2,13 +2,13 @@ import { runInAction } from 'mobx';
 
 import type { SyncActionRecord } from 'common/types';
 
-import { saveActivityData } from 'store/activity';
 import { saveConversationHistorytData } from 'store/conversation-history';
 import { saveConversationData } from 'store/conversations';
 import { saveIntegrationAccountData } from 'store/integration-accounts';
 import { saveListData } from 'store/lists';
 import { MODELS } from 'store/models';
 import { savePageData } from 'store/pages';
+import { saveTaskOccurrencesData } from 'store/task-occurrences';
 import { saveTaskData } from 'store/tasks';
 import { saveWorkspaceData } from 'store/workspace';
 
@@ -46,7 +46,7 @@ export async function saveSocketData(
       [MODELS.ConversationHistory]: saveConversationHistorytData,
       [MODELS.Page]: savePageData,
       [MODELS.Task]: saveTaskData,
-      [MODELS.Activity]: saveActivityData,
+      [MODELS.TaskOccurrence]: saveTaskOccurrencesData,
       [MODELS.List]: saveListData,
     };
 

apps/webapp/common/wrappers/workspace-store-provider.tsx

@@ -18,6 +18,7 @@ export const WorkspaceStoreInit = observer(
       conversationsStore,
       conversationHistoryStore,
       listsStore,
+      taskOccurrencesStore,
     } = useContextStore();
 
     const currentWorkspace = useWorkspace();
@@ -49,6 +50,7 @@ export const WorkspaceStoreInit = observer(
         conversationsStore.load(),
         conversationHistoryStore.load(),
         listsStore.load(),
+        taskOccurrencesStore.load(),
       ]);
 
       // eslint-disable-next-line react-hooks/exhaustive-deps

apps/webapp/modules/dialog-views-provider/dialog-views-provider.tsx

@@ -2,7 +2,7 @@ import { observer } from 'mobx-react-lite';
 import React from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 
-import { ScheduleDialog } from 'modules/tasks/schedule';
+import { ScheduleDialog } from 'modules/tasks/metadata';
 
 import { SCOPES } from 'common/shortcut-scopes';
 
@@ -72,7 +72,7 @@ export const DialogViewsProvider = observer(
     };
 
     useHotkeys(
-      ['s', 'd'],
+      ['s', 'p'],
       (event) => {
         switch (event.key) {
           case 's':

apps/webapp/modules/lists/list-tasks.tsx

@@ -1,8 +1,8 @@
 import { observer } from 'mobx-react-lite';
 import React from 'react';
 
-import { PlanList } from 'modules/tasks/category/plan';
-import { StatusList } from 'modules/tasks/category/status';
+import { PlanList } from 'modules/tasks/group-view/plan';
+import { StatusList } from 'modules/tasks/group-view/status';
 import { Filters } from 'modules/tasks/filters';
 import { Header } from 'modules/tasks/header';