@steedos-labs/content-compliance 1.0.3 → 1.0.5

package/lib/methods/__tests__/spaceUserAgencyFieldsMetadata.test.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var fs = require("fs");
+var path = require("path");
+var yaml = require("js-yaml");
+var fieldsRoot = path.resolve(__dirname, '../../../main/default/objects/space_users/fields');
+var licenseFieldsRoot = path.resolve(fieldsRoot, '../../../../../../license-management/main/default/objects/space_users/fields');
+var spaceUsersZhCnTranslation = path.resolve(fieldsRoot, '../../../objectTranslations/space_users.zh-CN/space_users.zh-CN.objectTranslation.yml');
+var readField = function (fileName) { return yaml.safeLoad(fs.readFileSync(path.join(fieldsRoot, fileName), 'utf8')); };
+var readLicenseField = function (fileName) { return yaml.safeLoad(fs.readFileSync(path.join(licenseFieldsRoot, fileName), 'utf8')); };
+describe('space_users Agency field metadata', function () {
+    var emailNotification = readField('email_notification.field.yml');
+    var contractExpiry = readField('agency_contract_expiry_date.field.yml');
+    var pepsicoContact = readField('agency_pepsico_contact.field.yml');
+    var agencyFields = [contractExpiry, pepsicoContact];
+    it('shows both Agency fields only to space administrators for collaborator records', function () {
+        var e_1, _a;
+        try {
+            for (var agencyFields_1 = tslib_1.__values(agencyFields), agencyFields_1_1 = agencyFields_1.next(); !agencyFields_1_1.done; agencyFields_1_1 = agencyFields_1.next()) {
+                var field = agencyFields_1_1.value;
+                expect(field.visible_on).toBe('{{global.user.is_space_admin === true && formData.is_collaborator === true}}');
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (agencyFields_1_1 && !agencyFields_1_1.done && (_a = agencyFields_1.return)) _a.call(agencyFields_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    });
+    it('places both Agency fields after email notification in personal information', function () {
+        expect(emailNotification.group).toBe('个人信息');
+        expect(contractExpiry.group).toBe('个人信息');
+        expect(contractExpiry.sort_no).toBe(10000);
+        expect(pepsicoContact.group).toBe('个人信息');
+        expect(pepsicoContact.sort_no).toBe(10010);
+        expect(contractExpiry.sort_no).toBeGreaterThan(emailNotification.sort_no);
+        expect(pepsicoContact.sort_no).toBeGreaterThan(contractExpiry.sort_no);
+    });
+});
+describe('space_users license approval field metadata', function () {
+    var avatar = readField('avatar.field.yml');
+    var jobGrade = readLicenseField('job_grade.field.yml');
+    var lineManager = readLicenseField('line_manager.field.yml');
+    var approvalFields = [jobGrade, lineManager];
+    it('merges line manager and function head into one 部门审批人 field (function_head removed)', function () {
+        expect(lineManager.name).toBe('line_manager');
+        expect(lineManager.label).toBe('部门审批人');
+        expect(fs.existsSync(path.join(licenseFieldsRoot, 'line_manager.field.yml'))).toBe(true);
+        expect(fs.existsSync(path.join(licenseFieldsRoot, 'function_head.field.yml'))).toBe(false);
+    });
+    it('uses the requested display name without changing the job-grade API name', function () {
+        expect(jobGrade.name).toBe('job_grade');
+        expect(jobGrade.label).toBe('用户职级');
+    });
+    it('places the two approval fields after avatar in personal information', function () {
+        var e_2, _a;
+        expect(avatar.group).toBe('个人信息');
+        expect(avatar.sort_no).toBe(99998);
+        try {
+            for (var approvalFields_1 = tslib_1.__values(approvalFields), approvalFields_1_1 = approvalFields_1.next(); !approvalFields_1_1.done; approvalFields_1_1 = approvalFields_1.next()) {
+                var field = approvalFields_1_1.value;
+                expect(field.group).toBe('个人信息');
+            }
+        }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        finally {
+            try {
+                if (approvalFields_1_1 && !approvalFields_1_1.done && (_a = approvalFields_1.return)) _a.call(approvalFields_1);
+            }
+            finally { if (e_2) throw e_2.error; }
+        }
+        expect(jobGrade.sort_no).toBe(100000);
+        expect(lineManager.sort_no).toBe(100010);
+        expect(jobGrade.sort_no).toBeGreaterThan(avatar.sort_no);
+        expect(lineManager.sort_no).toBeGreaterThan(jobGrade.sort_no);
+    });
+});
+describe('space_users Chinese translation overrides', function () {
+    it('uses 登录 instead of the built-in 登陆 typo for last_logon', function () {
+        expect(fs.existsSync(spaceUsersZhCnTranslation)).toBe(true);
+        var translation = yaml.safeLoad(fs.readFileSync(spaceUsersZhCnTranslation, 'utf8'));
+        expect(translation.name).toBe('space_users');
+        expect(translation.fields.last_logon.label).toBe('最近登录');
+    });
+});
+describe('space_users login status field visibility', function () {
+    var lastLogon = readField('last_logon.field.yml');
+    var loginExpired = readField('login_expired.field.yml');
+    it('shows login status only to space administrators in read mode', function () {
+        var e_3, _a;
+        try {
+            for (var _b = tslib_1.__values([lastLogon, loginExpired]), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var field = _c.value;
+                expect(field.visible_on).toBe('{{global.user.is_space_admin === true && global.mode === "read"}}');
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+    });
+});
+//# sourceMappingURL=spaceUserAgencyFieldsMetadata.test.js.map

package/lib/methods/__tests__/spaceUserAgencyFieldsMetadata.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spaceUserAgencyFieldsMetadata.test.js","sourceRoot":"","sources":["../../../src/methods/__tests__/spaceUserAgencyFieldsMetadata.test.ts"],"names":[],"mappings":"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"}

package/lib/methods/__tests__/terminateBypassAttachments.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/methods/__tests__/terminateBypassAttachments.test.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var approval_engine_1 = require("../approval_engine");
+var bypassApproval_1 = require("../../actions/bypassApproval");
+var consts_1 = require("../consts");
+var baseApproval = {
+    _id: 'approval-1',
+    owner: 'owner-1',
+    space: 'space-1',
+    current_step: consts_1.Step.departmental_review,
+    person_pending_approve: ['reviewer-1'],
+    ca_reviewer: ['reviewer-1'],
+    handler_ca: ['reviewer-1']
+};
+var createCtx = function (_a) {
+    var _b = _a === void 0 ? {} : _a, _c = _b.userId, userId = _c === void 0 ? 'owner-1' : _c, _d = _b.terminateRecords, terminateRecords = _d === void 0 ? [] : _d, _e = _b.processRecords, processRecords = _e === void 0 ? [] : _e;
+    var objects = {
+        pepsico_material_approval: {
+            findOne: jest.fn(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                return [2, baseApproval];
+            }); }); }),
+            update: jest.fn(),
+            directUpdate: jest.fn()
+        },
+        pepsico_approval_process: {
+            insert: jest.fn(),
+            update: jest.fn(),
+            directUpdate: jest.fn(),
+            find: jest.fn(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                return [2, processRecords];
+            }); }); }),
+            directFind: jest.fn(function (_a) {
+                var filters = _a.filters;
+                return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                    var isTerminateLookup;
+                    return tslib_1.__generator(this, function (_b) {
+                        isTerminateLookup = filters.some(function (_a) {
+                            var _b = tslib_1.__read(_a, 3), field = _b[0], value = _b[2];
+                            return field === 'approved' && value === 'terminate';
+                        });
+                        return [2, isTerminateLookup ? terminateRecords : []];
+                    });
+                });
+            })
+        },
+        pepsico_material: {
+            find: jest.fn(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                return [2, []];
+            }); }); }),
+            directUpdate: jest.fn()
+        }
+    };
+    return {
+        objects: objects,
+        ctx: {
+            meta: { user: { userId: userId } },
+            getObject: jest.fn(function (name) { return objects[name]; })
+        }
+    };
+};
+describe('中止审核证明文件', function () {
+    it('首次中止时新增中止记录并写入证明文件', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var _a, ctx, objects;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = createCtx(), ctx = _a.ctx, objects = _a.objects;
+                    return [4, (0, approval_engine_1.terminate)(ctx, 'approval-1', '原因', [{ value: 'f1' }, { value: 'f2' }])];
+                case 1:
+                    _b.sent();
+                    expect(objects.pepsico_approval_process.insert).toHaveBeenCalledWith(expect.objectContaining({
+                        owner: 'owner-1',
+                        current_step: consts_1.Step.conclusion,
+                        approved: 'terminate',
+                        name: '原因',
+                        attachments: ['f1', 'f2']
+                    }));
+                    return [2];
+            }
+        });
+    }); });
+    it('不上传证明文件时也能中止', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var _a, ctx, objects;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = createCtx(), ctx = _a.ctx, objects = _a.objects;
+                    return [4, (0, approval_engine_1.terminate)(ctx, 'approval-1', '原因')];
+                case 1:
+                    _b.sent();
+                    expect(objects.pepsico_approval_process.insert).toHaveBeenCalledWith(expect.objectContaining({ attachments: [] }));
+                    return [2];
+            }
+        });
+    }); });
+    it('已有中止记录时合并证明文件，不重复新增记录', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var _a, ctx, objects;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = createCtx({ terminateRecords: [{ _id: 'p1', attachments: ['f1'] }] }), ctx = _a.ctx, objects = _a.objects;
+                    return [4, (0, approval_engine_1.terminate)(ctx, 'approval-1', '原因2', 'f1,f3')];
+                case 1:
+                    _b.sent();
+                    expect(objects.pepsico_approval_process.insert).not.toHaveBeenCalled();
+                    expect(objects.pepsico_approval_process.directUpdate).toHaveBeenCalledWith('p1', expect.objectContaining({
+                        name: '原因2',
+                        attachments: ['f1', 'f3']
+                    }));
+                    return [2];
+            }
+        });
+    }); });
+});
+describe('跳过审核证明文件', function () {
+    var callBypass = function (ctx, params) { return bypassApproval_1.bypassApproval.handler.call({
+        getObject: ctx.getObject,
+        getLogger: function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2, ({ info: jest.fn() })];
+        }); }); },
+        approvalContent: jest.fn()
+    }, Object.assign(ctx, { params: params })); };
+    it('更新为跳过状态的历史记录上合并写入证明文件', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var _a, ctx, objects;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = createCtx({
+                        userId: 'reviewer-1',
+                        processRecords: [{ _id: 'p1', type: 'CA', attachments: ['f1'] }]
+                    }), ctx = _a.ctx, objects = _a.objects;
+                    return [4, callBypass(ctx, { recordId: 'approval-1', reason: '跳过原因', attachments: [{ value: 'f1' }, { value: 'f2' }] })];
+                case 1:
+                    _b.sent();
+                    expect(objects.pepsico_approval_process.update).toHaveBeenCalledWith('p1', expect.objectContaining({
+                        approved: 'pass',
+                        name: '跳过原因',
+                        attachments: ['f1', 'f2']
+                    }));
+                    return [2];
+            }
+        });
+    }); });
+    it('不上传证明文件时也能跳过', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var _a, ctx, objects;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = createCtx({
+                        userId: 'reviewer-1',
+                        processRecords: [{ _id: 'p1', type: 'CA' }]
+                    }), ctx = _a.ctx, objects = _a.objects;
+                    return [4, callBypass(ctx, { recordId: 'approval-1', reason: '跳过原因' })];
+                case 1:
+                    _b.sent();
+                    expect(objects.pepsico_approval_process.update).toHaveBeenCalledWith('p1', expect.objectContaining({ attachments: [] }));
+                    return [2];
+            }
+        });
+    }); });
+});
+//# sourceMappingURL=terminateBypassAttachments.test.js.map

