Merge branch 'master' into RR_v2

Author: remoteretrieval

components/adalo/actions/common/base.mjs

@@ -1,14 +1,13 @@
-import base from "../common/base.mjs";
+import adalo from "../../adalo.app.mjs";
 
 export default {
-  ...base,
   key: "adalo-create-record",
   name: "Create Record",
   description: "Create a new record. [See docs here](https://help.adalo.com/integrations/the-adalo-api/collections)",
-  version: "0.0.1",
+  version: "0.0.2",
   type: "action",
   props: {
-    ...base.props,
+    adalo,
     data: {
       label: "Data",
       description: "The data to create record. E.g. `{ \"Email\": \"string\", \"Username\": \"string\", \"Full Name\": \"string\" }`",
@@ -18,7 +17,6 @@ export default {
   async run({ $ }) {
     const response = await this.adalo.createRecord({
       $,
-      collectionId: this.collectionId,
       data: JSON.parse(this.data),
     });
 

components/adalo/actions/create-record/create-record.mjs

@@ -1,12 +1,14 @@
-import base from "../common/base.mjs";
+import adalo from "../../adalo.app.mjs";
 
 export default {
-  ...base,
   key: "adalo-get-records",
   name: "Get Records",
   description: "Get all records from a collection. [See docs here](https://help.adalo.com/integrations/the-adalo-api/collections)",
-  version: "0.0.2",
+  version: "0.0.4",
   type: "action",
+  props: {
+    adalo,
+  },
   async run({ $ }) {
     let resources = [];
     let offset = 0;
@@ -18,7 +20,6 @@ export default {
           requestFn: this.adalo.getRecords,
           requestArgs: {
             $,
-            collectionId: this.collectionId,
             params: {
               offset,
             },

components/adalo/actions/get-records/get-records.mjs

@@ -1,14 +1,13 @@
-import base from "../common/base.mjs";
+import adalo from "../../adalo.app.mjs";
 
 export default {
-  ...base,
   key: "adalo-update-record",
   name: "Update Record",
   description: "Update a record. [See docs here](https://help.adalo.com/integrations/the-adalo-api/collections)",
-  version: "0.0.1",
+  version: "0.0.2",
   type: "action",
   props: {
-    ...base.props,
+    adalo,
     recordId: {
       label: "Record ID",
       description: "The ID of a record",
@@ -23,7 +22,6 @@ export default {
   async run({ $ }) {
     const response = await this.adalo.updateRecord({
       $,
-      collectionId: this.collectionId,
       recordId: this.recordId,
       data: JSON.parse(this.data),
     });

components/adalo/actions/update-record/update-record.mjs

@@ -3,8 +3,10 @@ import { axios } from "@pipedream/platform";
 export default {
   type: "app",
   app: "adalo",
-  propDefinitions: {},
   methods: {
+    _collectionId() {
+      return this.$auth.collection_id;
+    },
     _apiKey() {
       return this.$auth.api_key;
     },
@@ -49,30 +51,24 @@ export default {
         },
       };
     },
-    async getRecords({
-      collectionId, ...args
-    } = {}) {
-      const response = await this._makeRequest({
-        path: `/collections/${collectionId}`,
+    getRecords(args = {}) {
+      return this._makeRequest({
+        path: `/collections/${this._collectionId()}`,
         ...args,
       });
-
-      return response.records;
     },
-    async createRecord({
-      collectionId, ...args
-    } = {}) {
+    createRecord(args = {}) {
       return this._makeRequest({
-        path: `/collections/${collectionId}`,
+        path: `/collections/${this._collectionId()}`,
         method: "post",
         ...args,
       });
     },
-    async updateRecord({
-      collectionId, recordId, ...args
+    updateRecord({
+      recordId, ...args
     } = {}) {
       return this._makeRequest({
-        path: `/collections/${collectionId}/${recordId}`,
+        path: `/collections/${this._collectionId()}/${recordId}`,
         method: "put",
         ...args,
       });

components/adalo/adalo.app.mjs

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/adalo",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Pipedream Adalo Components",
   "main": "adalo.app.mjs",
   "keywords": [
@@ -14,6 +14,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@pipedream/platform": "^1.2.0"
+    "@pipedream/platform": "^3.0.1"
   }
 }

components/adalo/package.json

@@ -5,7 +5,7 @@ export default {
   key: "adalo-new-record",
   name: "New Record",
   description: "Emit new event when is created a record.",
-  version: "0.0.4",
+  version: "0.0.5",
   type: "source",
   dedupe: "unique",
   props: {
@@ -16,11 +16,6 @@ export default {
         intervalSeconds: DEFAULT_POLLING_SOURCE_TIMER_INTERVAL,
       },
     },
-    collectionId: {
-      label: "Collection ID",
-      description: "The ID the collection",
-      type: "string",
-    },
   },
   methods: {
     emitEvent(event) {
@@ -33,8 +28,7 @@ export default {
   },
   hooks: {
     async deploy() {
-      const records = await this.adalo.getRecords({
-        collectionId: this.collectionId,
+      const { records } = await this.adalo.getRecords({
         params: {
           limit: 10,
         },
@@ -47,9 +41,8 @@ export default {
     let offset = 0;
 
     while (offset >= 0) {
-      const records = await this.adalo.getRecords({
+      const { records } = await this.adalo.getRecords({
         $,
-        collectionId: this.collectionId,
         params: {
           offset,
         },