@steedos/service-pages 2.2.3 → 2.2.4

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

@@ -0,0 +1,264 @@
+const objectql = require('@steedos/objectql');
+
+const _ = require('lodash');
+
+module.exports = {
+    name: "page",
+    mixins: [],
+    /**
+     * Settings
+     */
+    settings: {
+
+    },
+
+    /**
+     * Dependencies
+     */
+    dependencies: [],
+
+    /**
+     * Actions
+     */
+    actions: {
+        getMeSchema: {
+            async handler(ctx) {
+                const userSession = ctx.meta.user;
+                const { type, app, objectApiName, recordId, formFactor } = ctx.params;
+                return await this.getMeSchema(type, app, objectApiName, recordId, formFactor, userSession);
+            }
+        },
+        // enablePageVersion:{
+        //     rest: {
+        //         method: "GET",
+        //         path: "/pageSchema/enable/:pageVersionId"
+        //     },
+        //     params: {
+        //         pageVersionId: { type: "any" }
+        //     },
+        //     async handler(ctx) {
+        //         const userSession = ctx.meta.user;
+        //         const { pageVersionId } = ctx.params;
+        //         return await this.enablePageVersion(pageVersionId, userSession);
+        //     }
+        // },
+        getLatestPageVersion:{
+            rest: {
+                method: "GET",
+                path: "/pageVersion/:pageId/latest"
+            },
+            params: {
+                pageId: { type: "any" }
+            },
+            async handler(ctx){
+                const userSession = ctx.meta.user;
+                const { pageId } = ctx.params;
+                return await this.getLatestPageVersion(pageId, userSession);
+            }
+        },
+        changePageVersion:{
+            rest: {
+                method: "PUT",
+                path: "/pageVersion/:pageId"
+            },
+            params: {
+                pageId: { type: "any" },
+                schema: { type: "any" }
+            },
+            async handler(ctx){
+                const userSession = ctx.meta.user;
+                const { pageId, schema } = ctx.params;
+                return await this.changePageVersion(pageId, schema, userSession);
+            }
+        }
+    },
+
+    /**
+     * Events
+     */
+    events: {
+
+    },
+
+    /**
+     * Methods
+     */
+    methods: {
+        getDefaultSchema: {
+            async handler(type, app, objectApiName, formFactor, recordId, userSession) {
+                if (process.env.DEFAULT_PAGE_RENDER) {
+                    return await this.broker.call(`${process.env.DEFAULT_PAGE_RENDER}.getDefaultSchema`, {type, app, objectApiName, recordId, formFactor}, {
+                        meta: {
+                          user: userSession
+                        }
+                      })
+                }
+                return;
+            }
+        },
+        getTypePages: {
+            async handler(type, objectApiName, userSession) {
+                const filters = [['type', '=', type], ['is_archived', '=', true]];
+                if (type === 'list' || type === 'record' || type === 'form') {
+                    filters.push(['object_name', '=', objectApiName]);
+                }
+                return await objectql.getObject('pages').find({ filters: filters });
+            }
+        },
+        getAssignments: {
+            async handler(formFactor, typePages) {
+                if(!typePages || typePages.length < 1){
+                    return ;
+                }
+                const filters = [['page', 'in', _.map(typePages, '_id')]];
+                if(formFactor === 'SMALL'){
+                    filters.push(['mobile','=', true])
+                }else{
+                    filters.push(['desktop','=', true])
+                }
+                return await objectql.getObject("page_assignments").find({ filters: filters });
+            }
+        },
+        getAppProfileAssignment: {
+            async handler(app, assignments, userSession) {
+                return _.filter(assignments, (assignment) => {
+                    //TODO Record Type
+                    return assignment.app === app && arguments.profile === userSession.profile;
+                });
+            }
+        },
+        getAppDefaultAssignment: {
+            async handler(app, assignments) {
+                return _.filter(assignments, (assignment) => {
+                    return assignment.app === app;
+                });
+            }
+        },
+        getOrgDefaultAssignment: {
+            async handler(assignments) {
+                return _.filter(assignments, (assignment) => {
+                    return !assignment.app && !assignment.profile
+                })
+            }
+        },
+        getAssignmentPage: {
+            async handler(assignment, typePages) {
+                const page = _.find(typePages, (typePage) => {
+                    return typePage.name == assignment.page || typePage._id == assignment.page
+                })
+                if (page) {
+                    return page;
+                }
+                // else {
+                //     throw new Error(`not find assignment page ${assignment.desktop}`)
+                // }
+            }
+        },
+        getUserPage: {
+            /**
+             * 自定义记录页面可在不同层面上分配：
+             * 1 组织默认设置 记录页面会为对象显示，除非已进行更多特定分配。
+             * 2 如果已指定，则应用程序默认设置 页面分配会覆盖组织默认设置。
+             * 3 应用程序、记录类型和简档, 分配会覆盖组织和应用程序默认设置。
+             * 
+             * TODO form factors "LARGE","SMALL"
+             * TODO 页面分配有多条时的优先级处理（始终是最新的分配生效）。
+             */
+            async handler(type, app, objectApiName, recordId, formFactor, userSession) {
+
+                try {
+                    const typePages = await this.getTypePages(type, objectApiName, userSession);
+                    const assignments = await this.getAssignments(formFactor, typePages);
+
+                    const appProfileassignment = await this.getAppProfileAssignment(app, assignments, userSession);
+                    if (appProfileassignment && appProfileassignment.length > 0) {
+                        return await this.getAssignmentPage(appProfileassignment[0], typePages)
+                    }
+
+                    const appDefaultAssignment = await this.getAppDefaultAssignment(app, assignments);
+                    if (appDefaultAssignment && appDefaultAssignment.length > 0) {
+                        return await this.getAssignmentPage(appDefaultAssignment[0], typePages)
+                    }
+
+                    const orgDefaultAssignment = await this.getOrgDefaultAssignment(assignments);
+                    if (orgDefaultAssignment && orgDefaultAssignment.length > 0) {
+                        return await this.getAssignmentPage(orgDefaultAssignment[0], typePages)
+                    }
+                } catch (error) {
+                    console.error(`error`, error);
+                    return ;
+                }
+            }
+        },
+        getMeSchema: {
+            async handler(type, app, objectApiName, recordId, formFactor, userSession) {
+                // 计算 userSchema
+                const userPage = await this.getUserPage(type, app, objectApiName, recordId, formFactor, userSession);
+                if (userPage) {
+                    const pageVersion = await this.getLatestPageVersion(userPage._id, true);
+                    if(pageVersion && pageVersion.schema){
+                        return Object.assign({}, userPage, {schema: pageVersion.schema});
+                    }
+                }
+                const defaultSchema = await this.getDefaultSchema(type, app, objectApiName, recordId, formFactor, userSession);
+                if(defaultSchema){
+                    return {schema: defaultSchema}
+                }
+            }
+        },
+        getLatestPageVersion:{
+            async handler(pageId, isArchived) {
+                const filters = [['page', '=', pageId]];
+                if(isArchived){
+                    filters.push(['is_archived','=',true])
+                }
+                // 根据pageId 获取 page version
+                const pageVersions = await objectql.getObject('page_versions').find({filters: filters, sort: 'version desc', top: 1});
+                if(pageVersions.length === 1){
+                    return pageVersions[0]
+                }
+            }
+        },
+        changePageVersion: {
+            async handler(pageId, schema, userSession) {
+                // 根据pageId 获取 pageversions
+                const pageVersion = await this.getLatestPageVersion(pageId);
+                let version = pageVersion ? pageVersion.version :0;
+                if(pageVersion && !pageVersion.is_archived){
+                    return await objectql.getObject('page_versions').update(pageVersion._id, {
+                        schema: schema
+                    }, userSession);
+                }else{
+                    return await objectql.getObject('page_versions').insert({
+                        page: pageId,
+                        is_archived: false,
+                        schema: schema,
+                        version: ++version,
+                        space: userSession.spaceId
+                    }, userSession) 
+                }
+            }
+        },
+    },
+
+    /**
+     * Service created lifecycle event handler
+     */
+    async created() {
+
+    },
+
+    /**
+     * Service started lifecycle event handler
+     */
+    async started() {
+
+    },
+
+    /**
+     * Service stopped lifecycle event handler
+     */
+    async stopped() {
+
+    }
+};