package/lib/methods/__tests__/terminateBypassAttachments.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"terminateBypassAttachments.test.js","sourceRoot":"","sources":["../../../src/methods/__tests__/terminateBypassAttachments.test.ts"],"names":[],"mappings":"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"}

package/lib/methods/approval_engine.d.ts

@@ -17,7 +17,7 @@ export declare const hasNonPreReviewDepartments: (materialApproval: MaterialAppr
 export declare const areDepartmentReviewsComplete: (materialApproval: MaterialApproval) => boolean;
 export declare const getDepartmentEffectiveStatuses: (materialApproval: MaterialApproval) => (boolean | string)[];
 export declare const advanceApproval: (ctx: any, recordId: any, currentStepApprovalStatus: ApprovalStatus) => Promise<{}>;
-export declare const terminate: (ctx: any, recordId: any, description: string) => Promise<{}>;
+export declare const terminate: (ctx: any, recordId: any, description: string, attachments?: any) => Promise<{}>;
 export declare const confirmDeployment: (ctx: any, recordId: any, data?: {
     content_rule: any;
 }) => Promise<{}>;

package/lib/methods/approval_engine.js

@@ -14,6 +14,7 @@ var approval_cc_1 = require("./approval_cc");
 var agent_1 = require("./agent");
 var const_1 = require("../const");
 var pls_1 = require("./pls");
+var attachment_1 = require("./attachment");
 var _ = require("lodash");
 var getDefApproverStepRule = function (ctx) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     var rules, rule;
@@ -1569,77 +1570,102 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
     });
 }); };
 exports.advanceApproval = advanceApproval;
