dbm-graph-api 1.1.9 → 1.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "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.1.5",
+    "dbm": "^1.1.7",
     "mime": "^4.0.6",
     "sharp": "^0.33.5",
     "ws": "^8.18.0"

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

@@ -111,6 +111,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                 }
                 catch(theError) {
                     logs.push(theError.message);
+                    console.error(theError);
                 }
 
                 this._webSocket.send(JSON.stringify({"type": "range/response", "ids": ids, "requestId": data["requestId"], "logs": logs}));
@@ -147,6 +148,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     }
                     catch(theError) {
                         logs.push(theError.message);
+                        console.error(theError);
                     }
 
                     this._webSocket.send(JSON.stringify({"type": "data/response", "data": returnData, "requestId": data["requestId"], "logs": logs}));

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

@@ -0,0 +1,52 @@
+import Dbm from "dbm";
+
+export default class AddAndProcessAction extends Dbm.core.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performAction(aData, aEncodeSession) {
+        let returnObject = {};
+
+        let user = await aEncodeSession.outputController.getUser();
+        
+        if(user) {
+            let type = aData["type"];
+
+            if(type) {
+                let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+                let action = await database.createObject("private", ["action"]);
+                returnObject["id"] = action.id;
+
+                let actionType = await database.getTypeObject("type/actionType", type);
+                await action.addIncomingRelation(actionType, "for");
+    
+                if(aData["from"]) {
+                    let fromItem = database.getItem(1*aData["from"]);
+                    await action.addIncomingRelation(fromItem, "from");
+                }
+    
+                let processingActionStatus = await database.getTypeObject("status/actionStatus", "processing");
+                await action.replaceIncomingRelation(processingActionStatus, "for", "status/actionStatus");
+    
+                let processActionItem = Dbm.getInstance().repository.getItemIfExists("graphApi/processAction/" + type);
+    
+                if(processActionItem) {
+    
+                    await processActionItem.controller.process(action);
+    
+                    let doneActionStatus = await database.getTypeObject("status/actionStatus", "done");
+                    await action.replaceIncomingRelation(doneActionStatus, "for", "status/actionStatus");
+                }
+                else {
+                    let doneActionStatus = await database.getTypeObject("status/actionStatus", "noAction");
+                    await action.replaceIncomingRelation(doneActionStatus, "for", "status/actionStatus");
+                }
+            }
+            
+            
+        }
+
+        return returnObject;
+    }
+}

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

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

package/src/dbm-graph-api/action/cron/ProcessActions.js

@@ -23,7 +23,7 @@ export default class ProcessActions extends Dbm.core.BaseObject {
             let actionType = await (await action.singleObjectRelationQuery("in:for:type/actionType")).getIdentifier();
             console.log(actionType);
             
-            let processActionItem = Dbm.getInstance().repository.getItemIfExists("graphApi/procesAction/" + actionType);
+            let processActionItem = Dbm.getInstance().repository.getItemIfExists("graphApi/processAction/" + actionType);
 
             if(processActionItem) {
 

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

@@ -1,4 +1,5 @@
 export {default as Example} from "./Example.js";
 export {default as IncomingWebhook} from "./IncomingWebhook.js";
 
-export * as cron from "./cron/index.js";
+export * as cron from "./cron/index.js";
+export * as admin from "./admin/index.js";

package/src/dbm-graph-api/admin/edit/ReplaceIncomingRelation.js

@@ -0,0 +1,12 @@
+import Dbm from "dbm";
+import EditBaseObject from "./EditBaseObject.js";
+
+export default class ReplaceIncomigRelation extends EditBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performChange(aObject, aData, aRequest) {
+        await aObject.replaceIncomingRelation(aData["value"], aData["type"], aData["objectType"]);
+    }
+}

package/src/dbm-graph-api/admin/edit/ReplaceOutgoingRelation.js

@@ -0,0 +1,12 @@
+import Dbm from "dbm";
+import EditBaseObject from "./EditBaseObject.js";
+
+export default class ReplaceOutgoingRelation extends EditBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async performChange(aObject, aData, aRequest) {
+        await aObject.replaceOutgoingRelation(aData["value"], aData["type"]), aData["objectType"];
+    }
+}

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

