More data source updates

Author: GTFalcao

components/notion/actions/retrieve-database-content/retrieve-database-content.mjs

@@ -2,9 +2,9 @@ import notion from "../../notion.app.mjs";
 
 export default {
   key: "notion-retrieve-database-content",
-  name: "Retrieve Database Content",
-  description: "Get all content of a database. [See the documentation](https://developers.notion.com/reference/post-database-query)",
-  version: "0.0.9",
+  name: "Retrieve Data Source Content",
+  description: "Get all content of a data source. [See the documentation](https://developers.notion.com/reference/query-a-data-source)",
+  version: "1.0.0",
   type: "action",
   props: {
     notion,
@@ -14,12 +14,21 @@ export default {
         "databaseId",
       ],
     },
+    dataSourceId: {
+      propDefinition: [
+        notion,
+        "dataSourceId",
+        ({ databaseId }) => ({
+          databaseId,
+        }),
+      ],
+    },
   },
   async run({ $ }) {
-    const { results } = await this.notion.queryDatabase(this.databaseId);
+    const { results } = await this.notion.queryDataSource(this.dataSourceId);
     $.export("$summary", `Successfully retrieved ${results.length} object${results.length === 1
       ? ""
-      : "s"} in database`);
+      : "s"} in data source`);
     return results;
   },
 };

components/notion/notion.app.mjs

@@ -79,7 +79,7 @@ export default {
         const parentType = response.parent.type;
         try {
           const { properties } = parentType === "data_source_id"
-            ? await this.retrieveDataSource(response.parent.data_source_id).properties
+            ? await this.retrieveDataSource(response.parent.data_source_id)
             : response;
 
           const propEntries = Object.entries(properties);

components/notion/sources/page-properties-updated-instant/page-properties-updated-instant.mjs

@@ -5,7 +5,7 @@ export default {
   ...common,
   key: "notion-page-properties-updated-instant",
   name: "Page Properties Updated (Instant)",
-  description: "Emit new event each time a page property is updated in a database. For use with Page Properties Updated event type. Webhook must be set up in Notion. [See the documentation](https://developers.notion.com/reference/webhooks#step-1-creating-a-webhook-subscription)",
+  description: "Emit new event each time a page property is updated in a data source. For use with Page Properties Updated event type. Webhook must be set up in Notion. [See the documentation](https://developers.notion.com/reference/webhooks#step-1-creating-a-webhook-subscription)",
   version: "0.0.2",
   type: "source",
   dedupe: "unique",
@@ -17,14 +17,23 @@ export default {
         "databaseId",
       ],
     },
+    dataSourceId: {
+      propDefinition: [
+        common.props.notion,
+        "dataSourceId",
+        ({ databaseId }) => ({
+          databaseId,
+        }),
+      ],
+    },
     properties: {
       type: "string[]",
       label: "Properties",
       description: "Only emit events when one or more of the selected properties have changed",
       optional: true,
       async options() {
         try {
-          const { properties } = await this.notion.retrieveDatabase(this.databaseId);
+          const { properties } = await this.notion.retrieveDataSource(this.dataSourceId);
           const propEntries = Object.entries(properties);
           return propEntries.map((prop) => ({
             label: prop[1].name,
@@ -55,8 +64,8 @@ export default {
         return;
       }
 
-      if (event.data.parent.id !== this.databaseId) {
-        console.log(`Skipping event for database: ${event.data.parent.id}`);
+      if (event.data.parent.id !== this.dataSourceId) {
+        console.log(`Skipping event for data source: ${event.data.parent.id}`);
         return;
       }
 

components/notion/sources/updated-page/updated-page.mjs

@@ -7,8 +7,8 @@ import sampleEmit from "./test-event.mjs";
 export default {
   ...base,
   key: "notion-updated-page",
-  name: "New or Updated Page in Database (By Property)",
-  description: "Emit new event when a page is created or updated in the selected database. [See the documentation](https://developers.notion.com/reference/page)",
+  name: "New or Updated Page in Data Source (By Property)",
+  description: "Emit new event when a page is created or updated in the selected data source. [See the documentation](https://developers.notion.com/reference/page)",
   version: "0.1.12",
   type: "source",
   dedupe: "unique",
@@ -20,6 +20,15 @@ export default {
         "databaseId",
       ],
     },
+    dataSourceId: {
+      propDefinition: [
+        notion,
+        "dataSourceId",
+        ({ databaseId }) => ({
+          databaseId,
+        }),
+      ],
+    },
     includeNewPages: {
       type: "boolean",
       label: "Include New Pages",
@@ -31,8 +40,8 @@ export default {
         notion,
         "propertyTypes",
         (c) => ({
-          parentId: c.databaseId,
-          parentType: "database",
+          parentId: c.dataSourceId,
+          parentType: "data_source",
         }),
       ],
       description: "Only emit events when one or more of the selected properties have changed",
@@ -51,7 +60,7 @@ export default {
       const propertyValues = {};
       const propertiesToCheck = await this._getPropertiesToCheck();
       const params = this.lastUpdatedSortParam();
-      const pagesStream = this.notion.getPages(this.databaseId, params);
+      const pagesStream = this.notion.getPages(this.dataSourceId, params);
       for await (const page of pagesStream) {
         for (const propertyName of propertiesToCheck) {
           const currentValue = this._maybeRemoveFileSubItems(page.properties[propertyName]);
@@ -91,7 +100,7 @@ export default {
       if (this.properties?.length) {
         return this.properties;
       }
-      const { properties } = await this.notion.retrieveDatabase(this.databaseId);
+      const { properties } = await this.notion.retrieveDataSource(this.dataSourceId);
       return Object.keys(properties);
     },
     _maybeRemoveFileSubItems(property) {
@@ -150,7 +159,7 @@ export default {
     };
     let newLastUpdatedTimestamp = lastCheckedTimestamp;
     const propertiesToCheck = await this._getPropertiesToCheck();
-    const pagesStream = this.notion.getPages(this.databaseId, params);
+    const pagesStream = this.notion.getPages(this.dataSourceId, params);
 
     for await (const page of pagesStream) {
       const changes = [];