-var terminate = function (ctx, recordId, description) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var user, record, records, records_1, records_1_1, process_2, e_11_1;
-    var e_11, _a;
-    return tslib_1.__generator(this, function (_b) {
-        switch (_b.label) {
+var terminate = function (ctx, recordId, description, attachments) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    var user, record, _a, terminateRecord, records, records_1, records_1_1, process_2, e_11_1;
+    var e_11, _b;
+    return tslib_1.__generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 user = ctx.meta.user;
                 return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
             case 1:
-                record = _b.sent();
-                if (!(record.owner === user.userId || user.is_space_admin || (0, lodash_1.includes)(record.person_pending_approve, user.userId))) return [3, 13];
-                return [4, ctx.getObject('pepsico_approval_process').insert({
-                        pepsico_material_approval: record._id,
-                        current_step: consts_1.Step.conclusion,
-                        owner: user.userId,
-                        space: record.space,
-                        created: new Date(),
-                        created_by: user.userId,
-                        modified: new Date(),
-                        modified_by: user.userId,
-                        approvalStatus: 'terminate',
-                        name: description
+                record = _c.sent();
+                if (!(record.owner === user.userId || user.is_space_admin || (0, lodash_1.includes)(record.person_pending_approve, user.userId))) return [3, 17];
+                return [4, ctx.getObject('pepsico_approval_process').directFind({
+                        filters: [
+                            ['pepsico_material_approval', '=', record._id],
+                            ['current_step', '=', consts_1.Step.conclusion],
+                            ['owner', '=', user.userId],
+                            ['approved', '=', 'terminate']
+                        ],
+                        sort: 'created desc',
+                        top: 1
                     })];
             case 2:
-                _b.sent();
-                return [4, ctx.getObject('pepsico_approval_process').directFind({
-                        filters: [['pepsico_material_approval', '=', record._id], ['approved', '=', 'progess']]
+                _a = tslib_1.__read.apply(void 0, [_c.sent(), 1]), terminateRecord = _a[0];
+                if (!terminateRecord) return [3, 4];
+                return [4, ctx.getObject('pepsico_approval_process').directUpdate(terminateRecord._id, {
+                        modified: new Date(),
+                        modified_by: user.userId,
+                        name: description,
+                        attachments: (0, attachment_1.mergeFileIds)(terminateRecord.attachments, attachments)
                     })];
             case 3:
-                records = _b.sent();
-                _b.label = 4;
-            case 4:
-                _b.trys.push([4, 9, 10, 11]);
-                records_1 = tslib_1.__values(records), records_1_1 = records_1.next();
-                _b.label = 5;
+                _c.sent();
+                return [3, 6];
+            case 4: return [4, ctx.getObject('pepsico_approval_process').insert({
+                    pepsico_material_approval: record._id,
+                    current_step: consts_1.Step.conclusion,
+                    owner: user.userId,
+                    space: record.space,
+                    created: new Date(),
+                    created_by: user.userId,
+                    modified: new Date(),
+                    modified_by: user.userId,
+                    approvalStatus: 'terminate',
+                    approved: 'terminate',
+                    name: description,
+                    attachments: (0, attachment_1.mergeFileIds)([], attachments)
+                })];
             case 5:
-                if (!!records_1_1.done) return [3, 8];
+                _c.sent();
+                _c.label = 6;
+            case 6: return [4, ctx.getObject('pepsico_approval_process').directFind({
+                    filters: [['pepsico_material_approval', '=', record._id], ['approved', '=', 'progess']]
+                })];
+            case 7:
+                records = _c.sent();
+                _c.label = 8;
+            case 8:
+                _c.trys.push([8, 13, 14, 15]);
+                records_1 = tslib_1.__values(records), records_1_1 = records_1.next();
+                _c.label = 9;
+            case 9:
+                if (!!records_1_1.done) return [3, 12];
                 process_2 = records_1_1.value;
                 return [4, ctx.getObject('pepsico_approval_process').directUpdate(process_2._id, {
                         approved: '',
                         modified: new Date(),
                         modified_by: user.userId,
                     })];
-            case 6:
-                _b.sent();
-                _b.label = 7;
-            case 7:
+            case 10:
+                _c.sent();
+                _c.label = 11;
+            case 11:
                 records_1_1 = records_1.next();
-                return [3, 5];
-            case 8: return [3, 11];
-            case 9:
-                e_11_1 = _b.sent();
+                return [3, 9];
+            case 12: return [3, 15];
+            case 13:
+                e_11_1 = _c.sent();
                 e_11 = { error: e_11_1 };
-                return [3, 11];
-            case 10:
+                return [3, 15];
+            case 14:
                 try {
-                    if (records_1_1 && !records_1_1.done && (_a = records_1.return)) _a.call(records_1);
+                    if (records_1_1 && !records_1_1.done && (_b = records_1.return)) _b.call(records_1);
                 }
                 finally { if (e_11) throw e_11.error; }
                 return [7];
-            case 11: return [4, ctx.getObject('pepsico_material_approval').update(recordId, {
+            case 15: return [4, ctx.getObject('pepsico_material_approval').update(recordId, {
                     current_step: consts_1.Step.conclusion,
                     review_status: consts_1.ReviewStatus.terminated,
                     termination_date: new Date(),
                     person_pending_approve: [],
                     termination_type: record.owner === user.userId ? '发起人中止' : '审批人中止'
                 })];
-            case 12:
-                _b.sent();
+            case 16:
+                _c.sent();
                 return [2, {}];
-            case 13: throw new Error('Sorry, you don’t have permission to terminate the review.');
+            case 17: throw new Error('Sorry, you don’t have permission to terminate the review.');
         }
     });
 }); };