@@ -8,6 +8,8 @@ export {default as SetVisibility} from "./SetVisibility.js";
 export {default as AddIncomingRelation} from "./AddIncomingRelation.js";
 export {default as AddOutgoingRelation} from "./AddOutgoingRelation.js";
 export {default as ClearCloudflareCache} from "./ClearCloudflareCache.js";
+export {default as ReplaceIncomingRelation} from "./ReplaceIncomingRelation.js";
+export {default as ReplaceOutgoingRelation} from "./ReplaceOutgoingRelation.js";
 
 export const fullSetup = function() {
     let prefix = "graphApi/admin/edit/";
@@ -47,6 +49,18 @@ export const fullSetup = function() {
         currentSelect.item.register(prefix + name);
     }
 
+    {
+        let name = "replaceIncomingRelation";
+        let currentSelect = new DbmGraphApi.admin.edit.ReplaceIncomingRelation();
+        currentSelect.item.register(prefix + name);
+    }
+
+    {
+        let name = "replaceOutgoingRelation";
+        let currentSelect = new DbmGraphApi.admin.edit.ReplaceOutgoingRelation();
+        currentSelect.item.register(prefix + name);
+    }
+
     {
         let name = "clearCache";
         let currentSelect = new DbmGraphApi.admin.edit.ClearCloudflareCache();

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

@@ -44,6 +44,12 @@ let fullSelectSetup = function() {
         let currentSelect = new DbmGraphApi.range.select.IncludeDraft();
         currentSelect.item.register(selectPrefix + name);
     }
+
+    {
+        let name = "objectRelationQuery";
+        let currentSelect = new DbmGraphApi.range.select.ObjectRelationQuery();
+        currentSelect.item.register(selectPrefix + name);
+    }
 }
 
 export {fullSelectSetup};
@@ -133,6 +139,34 @@ let fullEncodeSetup = function() {
         currentEncode.item.register(encodePrefix + name);
         currentEncode.item.setValue("encodingType", name);
     }
+
+    {
+        let name = "relations";
+        let currentEncode = new DbmGraphApi.range.encode.Relations();
+        currentEncode.item.register(encodePrefix + name);
+        currentEncode.item.setValue("encodingType", name);
+    }
+
+    {
+        let name = "objectTypes";
+        let currentEncode = new DbmGraphApi.range.encode.ObjectTypes();
+        currentEncode.item.register(encodePrefix + name);
+        currentEncode.item.setValue("encodingType", name);
+    }
+
+    {
+        let name = "representingPage";
+        let currentEncode = new DbmGraphApi.range.encode.RepresentingPage();
+        currentEncode.item.register(encodePrefix + name);
+        currentEncode.item.setValue("encodingType", name);
+    }
+
+    {
+        let name = "pageRepresentation";
+        let currentEncode = new DbmGraphApi.range.encode.PageRepresentation();
+        currentEncode.item.register(encodePrefix + name);
+        currentEncode.item.setValue("encodingType", name);
+    }
 }
 
 export {fullEncodeSetup};
@@ -166,6 +200,7 @@ let fullActionSetup = function() {
     registerActionFunction("example", new DbmGraphApi.action.Example());
     registerActionFunction("incomingWebhook", new DbmGraphApi.action.IncomingWebhook());
     registerActionFunction("cron/processActions", new DbmGraphApi.action.cron.ProcessActions());
+    registerActionFunction("admin/addAndProcessAction", new DbmGraphApi.action.admin.AddAndProcessAction());
 }
 
 export {fullActionSetup};

package/src/dbm-graph-api/range/encode/ObjectTypes.js

