@pipedream/google_calendar 0.5.2 → 0.5.4

package/actions/update-event/update-event.mjs

@@ -1,11 +1,12 @@
 import googleCalendar from "../../google_calendar.app.mjs";
 import createEventCommon from "../common/create-event-common.mjs";
+import constants from "../../common/constants.mjs";
 
 export default {
   key: "google_calendar-update-event",
   name: "Update Event",
   description: "Update an event from Google Calendar. [See the documentation](https://googleapis.dev/nodejs/googleapis/latest/calendar/classes/Resource$Events.html#update)",
-  version: "0.0.7",
+  version: "0.0.8",
   type: "action",
   props: {
     googleCalendar,
@@ -27,6 +28,28 @@ export default {
     ...createEventCommon.props({
       isUpdate: true,
     }),
+    timeZone: {
+      propDefinition: [
+        googleCalendar,
+        "timeZone",
+      ],
+    },
+    sendUpdates: {
+      propDefinition: [
+        googleCalendar,
+        "sendUpdates",
+      ],
+    },
+  },
+  async additionalProps(props) {
+    if (this.repeatFrequency) {
+      const frequency = constants.REPEAT_FREQUENCIES[this.repeatFrequency];
+      props.repeatInterval.description = `Enter 1 to "repeat every ${frequency}", enter 2 to "repeat every other ${frequency}", etc. Defaults to 1.`;
+    }
+    props.repeatInterval.hidden = !this.repeatFrequency;
+    props.repeatUntil.hidden = !this.repeatFrequency;
+    props.repeatTimes.hidden = !this.repeatFrequency;
+    return {};
   },
   methods: {
     ...createEventCommon.methods,
@@ -39,25 +62,30 @@ export default {
 
     const timeZone = await this.getTimeZone(this.timeZone || currentEvent.start.timeZone);
     const attendees = this.formatAttendees(this.attendees, currentEvent.attendees);
+    const recurrence = this.formatRecurrence({
+      repeatFrequency: this.repeatFrequency,
+      repeatInterval: this.repeatInterval,
+      repeatTimes: this.repeatTimes,
+      repeatUntil: this.repeatUntil,
+    });
 
     const response = await this.googleCalendar.updateEvent({
       calendarId: this.calendarId,
       eventId: this.eventId,
       sendUpdates: this.sendUpdates,
-      sendNotifications: this.sendNotifications,
       requestBody: {
         summary: this.summary || currentEvent.summary,
         location: this.location || currentEvent.location,
         description: this.description || currentEvent.description,
         start: this.getDateParam({
-          date: this.eventStartDate || currentEvent.start.dateTime,
+          date: this.eventStartDate || currentEvent.start.dateTime || currentEvent.start.date,
           timeZone: timeZone || currentEvent.start.timeZone,
         }),
         end: this.getDateParam({
-          date: this.eventEndDate || currentEvent.end.dateTime,
+          date: this.eventEndDate || currentEvent.end.dateTime || currentEvent.start.date,
           timeZone: timeZone || currentEvent.end.timeZone,
         }),
-        recurrence: this.recurrence,
+        recurrence,
         attendees,
       },
     });

package/common/constants.mjs

@@ -78,6 +78,14 @@ const API = {
   },
 };
 
+const REPEAT_FREQUENCIES = {
+  DAILY: "day",
+  WEEKLY: "week",
+  MONTHLY: "month",
+  YEARLY: "year",
+};
+
 export default {
   API,
+  REPEAT_FREQUENCIES,
 };

package/google_calendar.app.mjs

@@ -1,6 +1,7 @@
 import timezones from "moment-timezone";
 import calendar from "@googleapis/calendar";
 import constants from "./common/constants.mjs";
+import { closest } from "color-2-name";
 
 export default {
   type: "app",
@@ -36,27 +37,27 @@ export default {
       label: "Event ID",
       type: "string",
       description: "Select an event from Google Calendar.",
-      async options({
-        calendarId, prevContext,
-      }) {
-        const { nextPageToken } = prevContext;
-        if (nextPageToken === false) {
-          return [];
-        }
+      async options({ calendarId }) {
+        const monthAgo = new Date(new Date().setMonth(new Date().getMonth() - 1)).toISOString();
         const response = await this.listEvents({
           calendarId,
-          pageToken: nextPageToken,
+          maxResults: 100,
+          timeMin: monthAgo,
         });
-        const options = response.items.map((item) => ({
-          label: item.summary,
-          value: item.id,
-        }));
-        return {
-          options,
-          context: {
-            nextPageToken: response.nextPageToken ?? false,
-          },
-        };
+        const options = response.items.map((item) => {
+          let label = item.summary || item.id;
+          const date = item.start && (item.start.date
+            ? item.start.date
+            : item.start.dateTime.slice(0, 10));
+          if (date) {
+            label += ` - ${date}`;
+          }
+          return {
+            label,
+            value: item.id,
+          };
+        });
+        return options.reverse();
       },
     },
     iCalUID: {
@@ -66,20 +67,20 @@ export default {
       type: "string",
     },
     maxAttendees: {
-      label: "Max attendees",
+      label: "Max Attendees",
       description: "The maximum number of attendees to include in the response. If there are more than the specified number of attendees, only the participant is returned. Optional.",
       optional: true,
       type: "integer",
     },
     maxResults: {
-      label: "Max results",
+      label: "Max Results",
       description: "Maximum number of events returned on one result page. The number of events in the resulting page may be less than this value, or none at all, even if there are more events matching the query. Incomplete pages can be detected by a non-empty nextPageToken field in the response. By default the value is 250 events. The page size can never be larger than 2500 events. Optional.",
       optional: true,
       type: "integer",
     },
     orderBy: {
-      label: "Order by",
-      description: "The order of the events returned in the result. Optional. The default is an unspecified, stable order.",
+      label: "Order By",
+      description: "The order of the events returned in the result. Optional. The default is an unspecified, stable order. Must set Single Events to `true` to order by `startTime`.",
       optional: true,
       type: "string",
       options: [
@@ -94,12 +95,6 @@ export default {
       ],
       default: "startTime",
     },
-    pageToken: {
-      label: "Page token",
-      description: "Token specifying which result page to return. Optional.",
-      optional: true,
-      type: "string",
-    },
     privateExtendedProperty: {
       label: "Private extended property",
       description: "Extended properties constraint specified as propertyName=value. Matches only private properties. This parameter might be repeated multiple times to return events that match all given constraints.",
@@ -113,37 +108,37 @@ export default {
       type: "string",
     },
     sharedExtendedProperty: {
-      label: "Shared extended property",
+      label: "Shared Extended Property",
       description: "Extended properties constraint specified as propertyName=value. Matches only shared properties. This parameter might be repeated multiple times to return events that match all given constraints.",
       optional: true,
       type: "string",
     },
     showDeleted: {
-      label: "Show deleted",
+      label: "Show Deleted",
       description: "Whether to include deleted events (with status equals \"cancelled\") in the result. Cancelled instances of recurring events (but not the underlying recurring event) will still be included if showDeleted and singleEvents are both False. If showDeleted and singleEvents are both True, only single instances of deleted events (but not the underlying recurring events) are returned. Optional. The default is False.",
       optional: true,
       type: "boolean",
     },
     showHiddenInvitations: {
-      label: "Show hidden invitations",
+      label: "Show Hidden Invitations",
       description: "Whether to include hidden invitations in the result. Optional. The default is False.",
       optional: true,
       type: "boolean",
     },
     singleEvents: {
-      label: "Single events",
+      label: "Single Events",
       description: "Whether to expand recurring events into instances and only return single one-off events and instances of recurring events, but not the underlying recurring events themselves. Optional. The default is False.",
       optional: true,
       type: "boolean",
     },
     syncToken: {
-      label: "Sync token",
+      label: "Sync Token",
       description: "Token obtained from the nextSyncToken field returned on the last page of results from the previous list request. It makes the result of this list request contain only entries that have changed since then. All events deleted since the previous list request will always be in the result set and it is not allowed to set showDeleted to False.",
       optional: true,
       type: "string",
     },
     timeMax: {
-      label: "Max time",
+      label: "Max Time",
       description: "Upper bound (exclusive) for an event's time to filter by. Must be an RFC3339 timestamp with mandatory time zone offset, for example, 2011-06-03T10:00:00-07:00, 2011-06-03T10:00:00Z. Milliseconds may be provided but are ignored. Must be greater than Min Time.",
       optional: true,
       type: "string",
@@ -170,13 +165,13 @@ export default {
       },
     },
     updatedMin: {
-      label: "Minimum updated time",
+      label: "Minimum Updated Time",
       description: "Lower bound for an event's last modification time (as a RFC3339 timestamp) to filter by. When specified, entries deleted since this time will always be included regardless of showDeleted. Optional. The default is not to filter by last modification time.",
       optional: true,
       type: "string",
     },
     ruleId: {
-      label: "ACL rule identifier",
+      label: "ACL Rule Identifier",
       type: "string",
       description: "ACL rule identifier.",
       async options({
@@ -255,16 +250,10 @@ export default {
         "none",
       ],
     },
-    sendNotifications: {
-      label: "Send Notifications",
-      type: "boolean",
-      description: "Whether to send notifications about the event update",
-      optional: true,
-    },
     colorId: {
       label: "Color ID",
       type: "string",
-      description: "The color of the event. This is an ID referring to an entry in the event section of the colors definition (see the colors endpoint).",
+      description: "The color assigned to this event on your calendar. You can only select a color from the list of event colors provided from your calendar. This setting will only affect your calendar.",
       optional: true,
       async options() {
         const response = await this.listColors();
@@ -272,7 +261,7 @@ export default {
           key,
           value,
         ]) => ({
-          label: `Background ${value.background} | Foreground ${value.foreground}`,
+          label: `${closest(value.background).name} (${value.background})`,
           value: key,
         }));
       },
@@ -297,26 +286,6 @@ export default {
         refresh_token: this?.$auth?.oauth_refresh_token,
       };
     },
-    async calendarList() {
-      const calendar = this.client();
-      return calendar.calendarList.list();
-    },
-    async list(config) {
-      const calendar = this.client();
-      return calendar.events.list(config);
-    },
-    // for config key value pairs - https://developers.google.com/calendar/v3/reference/events/list
-    async getEvents(config) {
-      return this.list(config);
-    },
-    async watch(config) {
-      const calendar = this.client();
-      return calendar.events.watch(config);
-    },
-    async stop(config) {
-      const calendar = this.client();
-      return calendar.channels.stop(config);
-    },
     client() {
       const auth = new calendar.auth.OAuth2();
       auth.setCredentials({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_calendar",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Pipedream Google_calendar Components",
   "main": "google_calendar.app.mjs",
   "keywords": [
@@ -11,7 +11,8 @@
   "author": "Pipedream <support@pipedream.com> (https://pipedream.com/)",
   "dependencies": {
     "@googleapis/calendar": "^1.0.2",
-    "@pipedream/platform": "^1.6.0",
+    "@pipedream/platform": "^3.0.0",
+    "color-2-name": "^1.4.4",
     "lodash.get": "^4.4.2",
     "moment-timezone": "^0.5.33",
     "uuid": "^8.3.2"

package/sources/common/common.mjs

@@ -40,7 +40,7 @@ export default {
         start,
       } = event;
       return {
-        summary,
+        summary: summary || `Event ID: ${id}`,
         id,
         ts: +new Date(start.dateTime),
       };
@@ -48,9 +48,9 @@ export default {
     async processEvents(event) {
       const intervalData = this.getIntervalData(event);
       const config = this.getConfig(intervalData);
-      const resp = await this.googleCalendar.getEvents(config);
+      const resp = await this.googleCalendar.listEvents(config);
 
-      const events = resp?.data?.items;
+      const events = resp?.data?.items || resp?.items;
       if (!Array.isArray(events)) {
         console.log("nothing to emit");
         return;

package/sources/event-cancelled/event-cancelled.mjs

@@ -1,11 +1,12 @@
 import common from "../common/common.mjs";
+import sampleEmit from "./test-event.mjs";
 
 export default {
   ...common,
   key: "google_calendar-event-cancelled",
   name: "New Cancelled Event",
   description: "Emit new event when a Google Calendar event is cancelled or deleted",
-  version: "0.1.7",
+  version: "0.1.9",
   type: "source",
   dedupe: "unique",
   props: {
@@ -35,4 +36,5 @@ export default {
       return event.status === "cancelled";
     },
   },
+  sampleEmit,
 };

package/sources/event-cancelled/test-event.mjs

@@ -0,0 +1,31 @@
+export default {
+  "kind": "calendar#event",
+  "etag": "\"3442821871082000\"",
+  "id": "7aefibs2i2chltfk626kbtse91",
+  "status": "cancelled",
+  "htmlLink": "https://www.google.com/calendar/event?eid=N2FlZmliczJpMmNobHRmgcjA0bGJ0NDhhbmgyNmdvNmlzajRyZm1qbDBAZw",
+  "created": "2024-07-19T17:41:08.000Z",
+  "updated": "2024-07-19T17:42:15.541Z",
+  "summary": "test event",
+  "creator": {
+    "email": "test@sample.com"
+  },
+  "organizer": {
+    "email": "r04l6isj4rfmjl0@group.calendar.google.com",
+    "displayName": "Test",
+    "self": true
+  },
+  "start": {
+    "date": "2024-07-20"
+  },
+  "end": {
+    "date": "2024-07-21"
+  },
+  "transparency": "transparent",
+  "iCalUID": "7aefibs2i2c6kbtse91@google.com",
+  "sequence": 1,
+  "reminders": {
+    "useDefault": false
+  },
+  "eventType": "default"
+}

package/sources/event-ended/event-ended.mjs

@@ -1,11 +1,12 @@
 import common from "../common/common.mjs";
+import sampleEmit from "./test-event.mjs";
 
 export default {
   ...common,
   key: "google_calendar-event-ended",
   name: "New Ended Event",
   description: "Emit new event when a Google Calendar event ends",
-  version: "0.1.7",
+  version: "0.1.9",
   type: "source",
   dedupe: "unique",
   props: {
@@ -41,4 +42,5 @@ export default {
       return eventEnd && msFromEnd > 0 && msFromEnd < intervalMs;
     },
   },
+  sampleEmit,
 };

package/sources/event-ended/test-event.mjs

@@ -0,0 +1,31 @@
+export default {
+  "kind": "calendar#event",
+  "etag": "\"3442822827690000\"",
+  "id": "4pkio0bslskikpvqqo0pol763n",
+  "status": "confirmed",
+  "htmlLink": "https://www.google.com/calendar/event?eid=N3B2cXFvMHBvbDc2M24gcjA0bGJ0NDhhbmgyNmdvNmlzajRyZm1qbDBAZw",
+  "created": "2024-07-19T17:50:13.000Z",
+  "updated": "2024-07-19T17:50:13.845Z",
+  "creator": {
+    "email": "test@sample.com"
+  },
+  "organizer": {
+    "email": "r04lbt6isj4rfmjl0@group.calendar.google.com",
+    "displayName": "Test",
+    "self": true
+  },
+  "start": {
+    "dateTime": "2024-07-19T13:50:00-04:00",
+    "timeZone": "America/Detroit"
+  },
+  "end": {
+    "dateTime": "2024-07-19T13:55:00-04:00",
+    "timeZone": "America/Detroit"
+  },
+  "iCalUID": "4pkio0bqo0pol763n@google.com",
+  "sequence": 0,
+  "reminders": {
+    "useDefault": true
+  },
+  "eventType": "default"
+}

package/sources/new-calendar/new-calendar.mjs

@@ -1,11 +1,13 @@
 import common from "../common/common.mjs";
+import sampleEmit from "./test-event.mjs";
 
 export default {
   key: "google_calendar-new-calendar",
   name: "New Calendar Created",
   description: "Emit new event when a calendar is created.",
-  version: "0.1.7",
+  version: "0.1.9",
   type: "source",
+  dedupe: "unique",
   props: {
     ...common.props,
     db: "$.service.db",
@@ -58,4 +60,5 @@ export default {
     const calendarIds = calendars.map((item) => item.id);
     this.setCalendarIds(calendarIds);
   },
+  sampleEmit,
 };

package/sources/new-calendar/test-event.mjs

@@ -0,0 +1,18 @@
+export default {
+  "kind": "calendar#calendarListEntry",
+  "etag": "\"1721410772595000\"",
+  "id": "r04lbtisj4rfmjl0@group.calendar.google.com",
+  "summary": "Test",
+  "timeZone": "America/Detroit",
+  "colorId": "7",
+  "backgroundColor": "#42d692",
+  "foregroundColor": "#000000",
+  "selected": true,
+  "accessRole": "owner",
+  "defaultReminders": [],
+  "conferenceProperties": {
+    "allowedConferenceSolutionTypes": [
+      "hangoutsMeet"
+    ]
+  }
+}

package/sources/new-event-search/new-event-search.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_calendar-new-event-search",
   name: "New Event Matching a Search",
   description: "Emit new event when a Google Calendar event is created that matches a search",
-  version: "0.1.7",
+  version: "0.1.9",
   type: "source",
   dedupe: "unique",
   props: {
@@ -37,7 +37,7 @@ export default {
     },
     isRelevant(event, { past }) {
       const created = new Date(event.created);
-      // created in last 5 mins and not cancelled
+      // created since last run and not cancelled
       return created > past && event.status !== "cancelled";
     },
   },

package/sources/new-or-updated-event-instant/new-or-updated-event-instant.mjs

@@ -8,7 +8,7 @@ export default {
   type: "source",
   name: "New Created or Updated Event (Instant)",
   description: "Emit new event when a Google Calendar events is created or updated (does not emit cancelled events)",
-  version: "0.1.11",
+  version: "0.1.12",
   dedupe: "unique",
   props: {
     googleCalendar,

package/sources/upcoming-event-alert/test-event.mjs

@@ -0,0 +1,32 @@
+export default {
+  "kind": "calendar#event",
+  "etag": "\"3442838491454000\"",
+  "id": "0dip62r3f3d85o35jjnjcmqbmo",
+  "status": "confirmed",
+  "htmlLink": "https://www.google.com/calendar/event?eid=MGRpcDYycjNW8zNWgbWljaGVsbGUucGlwZWRyZWFtQG0",
+  "created": "2024-07-19T20:00:45.000Z",
+  "updated": "2024-07-19T20:00:45.727Z",
+  "summary": "test",
+  "creator": {
+    "email": "test@sample.com",
+    "self": true
+  },
+  "organizer": {
+    "email": "test@sample.com",
+    "self": true
+  },
+  "start": {
+    "dateTime": "2024-07-19T16:07:00-04:00",
+    "timeZone": "America/Detroit"
+  },
+  "end": {
+    "dateTime": "2024-07-19T17:07:00-04:00",
+    "timeZone": "America/Detroit"
+  },
+  "iCalUID": "0dip62r35jjnjcmqbmo@google.com",
+  "sequence": 0,
+  "reminders": {
+    "useDefault": true
+  },
+  "eventType": "default"
+}

package/sources/upcoming-event-alert/upcoming-event-alert.mjs

@@ -1,5 +1,6 @@
 import taskScheduler from "../../../pipedream/sources/new-scheduled-tasks/new-scheduled-tasks.mjs";
 import googleCalendar from "../../google_calendar.app.mjs";
+import sampleEmit from "./test-event.mjs";
 
 export default {
   key: "google_calendar-upcoming-event-alert",
@@ -7,7 +8,7 @@ export default {
   description: `Emit new event based on a time interval before an upcoming event in the calendar. This source uses Pipedream's Task Scheduler.
     [See the documentation](https://pipedream.com/docs/examples/waiting-to-execute-next-step-of-workflow/#step-1-create-a-task-scheduler-event-source) 
     for more information and instructions for connecting your Pipedream account.`,
-  version: "0.0.6",
+  version: "0.0.7",
   type: "source",
   props: {
     pipedream: taskScheduler.props.pipedream,
@@ -20,15 +21,11 @@ export default {
         "calendarId",
       ],
     },
-    eventId: {
+    eventTypes: {
       propDefinition: [
         googleCalendar,
-        "eventId",
-        (c) => ({
-          calendarId: c.calendarId,
-        }),
+        "eventTypes",
       ],
-      optional: true,
     },
     time: {
       type: "integer",
@@ -95,26 +92,19 @@ export default {
       const calendarEvents = [];
       const params = {
         calendarId: this.calendarId,
+        eventTypes: this.eventTypes,
       };
-      if (this.eventId) {
-        const item = await this.googleCalendar.getEvent({
-          ...params,
-          eventId: this.eventId,
-        });
-        calendarEvents.push(item);
-      } else {
-        do {
-          const {
-            data: {
-              items, nextPageToken,
-            },
-          } = await this.googleCalendar.getEvents(params);
-          if (items?.length) {
-            calendarEvents.push(...items);
-          }
-          params.pageToken = nextPageToken;
-        } while (params.pageToken);
-      }
+      do {
+        const {
+          data: {
+            items, nextPageToken,
+          },
+        } = await this.googleCalendar.listEvents(params);
+        if (items?.length) {
+          calendarEvents.push(...items);
+        }
+        params.pageToken = nextPageToken;
+      } while (params.pageToken);
       return calendarEvents;
     },
   },
@@ -157,4 +147,5 @@ export default {
     this._setScheduledEventIds(scheduledEventIds);
     this._setScheduledCalendarEventIds(scheduledCalendarEventIds);
   },
+  sampleEmit,
 };