@ruiapp/rapid-core 0.1.63 → 0.1.65

package/dist/helpers/entityHelpers.d.ts

@@ -1 +1,3 @@
-export declare function getEntityPartChanges(before: any, after: any): Record<string, any> | null;
+import { IRpdServer } from "../core/server";
+import { RpdDataModel } from "../types";
+export declare function getEntityPartChanges(server: IRpdServer, model: RpdDataModel, before: any, after: any): Record<string, any> | null;

package/dist/{dataAccess → helpers}/metaHelper.d.ts

@@ -1,5 +1,8 @@
 import { IRpdServer } from "../core/server";
 import { RpdDataModel, RpdDataModelProperty } from "../types";
+export declare function isRelationProperty(property: RpdDataModelProperty): boolean;
+export declare function isOneRelationProperty(property: RpdDataModelProperty): boolean;
+export declare function isManyRelationProperty(property: RpdDataModelProperty): boolean;
 export declare function getEntityProperties(server: IRpdServer, model: RpdDataModel): RpdDataModelProperty[];
 export declare function getEntityPropertiesIncludingBase(server: IRpdServer, model: RpdDataModel): RpdDataModelProperty[];
 export declare function getEntityPropertyByCode(server: IRpdServer, model: RpdDataModel, propertyCode: string): RpdDataModelProperty;

package/dist/index.js

