Skip to content

Commit 0b1ba86

Browse files
committed
🐛 Fix: get w and m shortcuts working by using correct grid assembly method
Rename assembleBaseEvent to _assembleBaseEvent and update event selector imports This makes sure the id value is either populated or undefined, which is needed as part of the new event trigger
1 parent c97c93e commit 0b1ba86

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export const assembleDefaultEvent = async (
147147
endDate?: string
148148
): Promise<Schema_Event | Schema_GridEvent> => {
149149
const userId = await getUserId();
150-
const baseEvent = assembleBaseEvent(userId, {
150+
const baseEvent = _assembleBaseEvent(userId, {
151151
priority: Priorities.UNASSIGNED,
152152
});
153153

@@ -359,3 +359,23 @@ export const replaceIdWithOptimisticId = (
359359

360360
return _event;
361361
};
362+
363+
const _assembleBaseEvent = (
364+
userId: string,
365+
event: Partial<Schema_Event>
366+
): Schema_Event => {
367+
const baseEvent = {
368+
_id: event._id,
369+
title: event.title || "",
370+
description: event.description || "",
371+
startDate: event.startDate || "",
372+
endDate: event.endDate || "",
373+
user: userId,
374+
isAllDay: event.isAllDay || false,
375+
isSomeday: event.isSomeday || false,
376+
origin: event.origin || Origin.COMPASS,
377+
priority: event.priority || Priorities.UNASSIGNED,
378+
};
379+
380+
return baseEvent;
381+
};

packages/web/src/ducks/events/selectors/event.selectors.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ import { Schema_Event } from "@core/types/event.types";
33
import { RootState } from "@web/store";
44
import { assignEventsToRow } from "@web/common/utils/grid.util";
55
import { Schema_GridEvent } from "@web/common/types/web.event.types";
6-
import {
7-
assembleBaseEvent,
8-
assembleGridEvent,
9-
} from "@web/common/utils/event.util";
6+
import { assembleGridEvent } from "@web/common/utils/event.util";
107

118
type Schema_GridEvent_NoPosition = Omit<Schema_GridEvent, "position">;
129

0 commit comments

Comments
 (0)