@steedos/service-pages 2.2.20 → 2.2.21

package/main/default/routes/design.html

@@ -14,17 +14,62 @@
         var params = new URLSearchParams(location.search);
         var pageId = params.get("pageId");
         // /pageVersion/:pageId/latest
-
+        const dataContext = DataContext;
         axios.get(`/service/api/page/pageVersion/${params.get("pageId")}/latest`).then(function (response) {
-            let schema = response.data?.schema;
+            let result = response.data;
+            
+            let schema = result?.schema;
+            let objectName = result?.object_name;
+            let pageType = result?.type;
             if (typeof schema === "string") {
                 schema = JSON.parse(schema)
             }
-            const data = {
-                AmisSchema: schema || {}
-            };
-            console.log("record data", data)
-            comp.data = data;
+            if(!schema){
+                schema = {
+                    "type": "page",
+                    "body": [],
+                    "regions": [
+                        "body"
+                    ]
+                };
+            }
+
+            if(!schema.data){
+                schema.data = {}
+            }
+
+            if(!schema.data.context){
+                schema.data.context = {}
+            }
+
+            schema.data.objectName = objectName;
+            
+            schema.data.context.rootUrl = dataContext.rootUrl;
+            schema.data.context.tenantId = dataContext.tenantId;
+            schema.data.context.userId = dataContext.userId;
+            schema.data.context.authToken = dataContext.authToken;
+
+            if(objectName && pageType === 'record'){
+                axios.get(`/api/v4/${objectName}?$orderby=modified&$top=1`).then(function (response) {
+                    const value = response.data?.value;
+                    if(value.length > 0){
+                        schema.data.recordId = value[0]._id;
+                    }
+                });
+                const data = {
+                    AmisSchema: schema
+                };
+                console.log("record data", data)
+                comp.data = data;
+            }else{
+                const data = {
+                    AmisSchema: schema
+                };
+                console.log("record data", data)
+                comp.data = data;
+            }
+
+            
         }).catch(function (error) {
             // handle error
             console.log(error);

package/main/default/routes/page_design.router.js

@@ -17,10 +17,18 @@ router.get('/api/pageDesign', core.requireAuthentication, async function (req, r
             const assetUrls = process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS.split(',');
             assetUrl = `assetUrl=${assetUrls.join("&assetUrl=")}&`;
         }
+
+        const dataContext = {
+            rootUrl: __meteor_runtime_config__.ROOT_URL,
+            tenantId: userSession.spaceId,
+            userId: userSession.userId,
+            authToken: userSession.authToken
+        }
+
         const steedosBuilderHost = `https://builder.steedos.com/amis?${assetUrl}rootUrl=${__meteor_runtime_config__.ROOT_URL}&authToken=${userSession.authToken}&userId=${userSession.userId}&tenantId=${userSession.spaceId}&__q=`;
 
         let data = fs.readFileSync(__dirname+'/design.html', 'utf8');
-        res.send(data.replace('SteedosBuilderHost',steedosBuilderHost));
+        res.send(data.replace('SteedosBuilderHost',steedosBuilderHost).replace('DataContext', JSON.stringify(dataContext)));
     } catch (error) {
         res.status(500).send({ message: error.message });
     }

package/main/default/services/page.service.js

@@ -90,7 +90,8 @@ module.exports = {
                 // const userSession = ctx.meta.user;
                 const { pageId } = ctx.params;
                 const pageVersion = await this.getLatestPageVersion(pageId);
-                return pageVersion || {}
+                const page = await objectql.getObject('pages').findOne(pageId)
+                return Object.assign(pageVersion || {}, {object_name: page.object_name, type: page.type})
             }
         },
         changePageVersion:{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.20",
+  "version": "2.2.21",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "a0462d803860690b47487ece88a0bbb380ba0f17"
+  "gitHead": "39204e6e65ded584d76363cebfdcbcb061238d38"
 }