🚚 Refactor: Move draft utility functions to common utils

Author: tyler-dane

packages/web/src/common/utils/draft/draft.util.ts

@@ -0,0 +1,76 @@
+import { MouseEvent } from "react";
+import dayjs, { Dayjs } from "dayjs";
+import {
+  ID_GRID_EVENTS_ALLDAY,
+  ID_GRID_EVENTS_TIMED,
+} from "@web/common/constants/web.constants";
+import { roundToNext } from "@web/common/utils";
+import { getElemById, getX } from "@web/common/utils/grid.util";
+import {
+  DRAFT_DURATION_MIN,
+  GRID_TIME_STEP,
+} from "@web/views/Calendar/layout.constants";
+import { Categories_Event } from "@core/types/event.types";
+import { assembleDefaultEvent } from "@web/common/utils/event.util";
+import { DateCalcs } from "@web/views/Calendar/hooks/grid/useDateCalcs";
+import { Schema_GridEvent } from "@web/common/types/web.event.types";
+
+export const assembleAlldayDraft = async (
+  e: MouseEvent,
+  dateCalcs: DateCalcs,
+  isSidebarOpen: boolean,
+  startOfView: Dayjs
+): Promise<Schema_GridEvent> => {
+  const x = getX(e, isSidebarOpen);
+  const _start = dateCalcs.getDateByXY(x, e.clientY, startOfView);
+  const startDate = _start.format();
+  const endDate = _start.add(1, "day").format();
+
+  const event = (await assembleDefaultEvent(
+    Categories_Event.ALLDAY,
+    startDate,
+    endDate
+  )) as Schema_GridEvent;
+  return event;
+};
+
+export const assembleTimedDraft = async (
+  e: MouseEvent,
+  dateCalcs: DateCalcs,
+  isSidebarOpen: boolean,
+  startOfView: Dayjs
+): Promise<Schema_GridEvent> => {
+  const x = getX(e, isSidebarOpen);
+  const _start = dateCalcs.getDateByXY(x, e.clientY, startOfView);
+  const startDate = _start.format();
+  const endDate = _start.add(DRAFT_DURATION_MIN, "minutes").format();
+
+  const event = (await assembleDefaultEvent(
+    Categories_Event.TIMED,
+    startDate,
+    endDate
+  )) as Schema_GridEvent;
+  return event;
+};
+
+export const getDraftTimes = (isCurrentWeek: boolean, startOfWeek: Dayjs) => {
+  const currentMinute = dayjs().minute();
+  const nextMinuteInterval = roundToNext(currentMinute, GRID_TIME_STEP);
+
+  const fullStart = isCurrentWeek ? dayjs() : startOfWeek.hour(dayjs().hour());
+  const _start = fullStart.minute(nextMinuteInterval).second(0);
+
+  const _end = _start.add(1, "hour");
+  const startDate = _start.format();
+  const endDate = _end.format();
+
+  return { startDate, endDate };
+};
+
+export const getDraftContainer = (isAllDay: boolean) => {
+  if (isAllDay) {
+    return getElemById(ID_GRID_EVENTS_ALLDAY);
+  }
+
+  return getElemById(ID_GRID_EVENTS_TIMED);
+};

packages/web/src/views/Calendar/components/Event/Draft/Draft.tsx

@@ -2,6 +2,7 @@ import React, { FC, useEffect, useState } from "react";
 import { createPortal } from "react-dom";
 import { Categories_Event } from "@core/types/event.types";
 import { useAppSelector } from "@web/store/store.hooks";
+import { getDraftContainer } from "@web/common/utils/draft/draft.util";
 import { useGridDraft } from "@web/views/Calendar/hooks/draft/grid/useGridDraft";
 import { WeekProps } from "@web/views/Calendar/hooks/useWeek";
 import { Measurements_Grid } from "@web/views/Calendar/hooks/grid/useGridLayout";
@@ -10,7 +11,6 @@ import { getCategory } from "@web/common/utils/event.util";
 import { useEventForm } from "@web/views/Forms/hooks/useEventForm";
 import { selectIsDrafting } from "@web/ducks/events/selectors/draft.selectors";
 
-import { getDraftContainer } from "./draft.util";
 import { GridDraft } from "./GridDraft";
 
 interface Props {

packages/web/src/views/Calendar/components/Event/Draft/draft.util.ts

@@ -5,6 +5,7 @@ import { Key } from "ts-keycode-enum";
 import { Dayjs } from "dayjs";
 import { Categories_Event } from "@core/types/event.types";
 import {
+  Priorities,
   SOMEDAY_MONTH_LIMIT_MSG,
   SOMEDAY_WEEK_LIMIT_MSG,
 } from "@core/constants/core.constants";
@@ -13,18 +14,19 @@ import { isEventFormOpen } from "@web/common/utils";
 import { draftSlice } from "@web/ducks/events/slices/draft.slice";
 import { viewSlice } from "@web/ducks/events/slices/view.slice";
 import { ROOT_ROUTES } from "@web/common/constants/routes";
+import { Schema_GridEvent } from "@web/common/types/web.event.types";
 import {
   selectIsAtMonthlyLimit,
   selectIsAtWeeklyLimit,
 } from "@web/ducks/events/selectors/someday.selectors";
 import { assembleDefaultEvent } from "@web/common/utils/event.util";
+import { getDraftTimes } from "@web/common/utils/draft/draft.util";
 import { YEAR_MONTH_FORMAT } from "@core/constants/date.constants";
 import { selectSidebarTab } from "@web/ducks/events/selectors/view.selectors";
 
 import { DateCalcs } from "../grid/useDateCalcs";
 import { Util_Scroll } from "../grid/useScroll";
 import { WeekProps } from "../useWeek";
-import { getDraftTimes } from "../../components/Event/Draft/draft.util";
 
 export interface ShortcutProps {
   today: Dayjs;
@@ -97,14 +99,22 @@ export const useShortcuts = ({
     const _createTimedDraft = () => {
       const { startDate, endDate } = getDraftTimes(isCurrentWeek, startOfView);
 
+      const event: Schema_GridEvent = {
+        startDate,
+        endDate,
+        priority: Priorities.UNASSIGNED,
+        position: {
+          isOverlapping: false,
+          widthMultiplier: 1,
+          horizontalOrder: 1,
+        },
+      };
+
       dispatch(
         draftSlice.actions.start({
           activity: "createShortcut",
           eventType: Categories_Event.TIMED,
-          event: {
-            startDate,
-            endDate,
-          },
+          event,
         })
       );
     };

packages/web/src/views/Calendar/hooks/shortcuts/useShortcuts.ts

@@ -15,14 +15,14 @@ import { useAppDispatch, useAppSelector } from "@web/store/store.hooks";
 import { ROOT_ROUTES } from "@web/common/constants/routes";
 import { draftSlice } from "@web/ducks/events/slices/draft.slice";
 import { isEventFormOpen } from "@web/common/utils";
+import { getDraftTimes } from "@web/common/utils/draft/draft.util";
 import {
   selectIsAtMonthlyLimit,
   selectIsAtWeeklyLimit,
 } from "@web/ducks/events/selectors/someday.selectors";
 import { settingsSlice } from "@web/ducks/settings/slices/settings.slice";
 import { selectIsCmdPaletteOpen } from "@web/ducks/settings/selectors/settings.selectors";
 
-import { getDraftTimes } from "../Calendar/components/Event/Draft/draft.util";
 import { ShortcutProps } from "../Calendar/hooks/shortcuts/useShortcuts";
 
 const CmdPalette = ({