Merge branch 'master' into pr-18782

Author: dannyroosevelt

components/microsoft_outlook_calendar/actions/create-calendar-event/create-calendar-event.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook_calendar.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook_calendar-create-calendar-event",
-  version: "0.0.7",
+  version: "0.0.8",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

components/microsoft_outlook_calendar/actions/delete-calendar-event/delete-calendar-event.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook_calendar.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook_calendar-delete-calendar-event",
-  version: "0.0.2",
+  version: "0.0.3",
   annotations: {
     destructiveHint: true,
     openWorldHint: true,

components/microsoft_outlook_calendar/actions/get-schedule/get-schedule.mjs

@@ -6,7 +6,7 @@ export default {
   key: "microsoft_outlook_calendar-get-schedule",
   name: "Get Free/Busy Schedule",
   description: "Get the free/busy availability information for a collection of users, distributions lists, or resources (rooms or equipment) for a specified time period. [See the documentation](https://learn.microsoft.com/en-us/graph/api/calendar-getschedule)",
-  version: "0.0.4",
+  version: "0.0.5",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

components/microsoft_outlook_calendar/actions/list-events/list-events.mjs

@@ -4,7 +4,7 @@ export default {
   key: "microsoft_outlook_calendar-list-events",
   name: "List Events",
   description: "Get a list of event objects in the user's mailbox. [See the documentation](https://learn.microsoft.com/en-us/graph/api/user-list-events)",
-  version: "0.0.3",
+  version: "0.0.4",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,
@@ -32,21 +32,60 @@ export default {
       description: "The maximum number of results to return",
       optional: true,
     },
+    includeRecurring: {
+      type: "boolean",
+      label: "Include Recurring",
+      description: "Whether to include recurring events",
+      optional: true,
+      reloadProps: true,
+    },
   },
-  async run({ $ }) {
-    const { value = [] } = await this.microsoftOutlook.listCalendarEvents({
-      $,
-      params: {
-        "$orderby": this.orderBy,
-        "$filter": this.filter,
-        "$top": this.maxResults,
+  additionalProps() {
+    if (!this.includeRecurring) {
+      return {};
+    }
+    return {
+      startDateTime: {
+        type: "string",
+        label: "Start Date Time",
+        description: "The start date and time of the time range, represented in ISO 8601 format. For example, `2019-11-08T19:00:00-08:00`",
+      },
+      endDateTime: {
+        type: "string",
+        label: "End Date Time",
+        description: "The end date and time of the time range, represented in ISO 8601 format. For example, `2019-11-08T20:00:00-08:00`",
       },
-    });
+    };
+  },
+  async run({ $ }) {
+    const params = {
+      "$orderby": this.orderBy,
+      "$filter": this.filter,
+      "$top": this.maxResults,
+    };
+
+    const { value = [] } = !this.includeRecurring
+      ? await this.microsoftOutlook.listCalendarEvents({
+        $,
+        params,
+      })
+      : await this.microsoftOutlook.listCalendarView({
+        $,
+        params: {
+          ...params,
+          startDateTime: this.startDateTime,
+          endDateTime: this.endDateTime,
+        },
+      });
+
+    const events = !this.includeRecurring
+      ? value.filter((event) => !event.recurrence)
+      : value;
 
-    $.export("$summary", `Successfully retrieved ${value.length} event${value.length === 1
+    $.export("$summary", `Successfully retrieved ${events.length} event${events.length === 1
       ? ""
       : "s"}`);
 
-    return value;
+    return events;
   },
 };

components/microsoft_outlook_calendar/actions/update-calendar-event/update-calendar-event.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook_calendar.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook_calendar-update-calendar-event",
-  version: "0.0.2",
+  version: "0.0.3",
   annotations: {
     destructiveHint: true,
     openWorldHint: true,

components/microsoft_outlook_calendar/microsoft_outlook_calendar.app.mjs

@@ -180,5 +180,12 @@ export default {
         ...args,
       });
     },
+    async listCalendarView(args = {}) {
+      return this._makeRequest({
+        method: "GET",
+        path: "/me/calendar/calendarView",
+        ...args,
+      });
+    },
   },
 };

components/microsoft_outlook_calendar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/microsoft_outlook_calendar",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Pipedream Microsoft Outlook Calendar Components",
   "main": "microsoft_outlook_calendar.app.mjs",
   "keywords": [
@@ -15,6 +15,8 @@
     "access": "public"
   },
   "dependencies": {
+    "@pipedream/microsoft_outlook": "^1.7.3",
+    "@pipedream/pipedream": "^0.4.2",
     "@pipedream/platform": "^3.0.3"
   }
 }

components/microsoft_outlook_calendar/sources/common.mjs

@@ -0,0 +1,10 @@
+import microsoftOutlook from "../../microsoft_outlook_calendar.app.mjs";
+import common from "@pipedream/microsoft_outlook/sources/common/common.mjs";
+
+export default {
+  ...common,
+  props: {
+    ...common.props,
+    microsoftOutlook,
+  },
+};

components/microsoft_outlook_calendar/sources/common/common.mjs

@@ -1,11 +1,11 @@
-import common from "../common.mjs";
+import common from "../common/common.mjs";
 
 export default {
   ...common,
   key: "microsoft_outlook_calendar-new-calendar-event",
   name: "New Calendar Event (Instant)",
   description: "Emit new event when a new Calendar event is created",
-  version: "0.0.7",
+  version: "0.0.8",
   type: "source",
   hooks: {
     ...common.hooks,