some adjusts

Author: luancazarine

components/neo4j_auradb/neo4j_auradb.app.mjs

@@ -87,7 +87,7 @@ export default {
       let cypherQuery = "";
 
       do {
-        cypherQuery = `${query} Skip ${LIMIT * page} LIMIT ${LIMIT}`;
+        cypherQuery = `${query} SKIP ${LIMIT * page} LIMIT ${LIMIT}`;
         page++;
 
         const { data: { values } } = await this.executeCypherQuery({

components/neo4j_auradb/sources/common/base.mjs

@@ -16,14 +16,12 @@ export default {
       type: "string",
       label: "Order By",
       description: "The property to order the nodes by including the variable. **Format: {VAR}.{FIELD}**. **Example: p.createdAt**",
-      optional: true,
     },
     orderType: {
       type: "string",
       label: "Order Type",
       description: "The type of the order field.",
       options: ORDER_TYPE_OPTIONS,
-      optional: true,
     },
   },
   methods: {
@@ -95,7 +93,7 @@ export default {
         }
 
         const field = this.orderBy.split(".")[1];
-        const lastData = responseArray[0]?.properties?.[this.orderBy]
+        const lastData = responseArray[0]?.properties?.[field]
          || responseArray[0][1].properties[field];
 
         this._setLastData(lastData);

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

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

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

@@ -14,7 +14,7 @@ export default {
     query: {
       type: "string",
       label: "Cypher Query",
-      description: "The Cypher query to monitor for new results.",
+      description: "The Cypher query to monitor for new results. **Example: MATCH (n:Node) RETURN n**",
     },
   },
   methods: {

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

@@ -20,15 +20,16 @@ export default {
   methods: {
     ...common.methods,
     getBaseQuery(whereClause) {
-      return `MATCH p=()-[r:${this.relationshipLabel}]->() ${whereClause} RETURN p `;
+      const variable = this.orderBy.split(".")[0];
+      return `MATCH _=()-[${variable}:${this.relationshipLabel}]->() ${whereClause} RETURN ${variable} `;
     },
     emit(item) {
       const ts = (this.orderType === "dateTime")
         ? Date.parse(item[1].properties[this.orderBy])
         : new Date();
 
       this.$emit(item, {
-        id: item[1].elementId,
+        id: item.elementId,
         summary: `New Relationship created with label ${this.relationshipLabel}`,
         ts,
       });