dbm-graph-api 1.1.4 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbm-graph-api",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "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.3",
+    "dbm": "^1.1.4",
     "ws": "^8.18.0"
   },
   "optionalDependencies": {

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

@@ -130,6 +130,9 @@ export default class UrlRequest extends Dbm.core.BaseObject {
 		if(dataFunctionItem) {
 			returnData = await dataFunctionItem.controller.getData(aData, encodeSession);
 		}
+		else {
+			this._logs.push("No function named " + aFunctionName);
+		}
 
 		this._responseData = returnData;
 	}
@@ -230,7 +233,7 @@ export default class UrlRequest extends Dbm.core.BaseObject {
 		let user = await this.getUser();
 
 		if(!user) {
-			throw("Only signed in users can use this endpoint");
+			throw(new Error("Only signed in users can use this endpoint"));
 		}
 
 		return true;

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

@@ -58,56 +58,61 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                 let ids = [];
                 let logs = [];
 
-                {
-                    let hasSelection = false;
-                    let currentArray = data.select;
-                    let currentArrayLength = currentArray.length;
-                    for(let i = 0; i < currentArrayLength; i++) {
-                        let currentSelectData = currentArray[i];
-                        let currentSelectType = currentSelectData["type"];
-                        let selection = Dbm.getInstance().repository.getItemIfExists("graphApi/range/select/" + currentSelectType);
-                        if(selection) {
-                            hasSelection = true;
-                            await selection.controller.select(selectQuery, currentSelectData, request);
-                        }
-                        else {
-                            logs.push("No selection named " + currentSelectType);
-                        }
-                    }
-
-                    if(hasSelection) {
-                        ids = await selectQuery.getIds();
-    
+                try {
+                    {
+                        let hasSelection = false;
+                        let currentArray = data.select;
+                        let currentArrayLength = currentArray.length;
                         for(let i = 0; i < currentArrayLength; i++) {
                             let currentSelectData = currentArray[i];
                             let currentSelectType = currentSelectData["type"];
                             let selection = Dbm.getInstance().repository.getItemIfExists("graphApi/range/select/" + currentSelectType);
                             if(selection) {
-                                ids = await selection.controller.filter(ids, currentSelectData, request);
+                                hasSelection = true;
+                                await selection.controller.select(selectQuery, currentSelectData, request);
+                            }
+                            else {
+                                logs.push("No selection named " + currentSelectType);
                             }
                         }
-                    }
-                    else {
-                        logs.push("No valid selections");
+    
+                        if(hasSelection) {
+                            ids = await selectQuery.getIds();
+        
+                            for(let i = 0; i < currentArrayLength; i++) {
+                                let currentSelectData = currentArray[i];
+                                let currentSelectType = currentSelectData["type"];
+                                let selection = Dbm.getInstance().repository.getItemIfExists("graphApi/range/select/" + currentSelectType);
+                                if(selection) {
+                                    ids = await selection.controller.filter(ids, currentSelectData, request);
+                                }
+                            }
+                        }
+                        else {
+                            logs.push("No valid selections");
+                        }
+                        
                     }
                     
-                }
-                
-                {
-                    let encodeSession = new DbmGraphApi.range.EncodeSession();
-                    encodeSession.outputController = this;
-
-                    let currentArray = data.encode;
-                    let currentArrayLength = currentArray.length;
-                    for(let i = 0; i < currentArrayLength; i++) {
-                        let currentType = currentArray[i];
-                        
-                        await encodeSession.encode(ids, currentType);
+                    {
+                        let encodeSession = new DbmGraphApi.range.EncodeSession();
+                        encodeSession.outputController = this;
+    
+                        let currentArray = data.encode;
+                        let currentArrayLength = currentArray.length;
+                        for(let i = 0; i < currentArrayLength; i++) {
+                            let currentType = currentArray[i];
+                            
+                            await encodeSession.encode(ids, currentType);
+                        }
+    
+                        encodeSession.destroy();
                     }
-
-                    encodeSession.destroy();
                 }
-                
+                catch(theError) {
+                    logs.push(theError.message);
+                }
+
                 this._webSocket.send(JSON.stringify({"type": "range/response", "ids": ids, "requestId": data["requestId"], "logs": logs}));
                 break;
             case "data":
@@ -133,11 +138,18 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     let dataFunctionItem = Dbm.getInstance().repository.getItemIfExists("graphApi/action/" + data['functionName']);
                     
                     let returnData = null;
-                    if(dataFunctionItem) {
-                        returnData = await dataFunctionItem.controller.performAction(data['data'], encodeSession);
+                    let logs = [];
+
+                    try {
+                        if(dataFunctionItem) {
+                            returnData = await dataFunctionItem.controller.performAction(data['data'], encodeSession);
+                        }
+                    }
+                    catch(theError) {
+                        logs.push(theError.message);
                     }
 
-                    this._webSocket.send(JSON.stringify({"type": "data/response", "data": returnData, "requestId": data["requestId"]}));
+                    this._webSocket.send(JSON.stringify({"type": "data/response", "data": returnData, "requestId": data["requestId"], "logs": logs}));
                 }
                 break;
             case "item":
@@ -216,7 +228,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
                     }
                     
                     
-                    this._webSocket.send(JSON.stringify({"type": "item/response", "id": newObject.id, "requestId": data["requestId"]}));
+                    this._webSocket.send(JSON.stringify({"type": "item/response", "id": returnId, "requestId": data["requestId"]}));
                 }
                 break;
             case "admin/editObject":
@@ -320,10 +332,15 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 
     setInitialUser(aId) {
 
-        let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
+        if(aId) {
+            let database = Dbm.getInstance().repository.getItem("graphDatabase").controller;
 
-        let user = database.getUser(aId);
-        this.item.setValue("user", user);
+            let user = database.getUser(aId);
+            this.item.setValue("user", user);
+        }
+        else {
+            this.item.setValue("user", null);
+        }
 
         this._webSocket.send(JSON.stringify({"type": "connectionReady", "user": aId}));
     }
@@ -336,7 +353,7 @@ export default class WebSocketConnection extends Dbm.core.BaseObject {
 		let user = await this.getUser();
 
 		if(!user) {
-			throw("Only signed in users can use this endpoint");
+			throw(new Error("Only signed in users can use this endpoint"));
 		}
 
 		return true;

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

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

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

@@ -4,6 +4,7 @@ export {default as EditBaseObject} from "./EditBaseObject.js";
 export {default as SetField} from "./SetField.js";
 export {default as SetIdentifier} from "./SetIdentifier.js";
 export {default as SetUrl} from "./SetUrl.js";
+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";
@@ -28,6 +29,12 @@ export const fullSetup = function() {
         currentSelect.item.register(prefix + name);
     }
 
+    {
+        let name = "setVisibility";
+        let currentSelect = new DbmGraphApi.admin.edit.SetVisibility();
+        currentSelect.item.register(prefix + name);
+    }
+
     {
         let name = "addIncomingRelation";
         let currentSelect = new DbmGraphApi.admin.edit.AddIncomingRelation();

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

@@ -33,6 +33,12 @@ let fullSelectSetup = function() {
         let currentSelect = new DbmGraphApi.range.select.IncludePrivate();
         currentSelect.item.register(selectPrefix + name);
     }
+
+    {
+        let name = "includeDraft";
+        let currentSelect = new DbmGraphApi.range.select.IncludeDraft();
+        currentSelect.item.register(selectPrefix + name);
+    }
 }
 
 export {fullSelectSetup};
@@ -115,6 +121,13 @@ let fullEncodeSetup = function() {
         currentEncode.item.register(encodePrefix + name);
         currentEncode.item.setValue("encodingType", name);
     }
+
+    {
+        let name = "visibility";
+        let currentEncode = new DbmGraphApi.range.encode.Visibility();
+        currentEncode.item.register(encodePrefix + name);
+        currentEncode.item.setValue("encodingType", name);
+    }
 }
 
 export {fullEncodeSetup};

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

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

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

@@ -10,4 +10,5 @@ export {default as Url} from "./Url.js";
 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 Image} from "./Image.js";
+export {default as Visibility} from "./Visibility.js";

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

@@ -0,0 +1,19 @@
+import Dbm from "dbm";
+
+import SelectBaseObject from "./SelectBaseObject.js";
+
+export default class IncludeDraft extends SelectBaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    async select(aQuery, aData, aRequest) {
+        await aRequest.connection.requireRole("admin");
+
+        aQuery.includeDraft();
+    }
+
+    async filter(aIds, aData, aRequest) {
+        return aIds;
+    }
+}

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

@@ -8,8 +8,6 @@ export default class IncludePrivate extends SelectBaseObject {
     }
 
     async select(aQuery, aData, aRequest) {
-        //METODO: check that we are allowed
-
         await aRequest.connection.requireRole("admin");
 
         aQuery.includePrivate();

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

@@ -1,4 +1,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 IncludePrivate} from "./IncludePrivate.js";
+export {default as IncludeDraft} from "./IncludeDraft.js";