package/main/default/triggers/page_versions.enable.trigger.js

@@ -0,0 +1,15 @@
+const objectql = require('@steedos/objectql');
+const _ = require('underscore');
+
+module.exports = {
+    listenTo: 'page_versions',
+    afterUpdate: async function(){
+        const {id, doc, previousDoc} = this;
+        if(_.has(doc, 'is_archived') && doc.is_archived && previousDoc.is_archived != doc.is_archived ){
+            const record = await objectql.getObject('page_versions').findOne(id)
+            await objectql.getObject('pages').directUpdate(record.page, {
+                is_archived: true
+            })
+        }
+    }
+}

package/main/default/triggers/pages_metadata.trigger.js

@@ -24,52 +24,17 @@ module.exports = {
     listenTo: 'pages',
 
     afterFind: async function(){
-        let filters = objectql.parserFilters(this.query.filters)
-        let dataList = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            id = id.replace(/\\/g, '');
-            let data = await get(id);
-            if(data){
-                dataList = [data]
-            }
-        }else{
-            dataList = await getAll();
-            if(filters.name){
-                dataList = _.filter(dataList, (item)=>{
-                    return item.name == filters.name
-                })
-            }
-        }
+        let spaceId = this.spaceId;
+        this.data.values = this.data.values.concat(await getAll());
+
+        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
 
-        if(dataList){
-            const dbRecrodsName = _.pluck(this.data.values, 'name');
-            this.data.values = this.data.values.concat(_.filter(dataList, function(data){return data._id == data.name && !_.include(dbRecrodsName, data.name) }))
-        }
     },
     afterAggregate: async function(){
-        let filters = objectql.parserFilters(this.query.filters)
-        let dataList = []
-        if(filters._id && !filters._id.$ne){
-            let id = filters._id
-            id = id.replace(/\\/g, '');
-            let data = await get(id);
-            if(data){
-                dataList = [data]
-            }
-        }else{
-            dataList = await getAll();
-            if(filters.name){
-                dataList = _.filter(dataList, (item)=>{
-                    return item.name == filters.name
-                })
-            }
-        }
+        let spaceId = this.spaceId;
+        this.data.values = this.data.values.concat(await getAll());
 
-        if(dataList){
-            const dbRecrodsName = _.pluck(this.data.values, 'name');
-            this.data.values = this.data.values.concat(_.filter(dataList, function(data){return data._id == data.name && !_.include(dbRecrodsName, data.name) }))
-        }
+        this.data.values = objectql.getSteedosSchema().metadataDriver.find(this.data.values, this.query, spaceId);
     },
     afterCount: async function(){
         let result = await objectql.getObject(this.object_name).find(this.query, await auth.getSessionByUserId(this.userId, this.spaceId))
@@ -77,11 +42,11 @@ module.exports = {
     },
     afterFindOne: async function(){
         if(_.isEmpty(this.data.values)){
-            let id = this.id
-            let data = await get(id);
-            if(data){
-                this.data.values = data;
-            }
+            const all = await getAll();
+            const id = this.id;
+            this.data.values = _.find(all, function(item){
+                return item._id === id
+            });
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-pages",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "main": "package.service.js",
   "scripts": {},
   "license": "MIT",
@@ -11,5 +11,5 @@
   "dependencies": {
     "@builder.io/react": "^1.1.50"
   },
-  "gitHead": "57dfca5cd66528b2fbe6878f73f2e84b915d5e32"
+  "gitHead": "a0c0e8d900f7f4fd2045d976b36c9bef465a6ce3"
 }

package/package.service.js

@@ -158,24 +158,24 @@ module.exports = {
 	methods: {
 		initBuilderRouter: {
 			handler() {
-				if (this.settings.initBuilderRouter) {
-					return;
-				}
-				this.settings.initBuilderRouter = true;
-				try {
-					const router = express.Router();
-					let publicPath = path.join(__dirname, 'public');
-					let routerPath = "";
-					if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
-						routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
-					}
-					const cacheTime = 86400000 * 1; // one day
-					router.use(routerPath, express.static(publicPath, { maxAge: cacheTime }));
-					WebApp.rawConnectHandlers.use(router);
-				} catch (error) {
-					console.error(error)
-					this.settings.initBuilderRouter = false;
-				}
+				// if (this.settings.initBuilderRouter) {
+				// 	return;
+				// }
+				// this.settings.initBuilderRouter = true;
+				// try {
+				// 	const router = express.Router();
+				// 	let publicPath = path.join(__dirname, 'public');
+				// 	let routerPath = "";
+				// 	if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX) {
+				// 		routerPath = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
+				// 	}
+				// 	const cacheTime = 86400000 * 1; // one day
+				// 	router.use(routerPath, express.static(publicPath, { maxAge: cacheTime }));
+				// 	WebApp.rawConnectHandlers.use(router);
+				// } catch (error) {
+				// 	console.error(error)
+				// 	this.settings.initBuilderRouter = false;
+				// }
 			}
 		},
 	},

package/main/default/client/amis.client.js

@@ -1,47 +0,0 @@
-; (function () {
-    try {
-        let amisStyle = document.createElement("link");
-        amisStyle.setAttribute("rel", "stylesheet");
-        amisStyle.setAttribute("type", "text/css");
-        amisStyle.setAttribute("href", "/amis/amis.css");
-        document.getElementsByTagName("head")[0].appendChild(amisStyle);
-    } catch (error) {
-        console.error(error)
-    }
-    import('/amis/sdk/sdk.js').then(() => {
-        //处理mobx多个实例问题
-        try {
-            let mobx = amisRequire('mobx');
-            mobx.configure({ isolateGlobalState: true })
-        } catch (error) {
-
-        }
-
-        var __importDefault = (this && this.__importDefault) || function (mod) {
-            return (mod && mod.__esModule) ? mod : { "default": mod };
-        };
-        var react_1 = __importDefault(require("react"));
-        // Register amis render 
-        var Amis = function (props) {
-            var schema = props.schema, data = props.data;
-            return react_1.default.createElement(react_1.default.Fragment, null,
-                react_1.default.createElement("div", { id: "amis-root" }),
-                // amisRequire('amis').render(schema, data),
-                function () {
-                    setTimeout(function () {
-                        amisRequire('amis/embed').embed('#amis-root', schema, data)
-                    }, 100)
-                }()
-            );
-
-        };
-
-        BuilderReact.Builder.registerComponent(Amis, {
-            name: 'Amis',
-            inputs: [
-                { name: 'schema', type: 'object' },
-                { name: 'data', type: 'object' }
-            ]
-        })
-    });
-})();

package/main/default/client/style.client.js

@@ -1,12 +0,0 @@
-(function () {
-    try {
-        var styleCss = $(`<style>
-            .steedos .creator-content-wrapper .steedos-page .page-header-wrapper{
-                display: none;
-            }
-        </style>`);
-        $("head").append(styleCss);
-    } catch (error) {
-        console.log(error);
-    }
-})();

package/main/default/objects/pages/fields/is_default.field.yml

@@ -1,5 +0,0 @@
-name: is_default
-type: toggle
-label: 默认
-sort_no: 200
-hidden: true

package/public/amis/amis.css

@@ -1,29 +0,0 @@
-@import '/amis/sdk/sdk.css';
-
-
-/* .amis-routes-wrapper{
-    width: 100%;
-} */
-
-.amis-scope{
-    background: none;
-}
-
-.amis-scope svg {
-    display: inline !important;
-    vertical-align: initial !important;
-}
-
-/* .row-main{
-    border-radius: 0.25rem
-} */
-
-.amis-scope .a-Form-item--horizontal.col-span-2 .a-Form-itemColumn--2 {
-    flex: 0 0 calc(8.33333333335% - 2px);
-    max-width: calc(8.33333333335% - 2px);
-}
-
-.a-Table svg {
-    display: inline !important;
-    vertical-align: initial !important;
-}