some adjusts

Author: luancazarine

components/neo4j_auradb/common/constants.mjs

@@ -6,8 +6,8 @@ export const ORDER_TYPE_OPTIONS = [
     value: "datetime",
   },
   {
-    label: "Sequencial (integer)",
-    value: "sequencial",
+    label: "Sequential (Integer)",
+    value: "sequential",
   },
   {
     label: "Other",

components/neo4j_auradb/sources/common/base.mjs

@@ -15,7 +15,7 @@ export default {
     orderBy: {
       type: "string",
       label: "Order By",
-      description: "The property to order the nodes by including the variable. **Format: {VAR}.{FIELD}**. **Example: p.createdAt**",
+      description: "Order By property is required for Pipedream source to identify the entity. We recommend to choose the property represent the created time property of your entity with a variable, for example createdAt.",
     },
     orderType: {
       type: "string",
@@ -32,10 +32,10 @@ export default {
       default: return "";
       }
     },
-    _getWhereClause(lastData, type) {
+    _getWhereClause(lastData, type, returnVariable) {
       switch (type) {
-      case "datetime": return `WHERE ${this.orderBy} > datetime("${lastData}")`;
-      case "sequencial": return `WHERE ${this.orderBy} > ${lastData}`;
+      case "datetime": return `WHERE ${returnVariable}.${this.orderBy} > datetime("${lastData}")`;
+      case "sequencial": return `WHERE ${returnVariable}.${this.orderBy} > ${parseInt(lastData)}`;
       default: return "";
       }
     },
@@ -71,10 +71,11 @@ export default {
       return "";
     },
     async emitEvent(maxResults = false) {
+      const returnVariable = this.getReturnVariable();
       const lastData = this._getLastData();
-      const whereClause = this._getWhereClause(lastData, this.orderType);
-      const queryBase = this.getBaseQuery(whereClause);
-      const query = `${queryBase} ORDER BY ${this.orderBy} DESC `;
+      const whereClause = this._getWhereClause(lastData, this.orderType, returnVariable);
+      const queryBase = this.getBaseQuery(whereClause, returnVariable);
+      const query = `${queryBase} RETURN ${returnVariable} ORDER BY ${returnVariable}.${this.orderBy} DESC `;
 
       const response = this.app.paginate({
         query,
@@ -92,9 +93,10 @@ export default {
           responseArray.length = maxResults;
         }
 
-        const field = this.orderBy.split(".")[1];
-        const lastData = responseArray[0]?.properties?.[field]
-         || responseArray[0][1].properties[field];
+        console.log("responseArray: ", responseArray);
+
+        const lastData = responseArray[0]?.properties?.[this.orderBy]
+         || responseArray[0][1].properties[this.orderBy];
 
         this._setLastData(lastData);
       }

components/neo4j_auradb/sources/new-node/new-node.mjs

@@ -20,8 +20,10 @@ export default {
   methods: {
     ...common.methods,
     getBaseQuery(whereClause) {
-      const variable = this.orderBy.split(".")[0];
-      return `MATCH (${variable}:${this.nodeLabel}) ${whereClause} RETURN ${variable} `;
+      return `MATCH (n:${this.nodeLabel}) ${whereClause}`;
+    },
+    getReturnVariable() {
+      return "n";
     },
     emit(item) {
       const ts = (this.orderType === "dateTime")

components/neo4j_auradb/sources/new-query-result/new-query-result.mjs

@@ -13,23 +13,31 @@ export default {
     ...common.props,
     query: {
       type: "string",
-      label: "Cypher Query",
-      description: "The Cypher query to monitor for new results. **Example: MATCH (n:Node) RETURN n**",
+      label: "Match Query",
+      description: "The Cypher query to monitor for new results. **Only the MATCH query without RETURN**. **Example: MATCH (n:Node)**.",
+    },
+    variable: {
+      type: "string",
+      label: "Variable",
+      description: "The variable you want to return from the query.",
     },
   },
   methods: {
     ...common.methods,
     getBaseQuery() {
       return this.query;
     },
+    getReturnVariable() {
+      return this.variable;
+    },
     emit(item) {
       const ts = (this.orderType === "dateTime")
-        ? Date.parse(item[1].properties[this.orderBy])
+        ? Date.parse(item.properties[this.orderBy])
         : new Date();
 
       this.$emit(item, {
-        id: item[1].elementId,
-        summary: "New query result",
+        id: item.elementId,
+        summary: `New query result with ID: ${item.elementId}`,
         ts,
       });
     },

components/neo4j_auradb/sources/new-relationship/new-relationship.mjs

@@ -20,8 +20,10 @@ export default {
   methods: {
     ...common.methods,
     getBaseQuery(whereClause) {
-      const variable = this.orderBy.split(".")[0];
-      return `MATCH _=()-[${variable}:${this.relationshipLabel}]->() ${whereClause} RETURN ${variable} `;
+      return `MATCH _=()-[r:${this.relationshipLabel}]->() ${whereClause}`;
+    },
+    getReturnVariable() {
+      return "r";
     },
     emit(item) {
       const ts = (this.orderType === "dateTime")