Merge pull request #141 from cloud-atlas-ai:muness/issue140

Improve handling of transparent events
cloud-atlas-ai · Dec 25, 2024 · bdfbc1d · bdfbc1d
2 parents ab528c3 + ac559f9
commit bdfbc1d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/main.ts b/src/main.ts
@@ -181,7 +181,12 @@ export default class ICSPlugin extends Plugin {
   }
 
   excludeTransparentEvents(event: any, calendarSetting: Calendar): boolean {
-    // 1. Exclude transparent events
+    // Check if transparent events should be shown for this calendar
+    if (calendarSetting.format.showTransparentEvents) {
+      return true;
+    }
+
+    // Exclude transparent events if not enabled for this calendar
     if (
       event.transparency &&
       event.transparency.toUpperCase() === "TRANSPARENT"
@@ -191,7 +196,6 @@ export default class ICSPlugin extends Plugin {
     }
 
     return true;
-
   }
 
   excludeDeclinedEvents(event: any, calendarSetting: Calendar): boolean {

diff --git a/src/settings/ICSSettings.ts b/src/settings/ICSSettings.ts
@@ -16,7 +16,7 @@ export interface Calendar {
      */
     ownerEmail?: string;
 
-    calendarType: 'remote' | 'vdir'; // Add this line
+    calendarType: 'remote' | 'vdir';
     format: {
         checkbox: boolean;
         includeEventEndTime: boolean;
@@ -26,6 +26,7 @@ export interface Calendar {
         description: boolean;
         showAttendees: boolean;
         showOngoing: boolean;
+        showTransparentEvents: boolean;
     }
 }
 
@@ -36,9 +37,10 @@ export const DEFAULT_CALENDAR_FORMAT = {
     summary: true,
     location: true,
     description: false,
-    calendarType: 'remote', // Set the default type to 'remote'
+    calendarType: 'remote',
     showAttendees: false,
-    showOngoing: false
+    showOngoing: false,
+    showTransparentEvents: false
 };
 
 export const DEFAULT_SETTINGS: ICSSettings = {

diff --git a/src/settings/ICSSettingsTab.ts b/src/settings/ICSSettingsTab.ts
@@ -221,6 +221,7 @@ class SettingsModal extends Modal {
     description: boolean,
     showAttendees: boolean,
     showOngoing: boolean,
+    showTransparentEvents: boolean,
   } = DEFAULT_CALENDAR_FORMAT;
   calendarType: string;
   constructor(app: App, plugin: ICSPlugin, setting?: Calendar) {
@@ -412,6 +413,16 @@ class SettingsModal extends Modal {
           this.hasChanges = true;
         }));
 
+    const showTransparentEventsToggle = new Setting(settingDiv)
+      .setName('Show Transparent Events')
+      .setDesc('Display events marked as transparent (free/available) in the calendar')
+      .addToggle(toggle => toggle
+        .setValue(this.format.showTransparentEvents)
+        .onChange(value => {
+          this.format.showTransparentEvents = value;
+          this.hasChanges = true;
+        }));
+
     let footerEl = contentEl.createDiv();
     let footerButtons = new Setting(footerEl);
     footerButtons.addButton((b) => {