Fix creating and deleting calendars

This fixes the creation and deletion of calendars to include a color and the proper chosen name.

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   website:
-    image: ghcr.io/bewcloud/bewcloud:v2.5.0
+    image: ghcr.io/bewcloud/bewcloud:v2.5.1
     restart: always
     ports:
       - 127.0.0.1:8000:8000

islands/calendar/Calendars.tsx

@@ -37,6 +37,11 @@ export default function Calendars({ initialCalendars }: CalendarsProps) {
         method: 'POST',
         body: JSON.stringify(requestBody),
       });
+
+      if (!response.ok) {
+        throw new Error(`Failed to add calendar! ${response.statusText} ${await response.text()}`);
+      }
+
       const result = await response.json() as AddResponseBody;
 
       if (!result.success) {
@@ -65,6 +70,11 @@ export default function Calendars({ initialCalendars }: CalendarsProps) {
           method: 'POST',
           body: JSON.stringify(requestBody),
         });
+
+        if (!response.ok) {
+          throw new Error(`Failed to delete calendar! ${response.statusText} ${await response.text()}`);
+        }
+
         const result = await response.json() as DeleteResponseBody;
 
         if (!result.success) {

lib/models/calendar.ts

@@ -120,6 +120,7 @@ export class CalendarModel {
   static async create(
     userId: string,
     name: string,
+    color: string,
   ): Promise<void> {
     const calendarId = crypto.randomUUID();
     const calendarUrl = `${calendarConfig.calDavUrl}/${userId}/${calendarId}/`;
@@ -129,7 +130,8 @@ export class CalendarModel {
     await client.makeCalendar({
       url: calendarUrl,
       props: {
-        displayName: name,
+        displayname: name,
+        calendarColor: color,
       },
     });
   }
@@ -163,8 +165,10 @@ export class CalendarModel {
 
   static async delete(
     userId: string,
-    calendarUrl: string,
+    calendarId: string,
   ): Promise<void> {
+    const calendarUrl = `${calendarConfig.calDavUrl}/${userId}/${calendarId}/`;
+
     const client = await getClient(userId);
 
     await client.deleteObject({

lib/utils/calendar.ts

@@ -21,6 +21,7 @@ export const CALENDAR_COLOR_OPTIONS = [
   'bg-fuchsia-700',
   'bg-pink-800',
   'bg-rose-700',
+  'bg-gray-700',
 ] as const;
 
 const CALENDAR_COLOR_OPTIONS_HEX = [
@@ -44,9 +45,12 @@ const CALENDAR_COLOR_OPTIONS_HEX = [
   '#9D21B1',
   '#9C174D',
   '#BC133D',
+  '#384354',
 ] as const;
 
-export function getColorAsHex(calendarColor: string) {
+export function getColorAsHex(
+  calendarColor: (typeof CALENDAR_COLOR_OPTIONS)[number],
+): (typeof CALENDAR_COLOR_OPTIONS_HEX)[number] {
   const colorIndex = CALENDAR_COLOR_OPTIONS.findIndex((color) => color === calendarColor);
 
   return CALENDAR_COLOR_OPTIONS_HEX[colorIndex] || '#384354';

lib/utils/calendar_test.ts

@@ -3,6 +3,7 @@ import { assertMatch } from 'std/assert/assert_match.ts';
 
 import { Calendar, CalendarEvent } from '/lib/models/calendar.ts';
 import {
+  CALENDAR_COLOR_OPTIONS,
   convertRRuleToWords,
   generateVCalendar,
   generateVEvent,
@@ -29,7 +30,7 @@ Deno.test('that getColorAsHex works', () => {
   ];
 
   for (const test of tests) {
-    const output = getColorAsHex(test.input);
+    const output = getColorAsHex(test.input as typeof CALENDAR_COLOR_OPTIONS[number]);
     assertEquals(output, test.expected);
   }
 });

routes/api/calendar/add.tsx

@@ -2,6 +2,7 @@ import { Handlers } from 'fresh/server.ts';
 
 import { FreshContextState } from '/lib/types.ts';
 import { Calendar, CalendarModel } from '/lib/models/calendar.ts';
+import { getColorAsHex } from '/lib/utils/calendar.ts';
 
 interface Data {}
 
@@ -23,7 +24,7 @@ export const handler: Handlers<Data, FreshContextState> = {
     const requestBody = await request.clone().json() as RequestBody;
 
     if (requestBody.name) {
-      await CalendarModel.create(context.state.user.id, requestBody.name);
+      await CalendarModel.create(context.state.user.id, requestBody.name, getColorAsHex('bg-gray-700'));
     }
 
     const newCalendars = await CalendarModel.list(context.state.user.id);

routes/api/calendar/update.tsx

@@ -3,7 +3,7 @@ import { Handlers } from 'fresh/server.ts';
 import { FreshContextState } from '/lib/types.ts';
 import { Calendar, CalendarModel } from '/lib/models/calendar.ts';
 import { UserModel } from '/lib/models/user.ts';
-import { getColorAsHex } from '/lib/utils/calendar.ts';
+import { CALENDAR_COLOR_OPTIONS, getColorAsHex } from '/lib/utils/calendar.ts';
 
 interface Data {}
 
@@ -37,7 +37,7 @@ export const handler: Handlers<Data, FreshContextState> = {
       calendar.displayName = requestBody.name;
       calendar.calendarColor = requestBody.color?.startsWith('#')
         ? requestBody.color
-        : getColorAsHex(requestBody.color || 'bg-gray-700');
+        : getColorAsHex((requestBody.color || 'bg-gray-700') as typeof CALENDAR_COLOR_OPTIONS[number]);
 
       await CalendarModel.update(context.state.user.id, calendar.url, calendar.displayName, calendar.calendarColor);
 

routes/calendar.tsx

@@ -4,7 +4,7 @@ import { FreshContextState } from '/lib/types.ts';
 import { Calendar, CalendarEvent, CalendarEventModel, CalendarModel } from '/lib/models/calendar.ts';
 import CalendarWrapper from '/islands/calendar/CalendarWrapper.tsx';
 import { AppConfig } from '/lib/config.ts';
-import { getDateRangeForCalendarView } from '/lib/utils/calendar.ts';
+import { getColorAsHex, getDateRangeForCalendarView } from '/lib/utils/calendar.ts';
 
 interface Data {
   userCalendars: Calendar[];
@@ -42,7 +42,7 @@ export const handler: Handlers<Data, FreshContextState> = {
 
     // Create default calendar if none exists
     if (userCalendars.length === 0) {
-      await CalendarModel.create(userId, 'Calendar');
+      await CalendarModel.create(userId, 'Calendar', getColorAsHex('bg-red-700'));
 
       userCalendars = await CalendarModel.list(userId);
     }