@@ -1093,7 +1093,12 @@ function validateValue(name, value) {
         return;
     for (let i = 0; i < value.length; i++) {
         const c = value.charAt(i);
-        if (c < String.fromCharCode(0x21) || c == String.fromCharCode(0x22) || c == String.fromCharCode(0x2c) || c == String.fromCharCode(0x3b) || c == String.fromCharCode(0x5c) || c == String.fromCharCode(0x7f)) {
+        if (c < String.fromCharCode(0x21) ||
+            c == String.fromCharCode(0x22) ||
+            c == String.fromCharCode(0x2c) ||
+            c == String.fromCharCode(0x3b) ||
+            c == String.fromCharCode(0x5c) ||
+            c == String.fromCharCode(0x7f)) {
             throw new Error("RFC2616 cookie '" + name + "' cannot contain character '" + c + "'");
         }
         if (c > String.fromCharCode(0x80)) {
@@ -1340,6 +1345,13 @@ var bootstrapApplicationConfig = {
                     type: "text",
                     required: false,
                 },
+                {
+                    name: "displayPropertyCode",
+                    code: "displayPropertyCode",
+                    columnName: "display_property_code",
+                    type: "text",
+                    required: false,
+                },
                 {
                     name: "properties",
                     code: "properties",
@@ -1800,8 +1812,10 @@ var bootstrapApplicationConfig$1 = /*#__PURE__*/Object.freeze({
 
 function isRelationProperty(property) {
     return property.type === "relation" || property.type === "relation[]";
-}
-
+}
+function isOneRelationProperty(property) {
+    return isRelationProperty(property) && property.relation === "one";
+}
 function getEntityPropertiesIncludingBase(server, model) {
     if (!model.base) {
         return model.properties;
@@ -1817,10 +1831,7 @@ function getEntityPropertiesIncludingBase(server, model) {
             return property;
         });
     }
-    return [
-        ...baseProperties,
-        ...model.properties,
-    ];
+    return [...baseProperties, ...model.properties];
 }
 function getEntityPropertyByCode(server, model, propertyCode) {
     return getEntityProperty(server, model, (e) => e.code === propertyCode);
@@ -1897,8 +1908,8 @@ function mapEntityToDbRow(server, model, entity) {
     if (!entity) {
         return result;
     }
-    const row = result.row = {};
-    const baseRow = result.baseRow = {};
+    const row = (result.row = {});
+    const baseRow = (result.baseRow = {});
     if (!model.properties || !model.properties.length) {
         return result;
     }
@@ -1946,25 +1957,80 @@ function mapPropertyNameToColumnName(model, propertyName) {
     return property.columnName || property.code;
 }
 
-function getEntityPartChanges(before, after) {
+function getEntityPartChanges(server, model, before, after) {
     if (!before) {
         throw new Error("Argument 'before' can not be null.");
     }
     if (!after) {
         throw new Error("Argument 'after' can not be null.");
     }
-    let changed = null;
+    let changed = false;
+    let changes = {};
     for (const key in after) {
-        if (after[key] != before[key]) {
-            if (changed) {
-                changed[key] = after[key];
+        const property = getEntityPropertyByCode(server, model, key);
+        if (isOneRelationProperty(property)) {
+            const afterValue = after[key];
+            const beforeValue = before[key] || before[property.targetIdColumnName];
+            if (afterValue) {
+                if (lodash.isNumber(afterValue)) {
+                    if (beforeValue) {
+                        if (lodash.isNumber(beforeValue)) {
+                            if (afterValue != beforeValue) {
+                                changed = true;
+                                changes[key] = afterValue;
+                            }
+                        }
+                        else {
+                            if (afterValue != beforeValue.id) {
+                                changed = true;
+                                changes[key] = afterValue;
+                            }
+                        }
+                    }
+                    else {
+                        changed = true;
+                        changes[key] = afterValue;
+                    }
+                }
+                else {
+                    if (beforeValue) {
+                        if (lodash.isNumber(beforeValue)) {
+                            if (afterValue.id != beforeValue) {
+                                changed = true;
+                                changes[key] = afterValue;
+                            }
+                        }
+                        else {
+                            if (afterValue.id != beforeValue.id) {
+                                changed = true;
+                                changes[key] = afterValue;
+                            }
+                        }
+                    }
+                    else {
+                        changed = true;
+                        changes[key] = afterValue;
+                    }
+                }
             }
             else {
-                changed = { [key]: after[key] };
+                if (beforeValue) {
+                    changed = true;
+                    changes[key] = null;
+                }
             }
         }
+        else {
+            if (after[key] != before[key]) {
+                changed = true;
+                changes[key] = after[key];
+            }
+        }
+    }
+    if (changed) {
+        return changes;
     }
-    return changed;
+    return null;
 }
 
 function getNowStringWithTimezone() {
@@ -2572,7 +2638,7 @@ async function createEntity(server, dataAccessor, options, plugin) {
                 targetRow[property.targetIdColumnName] = targetEntityId;
             }
         }
-        else {
+        else if (lodash.isNumber(fieldValue)) {
             // fieldValue is id;
             const targetEntityId = fieldValue;
             const targetEntity = await findById(server, targetDataAccessor, {
@@ -2585,6 +2651,10 @@ async function createEntity(server, dataAccessor, options, plugin) {
             newEntityOneRelationProps[property.code] = targetEntity;
             targetRow[property.targetIdColumnName] = targetEntityId;
         }
+        else {
+            newEntityOneRelationProps[property.code] = null;
+            targetRow[property.targetIdColumnName] = null;
+        }
     }
     let newBaseRow;
     if (model.base) {
@@ -2693,14 +2763,15 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         throw new Error("Id is required when updating an entity.");
     }
     const entity = await findById(server, dataAccessor, {
-        id,
         routeContext,
+        id,
+        keepNonPropertyFields: true,
     });
     if (!entity) {
         throw new Error(`${model.namespace}.${model.singularCode}  with id "${id}" was not found.`);
     }
     let { entityToSave } = options;
-    let changes = getEntityPartChanges(entity, entityToSave);
+    let changes = getEntityPartChanges(server, model, entity, entityToSave);
     if (!changes && !options.operation) {
         return entity;
     }
@@ -2730,7 +2801,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
         sender: plugin,
         routeContext: options.routeContext,
     });
-    changes = getEntityPartChanges(entity, entityToSave);
+    changes = getEntityPartChanges(server, model, entity, entityToSave);
     const oneRelationPropertiesToUpdate = [];
     const manyRelationPropertiesToUpdate = [];
     lodash.keys(changes).forEach((propertyCode) => {
@@ -2778,7 +2849,7 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
                 targetRow[property.targetIdColumnName] = targetEntityId;
             }
         }
-        else {
+        else if (lodash.isNumber(fieldValue)) {
             // fieldValue is id;
             const targetEntityId = fieldValue;
             const targetEntity = await findById(server, targetDataAccessor, {
@@ -2791,6 +2862,10 @@ async function updateEntityById(server, dataAccessor, options, plugin) {
             updatedEntityOneRelationProps[property.code] = targetEntity;
             targetRow[property.targetIdColumnName] = targetEntityId;
         }
+        else {
+            updatedEntityOneRelationProps[property.code] = null;
+            targetRow[property.targetIdColumnName] = null;
+        }
     }
     let updatedRow = row;
     if (Object.keys(row).length) {
@@ -3024,11 +3099,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);
@@ -3068,7 +3143,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);
@@ -3779,7 +3854,10 @@ async function syncDatabaseSchema(server, applicationConfig) {
                 }
                 else if (property.relation === "many") {
                     if (property.linkTableName) {
-                        const tableInDb = lodash.find(tablesInDb, { table_schema: property.linkSchema || server.databaseConfig.dbDefaultSchema, table_name: property.linkTableName });
+                        const tableInDb = lodash.find(tablesInDb, {
+                            table_schema: property.linkSchema || server.databaseConfig.dbDefaultSchema,
+                            table_name: property.linkTableName,
+                        });
                         if (!tableInDb) {
                             columnDDL = generateLinkTableDDL(queryBuilder, {
                                 linkSchema: property.linkSchema,
@@ -6179,9 +6257,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/setting/SettingPlugin.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Setting plugin
+ */
+import { RpdApplicationConfig } from "../../types";
+import { IRpdServer, RapidPlugin, RpdConfigurationItemOptions, RpdServerPluginConfigurableTargetOptions, RpdServerPluginExtendingAbilities } from "../../core/server";
+import SettingService from "./SettingService";
+declare class SettingPlugin implements RapidPlugin {
+    #private;
+    get settingService(): SettingService;
+    get code(): string;
+    get description(): string;
+    get extendingAbilities(): RpdServerPluginExtendingAbilities[];
+    get configurableTargets(): RpdServerPluginConfigurableTargetOptions[];
+    get configurations(): RpdConfigurationItemOptions[];
+    registerActionHandlers(server: IRpdServer): Promise<any>;
+    configureModels(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
+    configureServices(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
+    configureRoutes(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<any>;
+    onApplicationLoaded(server: IRpdServer, applicationConfig: RpdApplicationConfig): Promise<void>;
+}
+export default SettingPlugin;

package/dist/plugins/setting/SettingPluginTypes.d.ts

@@ -0,0 +1,31 @@
+export type SettingGroupSetting = {
+    code: string;
+    name: string;
+    description?: string;
+    permissionAssignments?: PermissionAssignment[];
+};
+export type SettingItemSetting = {
+    group: SettingGroupSetting;
+    orderNum: number;
+    type: string;
+    code: string;
+    name: string;
+    description?: string;
+    config?: any;
+};
+export type SystemSettingItem = {
+    groupCode: string;
+    itemCode: string;
+    value: any;
+};
+export type UserSettingItem = {
+    userId: number;
+    groupCode: string;
+    itemCode: string;
+    value: any;
+};
+export type PermissionAssignment = {
+    assigneeType: string;
+    assigneeId: number;
+    actions: string[];
+};

package/dist/plugins/setting/SettingService.d.ts

@@ -0,0 +1,10 @@
+import { IRpdServer } from "../../core/server";
+export interface GetSystemSettingValuesInput {
+    groupCode: string;
+}
+export default class SequenceService {
+    #private;
+    constructor(server: IRpdServer);
+    getSystemSettingValues(input: GetSystemSettingValuesInput): Promise<void>;
+    setSystemSettingValue(groupCode: string, itemCode: string, value: any): Promise<void>;
+}

package/dist/plugins/setting/actionHandlers/getSystemSettingValues.d.ts

@@ -0,0 +1,7 @@
+import { ActionHandlerContext } from "../../../core/actionHandler";
+import { RapidPlugin } from "../../../core/server";
+export interface GetSystemSettingValuesOptions {
+    groupCode: string;
+}
+export declare const code = "getSystemSettingValues";
+export declare function handler(plugin: RapidPlugin, ctx: ActionHandlerContext, options: GetSystemSettingValuesOptions): Promise<void>;

package/dist/plugins/setting/actionHandlers/index.d.ts

@@ -0,0 +1,3 @@
+import * as getSystemSettingValues from "./getSystemSettingValues";
+declare const _default: (typeof getSystemSettingValues)[];
+export default _default;

package/dist/plugins/setting/models/SystemSettingGroupSetting.d.ts

@@ -0,0 +1,3 @@
+import { RpdDataModel } from "../../../types";
+declare const _default: RpdDataModel;
+export default _default;

package/dist/plugins/setting/models/SystemSettingItem.d.ts

@@ -0,0 +1,3 @@
+import { RpdDataModel } from "../../../types";
+declare const _default: RpdDataModel;
+export default _default;

package/dist/plugins/setting/models/SystemSettingItemSetting.d.ts

@@ -0,0 +1,3 @@
+import { RpdDataModel } from "../../../types";
+declare const _default: RpdDataModel;
+export default _default;

package/dist/plugins/setting/models/UserSettingGroupSetting.d.ts

@@ -0,0 +1,3 @@
+import { RpdDataModel } from "../../../types";
+declare const _default: RpdDataModel;
+export default _default;

package/dist/plugins/setting/models/UserSettingItem.d.ts

@@ -0,0 +1,3 @@
+import { RpdDataModel } from "../../../types";
+declare const _default: RpdDataModel;
+export default _default;

package/dist/plugins/setting/models/UserSettingItemSetting.d.ts

@@ -0,0 +1,3 @@
+import { RpdDataModel } from "../../../types";
+declare const _default: RpdDataModel;
+export default _default;

package/dist/plugins/setting/models/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("../../..").RpdDataModel[];
+export default _default;

package/dist/plugins/setting/routes/getSystemSettingValues.d.ts

@@ -0,0 +1,12 @@
+declare const _default: {
+    namespace: string;
+    name: string;
+    code: string;
+    type: "RESTful";
+    method: "POST";
+    endpoint: string;
+    actions: {
+        code: string;
+    }[];
+};
+export default _default;

package/dist/plugins/setting/routes/index.d.ts

@@ -0,0 +1,12 @@
+declare const _default: {
+    namespace: string;
+    name: string;
+    code: string;
+    type: "RESTful";
+    method: "POST";
+    endpoint: string;
+    actions: {
+        code: string;
+    }[];
+}[];
+export default _default;

package/dist/types.d.ts

@@ -175,6 +175,10 @@ export interface RpdDataModel {
      * Configure the property code to save derived type for base entity.
      */
     derivedTypePropertyCode?: string;
+    /**
+     * Configure the property code used to display the entity.
+     */
+    displayPropertyCode?: string;
     properties: RpdDataModelProperty[];
     extensions?: RpdDataModelExtension[];
     permissionPolicies?: RpdDataModelPermissionPolicies;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ruiapp/rapid-core",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "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: [],
+};