code revisions made based on pull request review

Author: philbuuza

components/overledger/actions/execute-signed-transaction/execute-signed-transaction.mjs

@@ -8,6 +8,12 @@ export default {
   type: "action",
   props: {
     overledger,
+    environment: {
+      propDefinition: [
+        overledger,
+        "environment",
+      ],
+    },
     requestId: {
       type: "string",
       label: "Request ID",
@@ -21,12 +27,16 @@ export default {
     },
   },
   async run({ $ }) {
+
+    const requestBody = {
+      requestId: this.requestId,
+      signedTransaction: this.signedTransaction,
+    };
+
     const response = await this.overledger.executeSignedTransaction({
       $,
-      data: {
-        requestId: this.requestId,
-        signedTransaction: this.signedTransaction,
-      },
+      environment: this.environment,
+      data: requestBody,
     });
 
     $.export("$summary", `Successfully executed signed transaction with Request ID ${this.requestId}`);

components/overledger/actions/prepare-smart-contract-transaction/prepare-smart-contract-transaction.mjs

@@ -12,6 +12,12 @@ export default {
   type: "action",
   props: {
     overledger,
+    environment: {
+      propDefinition: [
+        overledger,
+        "environment",
+      ],
+    },
     locationTechnology: {
       type: "string",
       label: "Location Technology",
@@ -68,6 +74,7 @@ export default {
 
     const response = await this.overledger.prepareSmartContractTransaction({
       $,
+      environment: this.environment,
       data: requestBody,
     });
     $.export("$summary", "Smart contract transaction prepared successfully");

components/overledger/actions/read-from-a-smart-contract/read-from-a-smart-contract.mjs

@@ -12,6 +12,12 @@ export default {
   type: "action",
   props: {
     overledger,
+    environment: {
+      propDefinition: [
+        overledger,
+        "environment",
+      ],
+    },
     locationTechnology: {
       type: "string",
       label: "Location Technology",
@@ -68,6 +74,7 @@ export default {
       // Make the API call to Overledger
     const response = await this.overledger.readFromSmartContract({
       $,
+      environment: this.environment,
       data: requestBody,
     });
     $.export("$summary", `Successfully read from contract: ${this.smartContractId}`);

components/overledger/actions/sign-a-transaction/sign-a-transaction.mjs

@@ -9,6 +9,12 @@ export default {
   type: "action",
   props: {
     overledger,
+    environment: {
+      propDefinition: [
+        overledger,
+        "environment",
+      ],
+    },
     keyId: {
       type: "string",
       label: "Signing Account ID",
@@ -64,6 +70,7 @@ export default {
 
     const response = await this.overledger.signTransaction({
       $,
+      environment: this.environment,
       data: requestBody,
     });
     $.export("$summary", "Transaction signed successfully");

components/overledger/common/constants.mjs

@@ -50,6 +50,17 @@ export const NETWORK_OPTIONS = {
     "Sandbox",
   ],
 };
+//Overledger environment to be used - Test or Live
+export const OVERLEDGER_INSTANCE = [
+  {
+    label: "Sandbox",
+    value: "sandbox",
+  },
+  {
+    label: "Overledger",
+    value: "overledger",
+  },
+];
 ///unit options to allow for the correct selection based on the location network
 export const UNIT_OPTIONS = {
   "ethereum": "ETH",               // Ethereum's token symbol is ETH

components/overledger/overledger.app.mjs

@@ -1,32 +1,21 @@
 import { axios } from "@pipedream/platform";
+import { OVERLEDGER_INSTANCE } from "./common/constants.mjs";
 
 export default {
   type: "app",
   app: "overledger",
-  props: { //Options to allow for instance selection of Overledger environment - Sandbox or Live Overledger to determine BaseURL
-    environment: {
-      type: "string",
-      label: "Overledger Instance",
-      description: "Select the Overledger environment.",
-      options: [
-        {
-          label: "Sandbox",
-          value: "sandbox",
-        },
-        {
-          label: "Overledger",
-          value: "overledger",
-        },
-      ],
-      optional: false,
-    },
-  },
   propDefinitions: {
     smartContractId: {
       type: "string",
       label: "Smart Contract ID",
       description: "The ID of the smart contract to interact with.",
     },
+    environment: {
+      type: "string",
+      label: "Overledger Instance",
+      description: "Select the Overledger instance to be used",
+      options: OVERLEDGER_INSTANCE,
+    },
   },
   methods: {
     _headers() {
@@ -36,48 +25,44 @@ export default {
         "API-Version": "3.0.0",
       };
     },
-    _getBaseUrl() { //conditional for environment url selection.
-      return this.environment === "sandbox"
+    _getBaseUrl(environment) { //conditional for environment url selection.
+      return environment === "sandbox"
         ? "https://api.sandbox.overledger.io"
         : "https://api.overledger.io";
     },
     _makeRequest({
-      $ = this, baseUrl, path, ...otherOpts
+      $ = this, environment, path, ...otherOpts
     }) {
       return axios($, {
         ...otherOpts,
-        url: baseUrl + path,
+        url: this._getBaseUrl(environment) + path,
         headers: this._headers(),
       });
     },
     prepareSmartContractTransaction(opts = {}) {
       return this._makeRequest({
         method: "POST",
-        baseUrl: this._getBaseUrl(),
         path: "/api/preparations/transactions/smart-contracts/write",
         ...opts,
       });
     },
     readFromSmartContract(opts = {}) {
       return this._makeRequest({
         method: "POST",
-        baseUrl: this._getBaseUrl(),
         path: "/api/smart-contracts/read",
         ...opts,
       });
     },
     signTransaction(opts = {}) {
       return this._makeRequest({
         method: "POST",
-        baseUrl: this._getBaseUrl(),
         path: "/api/transaction-signing-sandbox",
         ...opts,
       });
     },
     executeSignedTransaction(opts = {}) {
       return this._makeRequest({
         method: "POST",
-        baseUrl: this._getBaseUrl(),
         path: "/api/executions/transactions",
         ...opts,
       });
@@ -87,7 +72,6 @@ export default {
     }) {
       return this._makeRequest({
         method: "POST",
-        baseUrl: this._getBaseUrl(),
         path: `/api/webhooks/${path}`,
         ...opts,
       });
@@ -97,7 +81,6 @@ export default {
     }) {
       return this._makeRequest({
         method: "DELETE",
-        baseUrl: this._getBaseUrl(),
         path: `/api/webhooks/${path}/${webhookId}`,
       });
     },