@@ -0,0 +1,19 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class ObjectTypes extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        returnObject["objectTypes"] = await object.getObjectTypes();
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/PageRepresentation.js

@@ -0,0 +1,19 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class PageRepresentation extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        returnObject["representing"] = await aEncodingSession.encodeObjectOrNull(await object.singleObjectRelationQuery("out:pageRepresentationFor:*"), "objectTypes");
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/Relations.js

@@ -0,0 +1,23 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class Relations extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+
+        let object = database.getObject(aId);
+
+        let relations = await database.getAllRelations(aId);
+
+        returnObject["relations"] = relations;
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/RepresentingPage.js

@@ -0,0 +1,22 @@
+import Dbm from "dbm";
+import EncodeBaseObject from "./EncodeBaseObject.js";
+
+export default class RepresentingPage extends EncodeBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async getEncodedData(aId, aEncodingSession) {
+
+        let returnObject = {};
+
+        let object = Dbm.getInstance().repository.getItem("graphDatabase").controller.getObject(aId);
+
+        let representingPage = await object.singleObjectRelationQuery("in:pageRepresentationFor:*");
+
+        returnObject["representingPage"] = await aEncodingSession.encodeObjectOrNull(representingPage, "title");
+        await aEncodingSession.encodeObjectOrNull(representingPage, "url");
+
+        return returnObject;
+    }
+}

package/src/dbm-graph-api/range/encode/UrlRequest.js

@@ -17,6 +17,7 @@ export default class UrlRequest extends EncodeBaseObject {
         await aEncodingSession.encodeSingle(aId, "content");
         await aEncodingSession.encodeSingle(aId, "url");
         await aEncodingSession.encodeSingle(aId, "navigationName");
+        await aEncodingSession.encodeSingle(aId, "pageRepresentation");
 
         let fields = await object.getFields();
         returnObject["meta/description"] = fields["meta/description"] ? fields["meta/description"] : null;

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

@@ -11,4 +11,8 @@ export {default as Breadcrumb} from "./Breadcrumb.js";
 export {default as NavigationName} from "./NavigationName.js";
 export {default as Type} from "./Type.js";
 export {default as Image} from "./Image.js";
-export {default as Visibility} from "./Visibility.js";
+export {default as Visibility} from "./Visibility.js";
+export {default as Relations} from "./Relations.js";
+export {default as ObjectTypes} from "./ObjectTypes.js";
+export {default as RepresentingPage} from "./RepresentingPage.js";
+export {default as PageRepresentation} from "./PageRepresentation.js";

package/src/dbm-graph-api/range/select/ObjectRelationQuery.js

@@ -0,0 +1,32 @@
+import Dbm from "dbm";
+
+import SelectBaseObject from "./SelectBaseObject.js";
+
+export default class ObjectRelationQuery extends SelectBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async select(aQuery, aData, aRequest) {
+        //console.log("ObjectRelationQuery::select");
+
+        if(!aData["path"]) {
+            throw("Parameter path not set");
+        }
+        if(!aData["fromIds"]) {
+            throw("Parameter fromIds not set");
+        }
+
+        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+
+        let fromIds = Dbm.utils.ArrayFunctions.numericArrayOrSeparatedString(aData["fromIds"]);
+
+        let ids = await database.objectRelationQuery(fromIds, aData["path"]);
+
+        await aQuery.includeOnly(ids);
+    }
+
+    async filter(aIds, aData, aRequest) {
+        return aIds;
+    }
+}

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

@@ -2,4 +2,5 @@ export {default as SelectBaseObject} from "./SelectBaseObject.js";
 export {default as IdSelection} from "./IdSelection.js";
 export {default as ByObjectType} from "./ByObjectType.js";
 export {default as IncludePrivate} from "./IncludePrivate.js";
-export {default as IncludeDraft} from "./IncludeDraft.js";
+export {default as IncludeDraft} from "./IncludeDraft.js";
+export {default as ObjectRelationQuery} from "./ObjectRelationQuery.js";