Initial database > dataSource conversion

Author: GTFalcao

components/notion/actions/common/base-page-builder.mjs

@@ -1,6 +1,6 @@
 import { markdownToBlocks } from "@tryfabric/martian";
 import {
-  NOTION_DATABASE_META,
+  NOTION_DATA_SOURCE_META,
   NOTION_PAGE_META,
 } from "../../common/notion-meta-properties.mjs";
 import NOTION_META from "../../common/notion-meta-selection.mjs";
@@ -10,7 +10,7 @@ export default {
   methods: {
     /**
      * Creates additional props for page properties and the selected block children
-     * @param properties - The selected (database) properties from the page obtained from Notion
+     * @param properties - The selected (data source) properties from the page obtained from Notion
      * @param meta - The selected meta properties
      * @param blocks - The selected block children from the workflow UI
      * @returns additional props
@@ -102,14 +102,14 @@ export default {
       return notionProperties;
     },
     /**
-     * Builds page meta properties (parent, icon, cover, archived) from a parent database
+     * Builds page meta properties (parent, icon, cover, archived) from a parent data source
      * Uses the property label as its type to be able to select in notion-meta-properties.mjs
      * @param properties - list of Notion page properties inputted by the user
      * @returns the meta properties in Notion format inputted by the user
      */
-    _buildNotionDatabaseMeta(properties = []) {
+    _buildNotionDataSourceMeta(properties = []) {
       properties.forEach((property) => property.type = property.label);
-      return this._convertPropertiesToNotion(properties, NOTION_DATABASE_META);
+      return this._convertPropertiesToNotion(properties, NOTION_DATA_SOURCE_META);
     },
     /**
      * Builds page meta properties (parent, icon, cover, archived) from a parent page
@@ -122,21 +122,21 @@ export default {
       return this._convertPropertiesToNotion(properties, NOTION_PAGE_META);
     },
     /**
-     * Builds page properties from a parent database/page
+     * Builds page properties from a parent data source/page
      * @param properties - list of Notion page properties inputted by the user
      * @returns the properties in Notion format inputted by the user
      */
     _buildNotionPageProperties(properties = []) {
       return this._convertPropertiesToNotion(properties, NOTION_PAGE_PROPERTIES);
     },
     /**
-     * Builds the page meta inputted by the user in Notion format from a parent database
-     * @param parentDatabase - the parent database that contains the meta properties
+     * Builds the page meta inputted by the user in Notion format from a parent data source
+     * @param parentDataSource - the parent data source that contains the meta properties
      * @returns the meta properties in Notion format
      */
-    buildDatabaseMeta(parentDatabase) {
-      const filteredMeta = this._filterProps(parentDatabase);
-      return this._buildNotionDatabaseMeta(filteredMeta);
+    buildDataSourceMeta(parentDataSource) {
+      const filteredMeta = this._filterProps(parentDataSource);
+      return this._buildNotionDataSourceMeta(filteredMeta);
     },
     /**
      * Builds the page meta inputted by the user in Notion format from a parent page
@@ -210,13 +210,13 @@ export default {
         },
       };
     },
-    childDatabaseToLink(block) {
+    childDataSourceToLink(block) {
       return {
         object: "block",
         type: "link_to_page",
         link_to_page: {
-          type: "database_id",
-          database_id: block.id,
+          type: "data_source_id",
+          data_source_id: block.id,
         },
       };
     },
@@ -236,9 +236,9 @@ export default {
           if (child.type === "child_page") {
             // convert child pages to links
             children[i] = this.childPageToLink(child);
-          } else if (child.type === "child_database") {
-            // convert child databases to links
-            children[i] = this.childDatabaseToLink(child);
+          } else if (child.type === "child_data_source") {
+            // convert child data sources to links
+            children[i] = this.childDataSourceToLink(child);
           } else {
             if (this.notValid(child, c)) {
               children[i] = undefined;

components/notion/actions/create-database/create-database.mjs

@@ -6,8 +6,8 @@ export default {
   ...base,
   key: "notion-create-database",
   name: "Create Database",
-  description: "Create a database. [See the documentation](https://developers.notion.com/reference/create-a-database)",
-  version: "0.0.1",
+  description: "Create a database and its initial data source. [See the documentation](https://developers.notion.com/reference/database-create)",
+  version: "0.1.0",
   type: "action",
   props: {
     notion,
@@ -45,7 +45,9 @@ export default {
           },
         },
       ],
-      properties: utils.parseObject(this.properties),
+      initial_data_source: {
+        properties: utils.parseObject(this.properties),
+      },
     });
 
     $.export("$summary", `Successfully created database with ID ${response.id}`);

components/notion/actions/create-page-from-database/create-page-from-database.mjs

@@ -8,7 +8,7 @@ export default {
   key: "notion-create-page-from-database",
   name: "Create Page from Database",
   description: "Create a page from a database. [See the documentation](https://developers.notion.com/reference/post-page)",
-  version: "0.2.3",
+  version: "1.0.0",
   type: "action",
   props: {
     notion,
@@ -20,6 +20,15 @@ export default {
       label: "Parent Database ID",
       description: "Select a parent database or provide a database ID",
     },
+    dataSource: {
+      propDefinition: [
+        notion,
+        "dataSourceId",
+        ({ parent }) => ({
+          databaseId: parent,
+        }),
+      ],
+    },
     Name: {
       type: "string",
       label: "Name",
@@ -60,14 +69,14 @@ export default {
   methods: {
     ...base.methods,
     /**
-     * Builds a page from a parent database
-     * @param parentDatabase - the parent database
+     * Builds a page from a parent data source
+     * @param parentDataSource - the parent data source
      * @returns the constructed page in Notion format
      */
-    buildPage(parentDatabase) {
-      const meta = this.buildDatabaseMeta(parentDatabase);
+    buildPage(parentDataSource) {
+      const meta = this.buildDataSourceMeta(parentDataSource);
       this.properties = utils.parseObject(this.properties);
-      const properties = this.buildPageProperties(parentDatabase.properties);
+      const properties = this.buildPageProperties(parentDataSource.properties);
       const children = this.createBlocks(this.pageContent);
       return {
         ...meta,
@@ -78,7 +87,7 @@ export default {
   },
   async run({ $ }) {
     const MAX_BLOCKS = 100;
-    const parentPage = await this.notion.retrieveDatabase(this.parent);
+    const parentPage = await this.notion.retrieveDataSource(this.dataSource);
     const {
       children, ...page
     } = this.buildPage(parentPage);

components/notion/actions/query-database/query-database.mjs

@@ -3,9 +3,9 @@ import notion from "../../notion.app.mjs";
 
 export default {
   key: "notion-query-database",
-  name: "Query Database",
-  description: "Query a database with a specified filter. [See the documentation](https://developers.notion.com/reference/post-database-query)",
-  version: "0.1.0",
+  name: "Query Data Source",
+  description: "Query a data source with a specified filter. [See the documentation](https://developers.notion.com/reference/query-a-data-source)",
+  version: "1.0.0",
   type: "action",
   props: {
     notion,
@@ -15,14 +15,23 @@ export default {
         "databaseId",
       ],
     },
+    dataSourceId: {
+      propDefinition: [
+        notion,
+        "dataSourceId",
+        ({ databaseId }) => ({
+          databaseId,
+        }),
+      ],
+    },
     filter: {
       label: "Filter (query)",
-      description: "The filter to apply, as a JSON-stringified object. [See the documentation for available filters](https://developers.notion.com/reference/post-database-query-filter). Example: `{ \"property\": \"Name\", \"title\": { \"contains\": \"title to search for\" } }`",
+      description: "The filter to apply, as a JSON-stringified object. [See the documentation for available filters](https://developers.notion.com/reference/filter-data-source-entries). Example: `{ \"property\": \"Name\", \"title\": { \"contains\": \"title to search for\" } }`",
       type: "string",
     },
     sorts: {
       label: "Sorts",
-      description: "The sort order for the query. [See the documentation for available sorts](https://developers.notion.com/reference/post-database-query-sort). Example: `[ { \"property\": \"Name\", \"direction\": \"ascending\" } ]`",
+      description: "The sort order for the query. [See the documentation for available sorts](https://developers.notion.com/reference/sort-data-source-entries). Example: `[ { \"property\": \"Name\", \"direction\": \"ascending\" } ]`",
       type: "string[]",
     },
   },
@@ -31,7 +40,7 @@ export default {
       filter, sorts,
     } = this;
 
-    const response = await this.notion.queryDatabase(this.databaseId, {
+    const response = await this.notion.queryDataSource(this.dataSourceId, {
       filter: utils.parseStringToJSON(filter),
       sorts: utils.parseObject(sorts),
     });

components/notion/actions/search/search.mjs

@@ -3,9 +3,9 @@ import common from "../common/base-search.mjs";
 export default {
   ...common,
   key: "notion-search",
-  name: "Find Pages or Databases",
-  description: "Searches for a page or database. [See the documentation](https://developers.notion.com/reference/post-search)",
-  version: "0.0.9",
+  name: "Find Pages or Data Sources",
+  description: "Searches for a page or data source. [See the documentation](https://developers.notion.com/reference/post-search)",
+  version: "0.1.0",
   type: "action",
   props: {
     ...common.props,

components/notion/common/notion-meta-properties.mjs

@@ -5,10 +5,10 @@ import utils from "./utils.mjs";
  *
  * convertToNotion: converts the prop values to send to the Notion API
  */
-export const NOTION_DATABASE_META = {
+export const NOTION_DATA_SOURCE_META = {
   parent: {
     convertToNotion: (property) => ({
-      type: "database_id",
+      type: "data_source_id",
       database_id: property.value,
     }),
   },
@@ -42,7 +42,7 @@ export const NOTION_DATABASE_META = {
  * Implementation for Page Meta in Notion - https://developers.notion.com/reference/page
  */
 export const NOTION_PAGE_META = {
-  ...NOTION_DATABASE_META,
+  ...NOTION_DATA_SOURCE_META,
   parent: {
     convertToNotion: (property) => ({
       type: "page_id",
@@ -52,6 +52,6 @@ export const NOTION_PAGE_META = {
 };
 
 export default {
-  NOTION_DATABASE_META,
+  NOTION_DATA_SOURCE_META,
   NOTION_PAGE_META,
 };

components/notion/notion.app.mjs

@@ -19,6 +19,19 @@ export default {
         return this._buildPaginatedOptions(options, response.next_cursor);
       },
     },
+    dataSourceId: {
+      type: "string",
+      label: "Data Source ID",
+      description: "Select a data source from the database or provide a data source ID",
+      async options({ databaseId }) {
+        this._checkOptionsContext(databaseId, "Database ID");
+        const dataSources = await this.getDataSourcesForDatabase(databaseId);
+        return dataSources?.map((dataSource) => ({
+          label: dataSource.name,
+          value: dataSource.id,
+        })) || [];
+      },
+    },
     pageId: {
       type: "string",
       label: "Page ID",
@@ -41,13 +54,13 @@ export default {
     pageIdInDatabase: {
       type: "string",
       label: "Page ID",
-      description: "Search for a page from the database or provide a page ID",
+      description: "Search for a page from the data source or provide a page ID",
       useQuery: true,
       async options({
-        query, prevContext, databaseId,
+        query, prevContext, dataSourceId,
       }) {
-        this._checkOptionsContext(databaseId, "Database ID");
-        const response = await this.queryDatabase(databaseId, {
+        this._checkOptionsContext(dataSourceId, "Data Source ID");
+        const response = await this.queryDataSource(dataSourceId, {
           query,
           start_cursor: prevContext.nextPageParameters ?? undefined,
         });
@@ -65,8 +78,8 @@ export default {
 
         const parentType = response.parent.type;
         try {
-          const { properties } = parentType === "database_id"
-            ? await this.retrieveDatabase(response.parent.database_id)
+          const { properties } = parentType === "data_source_id"
+            ? await this.retrieveDataSource(response.parent.data_source_id).properties
             : response;
 
           const propEntries = Object.entries(properties);
@@ -195,12 +208,12 @@ export default {
     },
     filter: {
       type: "string",
-      label: "Page or Database",
-      description: "Whether to search for pages or databases",
+      label: "Page or Data Source",
+      description: "Whether to search for pages or data sources.",
       optional: true,
       options: [
         "page",
-        "database",
+        "data_source",
       ],
     },
     pageContent: {
@@ -219,7 +232,7 @@ export default {
     _getNotionClient() {
       return new notion.Client({
         auth: this.$auth.oauth_access_token,
-        notionVersion: "2022-02-22",
+        notionVersion: "2025-09-03",
       });
     },
     _extractDatabaseTitleOptions(databases) {
@@ -292,6 +305,23 @@ export default {
     async updateDatabase(database) {
       return this._getNotionClient().databases.update(database);
     },
+    async queryDataSource(dataSourceId, params = {}) {
+      return this._getNotionClient().request({
+        method: "POST",
+        path: `data_sources/${dataSourceId}/query`,
+        body: params,
+      });
+    },
+    async retrieveDataSource(dataSourceId) {
+      return this._getNotionClient().request({
+        method: "GET",
+        path: `data_sources/${dataSourceId}`,
+      });
+    },
+    async getDataSourcesForDatabase(databaseId) {
+      const database = await this.retrieveDatabase(databaseId);
+      return database.data_sources || [];
+    },
     async createFileUpload(file) {
       return this._getNotionClient().fileUploads.create(file);
     },
@@ -342,22 +372,22 @@ export default {
       });
     },
     /**
-     * This generator function scans the pages in a database yields each page
+     * This generator function scans the pages in a data source and yields each page
      * separately.
      *
-     * @param {string} databaseId - The database containing the pages to scan
+     * @param {string} dataSourceId - The data source containing the pages to scan
      * @param {object} [opts] - Options to customize the operation
      * @yield {object} The next page
      */
-    async *getPages(databaseId, opts = {}) {
+    async *getPages(dataSourceId, opts = {}) {
       let cursor;
 
       do {
         const params = {
           ...opts,
           start_cursor: cursor,
         };
-        const response = await this.queryDatabase(databaseId, params);
+        const response = await this.queryDataSource(dataSourceId, params);
         const {
           results: pages,
           next_cursor: nextCursor,