dbm-graph-api 1.1.41 → 1.1.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.41",
+  "version": "1.1.43",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.741.0",
     "@aws-sdk/s3-request-presigner": "^3.741.0",
-    "dbm": "^1.3.0",
+    "dbm": "^1.4.2",
     "mime": "^4.0.6",
     "sharp": "^0.33.5",
     "ws": "^8.18.0"

package/src/dbm-graph-api/action/admin/AddAndProcessAction.js

@@ -27,6 +27,15 @@ export default class AddAndProcessAction extends Dbm.core.BaseObject {
                     let fromItem = database.getObject(1*aData["from"]);
                     await action.addOutgoingRelation(fromItem, "from");
                 }
+
+                let data = aData["data"];
+                if(data) {
+                    if(typeof(data) === "string") {
+                        data = JSON.parse(data);
+                    }
+
+                    await action.updateField("data", data);
+                }
     
                 let processingActionStatus = await database.getTypeObject("status/actionStatus", "processing");
                 await action.replaceIncomingRelation(processingActionStatus, "for", "status/actionStatus");

package/src/dbm-graph-api/data/actions/Status.js

@@ -0,0 +1,20 @@
+import Dbm from "dbm";
+
+export default class Status extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getData(aData, aEncodeSession) {
+        let returnObject = {};
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        
+        let actionStatus = await database.getTypeObject("status/actionStatus", "readyToProcess");
+        let actions = await actionStatus.objectRelationQuery("out:for:action");
+        
+        returnObject["queueLength"] = actions.length;
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/data/actions/index.js

@@ -0,0 +1 @@
+export {default as Status} from "./Status.js";

package/src/dbm-graph-api/data/index.js

@@ -8,6 +8,7 @@ export {default as Breadcrumb} from "./Breadcrumb.js";
 export {default as Question} from "./Question.js";
 
 export * as server from "./server/index.js";
+export * as actions from "./actions/index.js";
 
 import UploadS3 from "./UploadS3.js";
 

package/src/dbm-graph-api/index.js

@@ -261,6 +261,8 @@ let fullDataSetup = function() {
     registerDataFunction("admin/helpSectionSuggestions", new DbmGraphApi.data.HelpSectionSuggestions());
     registerDataFunction("admin/altText", new DbmGraphApi.data.AltText());
 
+    registerDataFunction("actions/status", new DbmGraphApi.data.actions.Status());
+
     registerDataFunction("server/status", new DbmGraphApi.data.server.Status());
 }
 
@@ -307,6 +309,10 @@ let fullProcessActionSetup = function() {
 
     registerProcessActionFunction("handleFormSubmission", new DbmGraphApi.processAction.HandleFormSubmission());
 
+    registerProcessActionFunction("httpRequest/get", new DbmGraphApi.processAction.httpRequests.GetRequest());
+
+    registerProcessActionFunction("actionGroup/process", new DbmGraphApi.processAction.actionGroup.Process());
+
     registerProcessActionFunction("pageUpdates/updateCategoryListing", new DbmGraphApi.processAction.pageUpdates.UpdateCategoryListing());
     registerProcessActionFunction("pageUpdates/updateRenderedContent", new DbmGraphApi.processAction.pageUpdates.UpdateRenderedContent());
     registerProcessActionFunction("pageUpdates/clearCache", new DbmGraphApi.processAction.pageUpdates.ClearCloudflareCache());
@@ -701,12 +707,16 @@ export const setupSite = function(aServer) {
 		}
 
 		let url = request.url;
+        let shouldRedirect = false;
 		let index = url.indexOf("?");
+        let queryString = null;
 		if(index >= 0) {
+            queryString = url.substring(index, url.length);
 			url = url.substring(0, index);
 		}
 		if(url[url.length-1] !== "/") {
 			url += "/";
+            shouldRedirect = true;
 		}
 		
 		let urlObject = await database.getObjectByUrl(url);
@@ -715,6 +725,13 @@ export const setupSite = function(aServer) {
 			moduleName = request.query.forceModule;
 		}
 
+        if(urlObject && shouldRedirect) {
+            let newUrl = url;
+            if(queryString) {
+                newUrl += queryString;
+            }
+            return reply.redirect(newUrl, 301);
+        }
 		if(!urlObject) {
 			reply.code(404);
 			reply.type('text/html');

package/src/dbm-graph-api/processAction/HandleFormSubmission.js

@@ -6,16 +6,13 @@ export default class HandleFormSubmission extends Dbm.core.BaseObject {
     }
 
     async process(aAction) {
-        console.log("HandleFormSubmission:process");
-        console.log(aAction);
+        //console.log("HandleFormSubmission:process");
 
         let formSubmission = await aAction.singleObjectRelationQuery("out:from:formSubmission");
         let form = await formSubmission.singleObjectRelationQuery("in:for:form");
         let formName = await form.getIdentifier();
-        console.log(formSubmission);
 
-        let formHandler = Dbm.getInstance().repository.getItem("formHandlers/" + formName);
-        console.log(formHandler);
+        let formHandler = Dbm.getRepositoryItem("formHandlers/" + formName);
 
         if(formHandler.handle) {
             formHandler.handle(formSubmission);

package/src/dbm-graph-api/processAction/actionGroup/Process.js

@@ -0,0 +1,49 @@
+import Dbm from "dbm";
+
+export default class Process extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async process(aAction) {
+        console.log("Process:process2");
+        console.log(aAction);
+
+        let database = Dbm.getRepositoryItem("graphDatabase").controller;
+
+        let fields = await aAction.getFields();
+        let data = fields["data"];
+        console.log(fields);
+
+        let actionGroup = await aAction.singleObjectRelationQuery("out:from:actionGroup");
+        console.log(actionGroup);
+        let actionGroupFields = await actionGroup.getFields();
+        console.log(actionGroupFields);
+
+        let actionName = actionGroupFields["actionName"];
+        let dataTemplate = actionGroupFields["dataTemplate"];
+        let valueField = actionGroupFields["valueField"];
+
+        let parts = actionGroupFields["parts"];
+        let index = data["index"];
+        let partId = parts[index];
+        let part = database.getObject(partId);
+        let partFields = await part.getFields();
+        let currentArray = partFields["values"];
+        console.log(parts, currentArray);
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            let currentValue = currentArray[i];
+
+            let currentData = {...dataTemplate};
+            currentData[valueField] = currentValue;
+
+            await database.addActionToProcess(actionName, null, currentData);
+        }
+
+        let nextIndex = index+1
+        if(nextIndex < parts.length) {
+            await database.addActionToProcess("actionGroup/process", actionGroup, {"index": nextIndex});
+        }
+    }
+}

package/src/dbm-graph-api/processAction/actionGroup/index.js

@@ -0,0 +1 @@
+export {default as Process} from "./Process.js";

package/src/dbm-graph-api/processAction/httpRequests/GetRequest.js

@@ -0,0 +1,28 @@
+import Dbm from "dbm";
+
+export default class GetRequest extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async process(aAction) {
+        console.log("GetRequest:process");
+        console.log(aAction);
+
+        let fields = await aAction.getFields();
+        let data = fields["data"];
+        console.log(fields);
+
+        let headers = {}; //METODO
+            
+        let response = await fetch(data["url"], {
+            method: "GET",
+            headers: headers,
+        });
+
+        console.log(response.status)
+
+        let responseData = await response.text();
+        console.log(responseData);
+    }
+}

package/src/dbm-graph-api/processAction/httpRequests/index.js

@@ -0,0 +1 @@
+export {default as GetRequest} from "./GetRequest.js";

package/src/dbm-graph-api/processAction/index.js

@@ -1,4 +1,6 @@
 export * as pageUpdates from "./pageUpdates/index.js";
+export * as httpRequests from "./httpRequests/index.js";
+export * as actionGroup from "./actionGroup/index.js";
 
 export {default as Example} from "./Example.js";
 export {default as HandleFormSubmission} from "./HandleFormSubmission.js";

package/src/dbm-graph-api/processAction/pageUpdates/ClearCloudflareCache.js

@@ -9,7 +9,7 @@ export default class ClearCloudflareCache extends Dbm.core.BaseObject {
         console.log("ClearCloudflareCache:process");
         //console.log(aAction);
 
-        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        let database = Dbm.getRepositoryItem("graphDatabase").controller;
         let page = await aAction.singleObjectRelationQuery("out:from:page");
 
         let cloudflare = Dbm.getInstance().repository.getItem("cloudflare");