@ruiapp/rapid-core 0.9.9 → 0.10.1

package/CHANGELOG.md

@@ -1,11 +1,11 @@
-# @ruiapp/rapid-core
-
-## 0.7.0
-
-- feature: added server.registerCronJob to allow plugins register cron jobs.
-
-## 0.2.4
-
-### Patch Changes
-
-- 146a99d: add between filterMode, range is deprecated
+# @ruiapp/rapid-core
+
+## 0.7.0
+
+- feature: added server.registerCronJob to allow plugins register cron jobs.
+
+## 0.2.4
+
+### Patch Changes
+
+- 146a99d: add between filterMode, range is deprecated

package/dist/bootstrapApplicationConfig.d.ts

@@ -435,6 +435,57 @@ declare const _default: {
             description?: undefined;
         })[];
         indexes?: undefined;
+    } | {
+        maintainedBy: string;
+        namespace: string;
+        name: string;
+        code: string;
+        singularCode: string;
+        pluralCode: string;
+        schema: string;
+        tableName: string;
+        properties: ({
+            name: string;
+            code: string;
+            columnName: string;
+            type: "integer";
+            required: true;
+            autoIncrement: true;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "text";
+            required: true;
+            autoIncrement?: undefined;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "text";
+            required: false;
+            autoIncrement?: undefined;
+        } | {
+            name: string;
+            code: string;
+            columnName: string;
+            type: "json";
+            required: false;
+            autoIncrement?: undefined;
+        })[];
+        indexes: ({
+            name: string;
+            properties: {
+                code: string;
+            }[];
+            unique: true;
+        } | {
+            name: string;
+            properties: {
+                code: string;
+            }[];
+            unique?: undefined;
+        })[];
     })[];
     dataDictionaries: any[];
     routes: {

package/dist/index.js

@@ -1385,6 +1385,13 @@ var bootstrapApplicationConfig = {
                     required: true,
                     defaultValue: "false",
                 },
+                {
+                    name: "defaultOrderBy",
+                    code: "defaultOrderBy",
+                    columnName: "default_order_by",
+                    type: "json",
+                    required: false,
+                },
             ],
             indexes: [
                 {
@@ -1968,6 +1975,114 @@ var bootstrapApplicationConfig = {
                 },
             ],
         },
