Improvements

Author: GTFalcao

components/notion/actions/append-block/append-block.mjs

@@ -26,44 +26,32 @@ export default {
       reloadProps: true,
       options: [
         {
-          label:
-            "Use objects of existing blocks (e.g. objects returned from previous steps)",
-          value: "blockObjects",
-        },
-        {
-          label: "Select existing blocks or provide their IDs",
+          label: "Append existing blocks",
           value: "blockIds",
         },
         {
           label: "Provide Markdown content to create new blocks with",
-          value: "markupContents",
+          value: "markdownContents",
         },
         {
           label: "Provide Image URLs to create new image blocks",
           value: "imageUrls",
         },
       ],
     },
-    blockObjects: {
-      type: "string[]",
-      label: "Block Objects",
-      description:
-        "An array of block objects to be appended. You can use a custom expression to reference block objects from previous steps. [See the documentation](https://developers.notion.com/reference/block) for more information",
-      hidden: true,
-    },
     blockIds: {
       propDefinition: [
         notion,
         "pageId",
       ],
       type: "string[]",
-      label: "Block IDs",
+      label: "Existing Block IDs",
       description: "Select one or more block(s) or page(s) to append (selecting a page appends its children). You can also provide block or page IDs.",
       hidden: true,
     },
-    markupContents: {
+    markdownContents: {
       type: "string[]",
-      label: "Markup Contents",
+      label: "Markdown Contents",
       description:
         "Each entry is the content of a new block to append, using Markdown syntax. [See the documentation](https://www.notion.com/help/writing-and-editing-basics#markdown-and-shortcuts) for more information",
       hidden: true,
@@ -79,9 +67,8 @@ export default {
     const { blockTypes } = this;
 
     for (let prop of [
-      "blockObjects",
       "blockIds",
-      "markupContents",
+      "markdownContents",
       "imageUrls",
     ]) {
       currentProps[prop].hidden = !blockTypes.includes(prop);
@@ -102,15 +89,6 @@ export default {
   async run({ $ }) {
     const { blockTypes } = this;
     const children = [];
-    // add blocks from blockObjects
-    if (blockTypes.includes("blockObjects") && this.blockObjects?.length > 0) {
-      for (const obj of this.blockObjects) {
-        const child = typeof obj === "string"
-          ? JSON.parse(obj)
-          : obj;
-        children.push(child);
-      }
-    }
 
     // add blocks from blockIds
     if (blockTypes.includes("blockIds") && this.blockIds?.length > 0) {
@@ -123,8 +101,8 @@ export default {
     }
 
     // add blocks from markup
-    if (blockTypes.includes("markupContents") && this.markupContents?.length > 0) {
-      for (const content of this.markupContents) {
+    if (blockTypes.includes("markdownContents") && this.markdownContents?.length > 0) {
+      for (const content of this.markdownContents) {
         const block = this.createBlocks(content);
         children.push(...block);
       }

components/notion/notion.app.mjs

@@ -1,5 +1,6 @@
 import notion from "@notionhq/client";
 import NOTION_META from "./common/notion-meta-selection.mjs";
+import { ConfigurationError } from "@pipedream/platform";
 
 export default {
   type: "app",
@@ -36,6 +37,7 @@ export default {
       async options({
         prevContext, databaseId,
       }) {
+        this._checkOptionsContext(databaseId, "Database ID");
         const response = await this.queryDatabase(databaseId, {
           start_cursor: prevContext.nextPageParameters ?? undefined,
         });
@@ -48,6 +50,7 @@ export default {
       label: "Property ID",
       description: "Select a page property or provide a property ID",
       async options({ pageId }) {
+        this._checkOptionsContext(pageId, "Page ID");
         const response = await this.retrievePage(pageId);
 
         const parentType = response.parent.type;
@@ -90,6 +93,7 @@ export default {
       async options({
         parentId, parentType,
       }) {
+        this._checkOptionsContext(parentId, "Database ID");
         try {
           const { properties } = parentType === "database"
             ? await this.retrieveDatabase(parentId)
@@ -169,6 +173,11 @@ export default {
     },
   },
   methods: {
+    _checkOptionsContext(value, name) {
+      if (value.match(/{{\s?steps/)) {
+        throw new ConfigurationError(`Please use a custom expression to reference a previous value, since you are also using one for \`${name}\``);
+      }
+    },
     _getNotionClient() {
       return new notion.Client({
         auth: this.$auth.oauth_access_token,