+        {
+            maintainedBy: "metaManager",
+            namespace: "meta",
+            name: "page",
+            code: "Page",
+            singularCode: "page",
+            pluralCode: "pages",
+            schema: "public",
+            tableName: "meta_pages",
+            properties: [
+                {
+                    name: "id",
+                    code: "id",
+                    columnName: "id",
+                    type: "integer",
+                    required: true,
+                    autoIncrement: true,
+                },
+                {
+                    name: "code",
+                    code: "code",
+                    columnName: "code",
+                    type: "text",
+                    required: true,
+                },
+                {
+                    name: "parentCode",
+                    code: "parentCode",
+                    columnName: "parent_code",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "subSystem",
+                    code: "subSystem",
+                    columnName: "sub_system",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "appCode",
+                    code: "appCode",
+                    columnName: "app_code",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "routePath",
+                    code: "routePath",
+                    columnName: "route_path",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "name",
+                    code: "name",
+                    columnName: "name",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "title",
+                    code: "title",
+                    columnName: "title",
+                    type: "text",
+                    required: false,
+                },
+                {
+                    name: "config",
+                    code: "config",
+                    columnName: "config",
+                    type: "json",
+                    required: false,
+                },
+                {
+                    name: "permissionCheck",
+                    code: "permissionCheck",
+                    columnName: "permission_check",
+                    type: "json",
+                    required: false,
+                },
+            ],
+            indexes: [
+                {
+                    name: "meta_pages_code_uindex",
+                    properties: [
+                        {
+                            code: "code",
+                        },
+                    ],
+                    unique: true,
+                },
+                {
+                    name: "meta_pages_subsystem_appcode_code_idx",
+                    properties: [
+                        {
+                            code: "subSystem",
+                        },
+                        {
+                            code: "appCode",
+                        },
+                        {
+                            code: "code",
+                        },
+                    ],
+                },
+            ],
+        },
     ],
     dataDictionaries: [],
     routes: [
@@ -2868,8 +2983,8 @@ async function findManyRelationLinksViaLinkTable(options) {
     const command = `SELECT * FROM ${server.queryBuilder.quoteTable({
         schema: relationProperty.linkSchema,
         tableName: relationProperty.linkTableName,
-    })} WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = ANY($1::int[])
-    ORDER BY id
+    })} WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = ANY($1::int[])
+    ORDER BY id
   `;
     const params = [mainEntityIds];
     const relationLinks = await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
@@ -3500,7 +3615,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
             await server.queryDatabaseObject(`DELETE FROM ${server.queryBuilder.quoteTable({
                 schema: property.linkSchema,
                 tableName: property.linkTableName,
-            })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = $1
+            })} WHERE ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = $1
               AND ${server.queryBuilder.quoteObject(property.targetIdColumnName)} <> ALL($2::int[])`, [id, targetIdsToKeep], routeContext?.getDbTransactionClient());
         }
         else {
@@ -3529,8 +3644,8 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
                     await server.queryDatabaseObject(`UPDATE ${server.queryBuilder.quoteTable({
                         schema: relationModel.schema,
                         tableName: relationModel.tableName,
-                    })}
-            SET ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = null
+                    })}
+            SET ${server.queryBuilder.quoteObject(property.selfIdColumnName)} = null
             WHERE id = ANY($1::int[])`, [targetIdsToRemove], routeContext?.getDbTransactionClient());
                 }
                 else {
@@ -3815,7 +3930,7 @@ async function deleteEntityById(server, dataAccessor, options, plugin) {
                         await server.queryDatabaseObject(`DELETE FROM ${server.queryBuilder.quoteTable({
                             schema: relationProperty.linkSchema,
                             tableName: relationProperty.linkTableName,
-                        })}
+                        })}
               WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = $1`, [id], routeContext?.getDbTransactionClient());
                     }
                     else {
@@ -3825,8 +3940,8 @@ async function deleteEntityById(server, dataAccessor, options, plugin) {
                         await server.queryDatabaseObject(`UPDATE ${server.queryBuilder.quoteTable({
                             schema: relationModel.schema,
                             tableName: relationModel.tableName,
-                        })}
-              SET ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = null
+                        })}
+              SET ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = null
               WHERE ${server.queryBuilder.quoteObject(relationProperty.selfIdColumnName)} = $1`, [id], routeContext?.getDbTransactionClient());
                     }
                 }
@@ -3923,11 +4038,11 @@ class EntityManager {
                 const command = `INSERT INTO ${queryBuilder.quoteTable({
                     schema: relationProperty.linkSchema,
                     tableName: relationProperty.linkTableName,
-                })} (${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)})
-    SELECT $1, $2 WHERE NOT EXISTS (
-      SELECT ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}
-        FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
-        WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2
+                })} (${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)})
+    SELECT $1, $2 WHERE NOT EXISTS (
+      SELECT ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}, ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}
+        FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
+        WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2
       )`;
                 const params = [id, relation.id];
                 await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
@@ -3967,7 +4082,7 @@ class EntityManager {
         const { queryBuilder } = server;
         if (relationProperty.linkTableName) {
             for (const relation of relations) {
-                const command = `DELETE FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
+                const command = `DELETE FROM ${queryBuilder.quoteTable({ schema: relationProperty.linkSchema, tableName: relationProperty.linkTableName })}
     WHERE ${queryBuilder.quoteObject(relationProperty.selfIdColumnName)}=$1 AND ${queryBuilder.quoteObject(relationProperty.targetIdColumnName)}=$2;`;
                 const params = [id, relation.id];
                 await server.queryDatabaseObject(command, params, routeContext?.getDbTransactionClient());
@@ -5587,7 +5702,7 @@ class MetaService {
         const tablesInDb = await server.queryDatabaseObject(sqlQueryTableInformations);
         const { queryBuilder } = server;
         for (const model of applicationConfig.models) {
-            logger.debug(`Checking data table for '${model.namespace}.${model.singularCode}'...`);
+            logger.info(`Checking data table for '${model.namespace}.${model.singularCode}'...`);
             const expectedTableSchema = model.schema || server.databaseConfig.dbDefaultSchema;
             const expectedTableName = model.tableName;
             const tableInDb = lodash.find(tablesInDb, { table_schema: expectedTableSchema, table_name: expectedTableName });
@@ -5598,13 +5713,13 @@ class MetaService {
                 await server.tryQueryDatabaseObject(`COMMENT ON TABLE ${queryBuilder.quoteTable(model)} IS ${queryBuilder.formatValueToSqlLiteral(model.name)};`, []);
             }
         }
-        const sqlQueryColumnInformations = `SELECT c.table_schema, c.table_name, c.column_name, c.ordinal_position, d.description, c.data_type,  c.udt_name, c.is_nullable, c.column_default, c.character_maximum_length, c.numeric_precision, c.numeric_scale
-      FROM information_schema.columns c
-      INNER JOIN pg_catalog.pg_statio_all_tables st ON (st.schemaname = c.table_schema and st.relname = c.table_name)
+        const sqlQueryColumnInformations = `SELECT c.table_schema, c.table_name, c.column_name, c.ordinal_position, d.description, c.data_type,  c.udt_name, c.is_nullable, c.column_default, c.character_maximum_length, c.numeric_precision, c.numeric_scale
+      FROM information_schema.columns c
+      INNER JOIN pg_catalog.pg_statio_all_tables st ON (st.schemaname = c.table_schema and st.relname = c.table_name)
       LEFT JOIN pg_catalog.pg_description d ON (d.objoid = st.relid and d.objsubid = c.ordinal_position);`;
         const columnsInDb = await server.queryDatabaseObject(sqlQueryColumnInformations, []);
         for (const model of applicationConfig.models) {
-            logger.debug(`Checking data columns for '${model.namespace}.${model.singularCode}'...`);
+            logger.info(`Checking data columns for '${model.namespace}.${model.singularCode}'...`);
             for (const property of model.properties) {
                 let columnDDL = "";
                 if (isRelationProperty(property)) {
@@ -5745,7 +5860,7 @@ class MetaService {
             const expectedTableSchema = model.schema || server.databaseConfig.dbDefaultSchema;
             const expectedTableName = model.tableName;
             const expectedContraintName = `${expectedTableName}_pk`;
-            logger.debug(`Checking pk for '${expectedTableSchema}.${expectedTableName}'...`);
+            logger.info(`Checking pk for '${expectedTableSchema}.${expectedTableName}'...`);
             const constraintInDb = lodash.find(constraintsInDb, {
                 table_schema: expectedTableSchema,
                 table_name: expectedTableName,
@@ -5761,7 +5876,7 @@ class MetaService {
             if (!model.indexes || !model.indexes.length) {
                 continue;
             }
-            logger.debug(`Creating indexes of table ${queryBuilder.quoteTable(model)}`);
+            logger.info(`Creating indexes of table ${queryBuilder.quoteTable(model)}`);
             for (const index of model.indexes) {
                 const sqlCreateIndex = generateTableIndexDDL(queryBuilder, server, model, index);
                 try {
@@ -7221,19 +7336,8 @@ async function handler$c(plugin, ctx, options) {
         };
         return;
     }
-    const userEntitySingularCode = plugin.options?.userEntitySingularCode || "oc_user";
-    const profilePropertyCodes = plugin.options?.profilePropertyCodes || ["id", "name", "login", "email", "department", "roles", "state", "createdAt"];
-    const entityManager = server.getEntityManager(userEntitySingularCode);
-    const user = await entityManager.findEntity({
-        filters: [
-            {
-                operator: "eq",
-                field: "id",
-                value: userId,
-            },
-        ],
-        properties: profilePropertyCodes,
-    });
+    const authService = server.getService("authService");
+    const user = await authService.getProfileOfUser(userId);
     ctx.output = {
         user,
     };
@@ -7412,9 +7516,13 @@ var pluginRoutes$7 = [changePassword, getMyProfile$1, resetPassword, signin$1, s
 class AuthService {
     #server;
     #jwtKey;
-    constructor(server, jwtKey) {
+    #userEntitySingularCode;
+    #profilePropertyCodes;
+    constructor(server, options) {
         this.#server = server;
-        this.#jwtKey = jwtKey;
+        this.#jwtKey = options.jwtKey;
+        this.#userEntitySingularCode = options.userEntitySingularCode;
+        this.#profilePropertyCodes = options.profilePropertyCodes;
     }
     createUserAccessToken(options) {
         const secretKey = Buffer.from(this.#jwtKey, "base64");
@@ -7427,6 +7535,22 @@ class AuthService {
         }, secretKey);
         return token;
     }
+    async getProfileOfUser(userId) {
+        const userEntitySingularCode = this.#userEntitySingularCode || "oc_user";
+        const profilePropertyCodes = this.#profilePropertyCodes || ["id", "name", "login", "email", "department", "roles", "state", "createdAt"];
+        const entityManager = this.#server.getEntityManager(userEntitySingularCode);
+        const user = await entityManager.findEntity({
+            filters: [
+                {
+                    operator: "eq",
+                    field: "id",
+                    value: userId,
+                },
+            ],
+            properties: profilePropertyCodes,
+        });
+        return user;
+    }
 }
 
 /**
@@ -7465,7 +7589,11 @@ class AuthPlugin {
         server.appendApplicationConfig({ models: pluginModels$6 });
     }
     async configureServices(server, applicationConfig) {
-        this.#authService = new AuthService(server, server.config.jwtKey);
+        this.#authService = new AuthService(server, {
+            jwtKey: server.config.jwtKey,
+            userEntitySingularCode: this.#options.userEntitySingularCode,
+            profilePropertyCodes: this.#options.profilePropertyCodes,
+        });
         server.registerService("authService", this.#authService);
     }
     async configureRoutes(server, applicationConfig) {
@@ -9763,9 +9891,9 @@ class EntityAccessControlPlugin {
         if (!userId) {
             return;
         }
-        const actions = await server.queryDatabaseObject(`select distinct a.* from sys_actions a
-      inner join oc_role_sys_action_links ra on a.id = ra.action_id
-      inner join oc_role_user_links ru on ru.role_id = ra.role_id
+        const actions = await server.queryDatabaseObject(`select distinct a.* from sys_actions a
+      inner join oc_role_sys_action_links ra on a.id = ra.action_id
+      inner join oc_role_user_links ru on ru.role_id = ra.role_id
       where ru.user_id = $1;`, [userId]);
         routeContext.state.allowedActions = actions.map((item) => item.code);
     }

package/dist/plugins/auth/services/AuthService.d.ts

@@ -1,4 +1,9 @@
 import { IRpdServer } from "../../../core/server";
+export type AuthServiceOptions = {
+    jwtKey: string;
+    userEntitySingularCode?: string;
+    profilePropertyCodes?: string[];
+};
 export interface UserAccessToken {
     sub: "userAccessToken";
     aud: string;
@@ -10,6 +15,7 @@ export interface CreateUserAccessTokenOptions {
 }
 export default class AuthService {
     #private;
-    constructor(server: IRpdServer, jwtKey: string);
+    constructor(server: IRpdServer, options: AuthServiceOptions);
     createUserAccessToken(options: CreateUserAccessTokenOptions): string;
+    getProfileOfUser(userId: number): Promise<any>;
 }

package/dist/types.d.ts

@@ -211,6 +211,10 @@ export interface RpdDataModel {
      * Configure the property code used to display the entity.
      */
     displayPropertyCode?: string;
+    /**
+     * 默认排序方式
+     */
+    defaultOrderBy?: FindEntityOrderByOptions[];
     properties: RpdDataModelProperty[];
     indexes?: RpdDataModelIndex[];
     extensions?: RpdDataModelExtension[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.9.9",
+  "version": "0.10.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/rollup.config.js

@@ -1,16 +1,16 @@
-import typescript from "rollup-plugin-typescript2";
-import tscAlias from "rollup-plugin-tsc-alias";
-
-export default {
-  input: ["src/index.ts"],
-  output: [
-    {
-      dir: "dist",
-      entryFileNames: "[name].js",
-      format: "cjs",
-      exports: "named",
-    },
-  ],
-  plugins: [typescript(), tscAlias()],
-  external: [],
-};
+import typescript from "rollup-plugin-typescript2";
+import tscAlias from "rollup-plugin-tsc-alias";
+
+export default {
+  input: ["src/index.ts"],
+  output: [
+    {
+      dir: "dist",
+      entryFileNames: "[name].js",
+      format: "cjs",
+      exports: "named",
+    },
+  ],
+  plugins: [typescript(), tscAlias()],
+  external: [],
+};