mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-07 01:02:55 +08:00
76d6234de6
* Agent features (#6345) * Test agent (#6220) * squash: compress all commits into one * feat: plan response in ui * response ui * perf: agent config * merge * tool select ux * perf: chat ui * perf: agent editform * tmp code * feat: save chat * Complete agent parent (#6049) * add role and tools filling * add: file-upload --------- Co-authored-by: xxyyh <2289112474@qq> * perf: top agent code * top agent (#6062) Co-authored-by: xxyyh <2289112474@qq> * fix: ts * skill editor ui * ui * perf: rewrite type with zod * skill edit ui * skill agent (#6089) * cp skill chat * rebasefdf933dand add skill chat * 1. skill 的 CRUD 2. skill 的信息渲染到前端界面 * solve comment * remove chatid and chatItemId * skill match * perf: skill manage * fix: ts --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * fix: ts * fix: loop import * skill tool config (#6114) Co-authored-by: xxyyh <2289112474@qq> * feat: load tool in agent * skill memory (#6126) Co-authored-by: xxyyh <2289112474@qq> * perf: agent skill editor * perf: helperbot ui * agent code * perf: context * fix: request context * agent usage * perf: agent context and pause * perf: plan response * Test agent sigle skill (#6184) * feat:top box fill * prompt fix --------- Co-authored-by: xxyyh <2289112474@qq> * perf: agent chat ui * Test agent new (#6219) * have-replan * agent --------- Co-authored-by: xxyyh <2289112474@qq> * fix: ts --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * feat: consolidate agent and MCP improvements This commit consolidates 17 commits including: - MCP tools enhancements and fixes - Agent system improvements and optimizations - Auth limit and prompt updates - Tool response compression and error tracking - Simple app adaptation - Code quality improvements (TypeScript, ESLint, Zod) - Version type migration to schema - Remove deprecated useRequest2 - Add LLM error tracking - Toolset ID validation fixes --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * fix: transform avatar copy;perf: filter invalid tool * update llm response storage time * fix: openapi schema * update skill desc * feat: cache hit data * i18n * lock * chat logs support error filter & user search (#6373) * chat log support searching by user name * support error filter * fix * fix overflow * optimize * fix init script * fix * perf: get log users * updat ecomment * fix: ts * fix: test --------- Co-authored-by: archer <545436317@qq.com> * Fix: agent (#6376) * Agent features (#6345) * Test agent (#6220) * squash: compress all commits into one * feat: plan response in ui * response ui * perf: agent config * merge * tool select ux * perf: chat ui * perf: agent editform * tmp code * feat: save chat * Complete agent parent (#6049) * add role and tools filling * add: file-upload --------- Co-authored-by: xxyyh <2289112474@qq> * perf: top agent code * top agent (#6062) Co-authored-by: xxyyh <2289112474@qq> * fix: ts * skill editor ui * ui * perf: rewrite type with zod * skill edit ui * skill agent (#6089) * cp skill chat * rebasefdf933dand add skill chat * 1. skill 的 CRUD 2. skill 的信息渲染到前端界面 * solve comment * remove chatid and chatItemId * skill match * perf: skill manage * fix: ts --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * fix: ts * fix: loop import * skill tool config (#6114) Co-authored-by: xxyyh <2289112474@qq> * feat: load tool in agent * skill memory (#6126) Co-authored-by: xxyyh <2289112474@qq> * perf: agent skill editor * perf: helperbot ui * agent code * perf: context * fix: request context * agent usage * perf: agent context and pause * perf: plan response * Test agent sigle skill (#6184) * feat:top box fill * prompt fix --------- Co-authored-by: xxyyh <2289112474@qq> * perf: agent chat ui * Test agent new (#6219) * have-replan * agent --------- Co-authored-by: xxyyh <2289112474@qq> * fix: ts --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * feat: consolidate agent and MCP improvements This commit consolidates 17 commits including: - MCP tools enhancements and fixes - Agent system improvements and optimizations - Auth limit and prompt updates - Tool response compression and error tracking - Simple app adaptation - Code quality improvements (TypeScript, ESLint, Zod) - Version type migration to schema - Remove deprecated useRequest2 - Add LLM error tracking - Toolset ID validation fixes --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> * 1. 把辅助生成前端上的 system prompt 加入到上下文中 2. mcp工具的前端渲染(图标) 3. 文件读取工具和文件上传进行关联 4. 添加了辅助生成返回格式出错的重试方案 5. ask 不出现在 plan 步骤中 6. 添加了辅助生成的头像和交互 UI * fix:read_file * helperbot ui * ts error * helper ui * delete Unused import * perf: helper bot * lock --------- Co-authored-by: Archer <545436317@qq.com> Co-authored-by: xxyyh <2289112474@qq> * fix date variable required & model auth (#6386) * fix date variable required & model auth * doc * feat: add chat id to finish callback * fix: iphone safari shareId (#6387) * fix: iphone safari shareId * fix: mcp file list can't setting * fix: reason output field * fix: skip JSON validation for HTTP tool body with variable (#6392) * fix: skip JSON validation for HTTP tool body with variable * doc * workflow fitview * perf: selecting memory * perf: cp api * ui * perf: toolcall auto adapt * fix: catch workflow error * fix: ts * perf: pagination type * remove * ignore * update doc * fix: simple app tool select * add default avatar to logs user * perf: loading user * select dataset ui * rename version * feat: add global/common test * perf: packages/global/common test * feat: package/global/ai,app test * add global/chat test * global/core test * global/core test * feat: packages/global all test * perf: test * add server api test * perf: init shell * perf: init4150 shell * remove invalid code * update doc * remove log * fix: chat effect * fix: plan fake tool (#6398) * 1. 提示词防注入功能 2. 无工具不进入 plan,防止虚拟工具生成 * Agent-dataset * dataset * dataset presetInfo * prefix * perf: prompt --------- Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: archer <545436317@qq.com> * fix: review * adapt kimi2.5 think toolcall * feat: invoke fastgpt user info (#6403) feat: invoke fastgpt user info * fix: invoke fastgpt user info return orgs (#6404) * skill and version * retry helperbot (#6405) Co-authored-by: xxyyh <2289112474@qq> * update template * remove log * doc * update doc * doc * perf: internal ip check * adapt get paginationRecords * tool call adapt * fix: test * doc * fix: agent initial version * adapt completions v1 * feat: instrumentation check * rename skill * add workflow demo mode tracks (#6407) * chore: 统一 skills 目录命名为小写 将 .claude/Skills/ 重命名为 .claude/skills/ 以保持命名一致性。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * add workflow demo mode tracks * code * optimize * fix: improve workflowDemoTrack based on PR review - Add comment to empty catch block for maintainability - Add @param docs to onDemoChange clarifying nodeCount usage - Replace silent .catch with console.debug for dev debugging - Handle appId changes by reporting old data before re-init Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: archer <545436317@qq.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> * remove repeat skill * fix(workflow): filter out orphan edges to prevent runtime errors (#6399) * fix(workflow): filter out orphan edges to prevent runtime errors Runtime edges that reference non-existent nodes (orphan edges) can cause unexpected behavior or crashes during workflow dispatch. This change adds a pre-check to filter out such edges before execution begins, ensuring system stability even with inconsistent graph data. * fix(workflow): enhance orphan edge filtering with logging and tests - Refactor: Extract logic to 'filterOrphanEdges' in utils.ts for better reusability - Feat: Add performance monitoring (warn if >100ms) and comprehensive logging - Feat: Support detailed edge inspection in debug mode - Docs: Add JSDoc explaining causes of orphan edges (migration, manual edits) - Test: Add unit tests covering edge cases and performance (1000 edges) Addresses PR review feedback regarding logging, variable naming, and testing." * move code * move code * add more unit test --------- Co-authored-by: archer <545436317@qq.com> * test * perf: test * add server/common/string test * fix: resolve $ref references in MCP tool input schemas (#6395) (#6409) * fix: resolve $ref references in MCP tool input schemas (#6395) * add test code --------- Co-authored-by: archer <545436317@qq.com> * chore(docs): add fastgpt, fastgpt-plugin version choice guide (#6411) * chore(doc): add fastgpt version description * doc * doc --------- Co-authored-by: archer <545436317@qq.com> * fix:dataset cite and description info (#6410) * 1. 添加知识库引用(plan 步骤和直接知识库调用) 2. 提示词框中的@知识库工具 3. plan 中 step 的 description dataset_search 改为中文 * fix: i18n * prompt * prompt --------- Co-authored-by: xxyyh <2289112474@qq> * fix: tool call * perf: workflow props * fix: merge ECharts toolbox options instead of overwriting (#6269) (#6412) * feat: integrate logtape and otel (#6400) * fix: deps * feat(logger): integrate logtape and otel * wip(log): add basic infras logs * wip(log): add request id and inject it into context * wip(log): add basic tx logs * wip(log): migrate * wip(log): category * wip(log): more sub category * fix: type * fix: sessionRun * fix: export getLogger from client.ts * chore: improve logs * docs: update signoz and changelog * change type * fix: ts * remove skill.md * fix: lockfile specifier * fix: test --------- Co-authored-by: archer <545436317@qq.com> * init log * doc * remove invalid log * fix: review * template * replace new log * fix: ts * remove log * chore: migrate all addLog to logtape * move skill * chore: migrate all addLog to logtape (#6417) * update skill * remove log * fix: tool check --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: xxyyh <2289112474@qq> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: xuyafei1996 <54217479+xuyafei1996@users.noreply.github.com> Co-authored-by: ToukoYui <2331631097@qq.com> Co-authored-by: roy <whoeverimf5@gmail.com>
816 lines
26 KiB
TypeScript
816 lines
26 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
import {
|
|
sumPer,
|
|
checkRoleUpdateConflict,
|
|
getChangedCollaborators,
|
|
getCollaboratorId,
|
|
mergeCollaboratorList
|
|
} from '@fastgpt/global/support/permission/utils';
|
|
import {
|
|
OwnerRoleVal,
|
|
ManageRoleVal,
|
|
ReadRoleVal,
|
|
WriteRoleVal
|
|
} from '@fastgpt/global/support/permission/constant';
|
|
import type { CollaboratorItemType } from '@fastgpt/global/support/permission/collaborator';
|
|
|
|
describe('Permission Utils', () => {
|
|
describe('sumPer', () => {
|
|
it('should return undefined when no permissions provided', () => {
|
|
const result = sumPer();
|
|
expect(result).toBeUndefined();
|
|
});
|
|
|
|
it('should return single permission value', () => {
|
|
const result = sumPer(ReadRoleVal);
|
|
expect(result).toBe(ReadRoleVal);
|
|
});
|
|
|
|
it('should sum two permissions using bitwise OR', () => {
|
|
const result = sumPer(ReadRoleVal, WriteRoleVal);
|
|
expect(result).toBe(ReadRoleVal | WriteRoleVal);
|
|
});
|
|
|
|
it('should sum multiple permissions', () => {
|
|
const result = sumPer(ReadRoleVal, WriteRoleVal, ManageRoleVal);
|
|
expect(result).toBe(ReadRoleVal | WriteRoleVal | ManageRoleVal);
|
|
});
|
|
|
|
it('should handle duplicate permissions', () => {
|
|
const result = sumPer(ReadRoleVal, ReadRoleVal);
|
|
expect(result).toBe(ReadRoleVal);
|
|
});
|
|
|
|
it('should return 0 when summing zero values', () => {
|
|
const result = sumPer(0, 0);
|
|
expect(result).toBe(0);
|
|
});
|
|
|
|
it('should handle single zero value', () => {
|
|
const result = sumPer(0);
|
|
expect(result).toBe(0);
|
|
});
|
|
|
|
it('should return OwnerRoleVal when result overflows (negative)', () => {
|
|
// Create a scenario that would overflow to negative
|
|
const largeValue = 0x7fffffff;
|
|
const result = sumPer(largeValue, largeValue);
|
|
|
|
if (result && result < 0) {
|
|
expect(result).toBe(OwnerRoleVal);
|
|
}
|
|
});
|
|
|
|
it('should handle all common permission combinations', () => {
|
|
const readWrite = sumPer(ReadRoleVal, WriteRoleVal);
|
|
const readManage = sumPer(ReadRoleVal, ManageRoleVal);
|
|
const writeManage = sumPer(WriteRoleVal, ManageRoleVal);
|
|
const all = sumPer(ReadRoleVal, WriteRoleVal, ManageRoleVal);
|
|
|
|
expect(readWrite).toBe(0b110);
|
|
expect(readManage).toBe(0b101);
|
|
expect(writeManage).toBe(0b011);
|
|
expect(all).toBe(0b111);
|
|
});
|
|
});
|
|
|
|
describe('getCollaboratorId', () => {
|
|
it('should return tmbId when present', () => {
|
|
const clb = { tmbId: 'tmb123' };
|
|
expect(getCollaboratorId(clb)).toBe('tmb123');
|
|
});
|
|
|
|
it('should return groupId when tmbId is not present', () => {
|
|
const clb = { groupId: 'group123' };
|
|
expect(getCollaboratorId(clb)).toBe('group123');
|
|
});
|
|
|
|
it('should return orgId when tmbId and groupId are not present', () => {
|
|
const clb = { orgId: 'org123' };
|
|
expect(getCollaboratorId(clb)).toBe('org123');
|
|
});
|
|
|
|
it('should prioritize tmbId over groupId', () => {
|
|
const clb = { tmbId: 'tmb123', groupId: 'group123' };
|
|
expect(getCollaboratorId(clb)).toBe('tmb123');
|
|
});
|
|
|
|
it('should prioritize tmbId over orgId', () => {
|
|
const clb = { tmbId: 'tmb123', orgId: 'org123' };
|
|
expect(getCollaboratorId(clb)).toBe('tmb123');
|
|
});
|
|
|
|
it('should prioritize groupId over orgId', () => {
|
|
const clb = { groupId: 'group123', orgId: 'org123' };
|
|
expect(getCollaboratorId(clb)).toBe('group123');
|
|
});
|
|
|
|
it('should handle all three IDs present', () => {
|
|
const clb = { tmbId: 'tmb123', groupId: 'group123', orgId: 'org123' };
|
|
expect(getCollaboratorId(clb)).toBe('tmb123');
|
|
});
|
|
});
|
|
|
|
describe('getChangedCollaborators', () => {
|
|
it('should return all new collaborators when oldRealClbs is empty', () => {
|
|
const newClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user2', permission: WriteRoleVal }
|
|
];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: [],
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(2);
|
|
expect(result[0]).toMatchObject({
|
|
tmbId: 'user1',
|
|
changedRole: ReadRoleVal,
|
|
deleted: false
|
|
});
|
|
expect(result[1]).toMatchObject({
|
|
tmbId: 'user2',
|
|
changedRole: WriteRoleVal,
|
|
deleted: false
|
|
});
|
|
});
|
|
|
|
it('should detect new collaborators', () => {
|
|
const oldClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const newClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user2', permission: WriteRoleVal }
|
|
];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0]).toMatchObject({
|
|
tmbId: 'user2',
|
|
changedRole: WriteRoleVal,
|
|
deleted: false
|
|
});
|
|
});
|
|
|
|
it('should detect deleted collaborators', () => {
|
|
const oldClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user2', permission: WriteRoleVal }
|
|
];
|
|
const newClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0]).toMatchObject({
|
|
tmbId: 'user2',
|
|
changedRole: WriteRoleVal,
|
|
deleted: true
|
|
});
|
|
});
|
|
|
|
it('should detect permission changes', () => {
|
|
const oldClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const newClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: WriteRoleVal }];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
// XOR: 0b100 ^ 0b010 = 0b110
|
|
// Low 3 bits: 0b110, lowest bit: 0b010
|
|
expect(result[0]).toMatchObject({
|
|
tmbId: 'user1',
|
|
changedRole: WriteRoleVal, // After applying lowest bit rule
|
|
deleted: false
|
|
});
|
|
});
|
|
|
|
it('should not include unchanged collaborators', () => {
|
|
const oldClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user2', permission: WriteRoleVal }
|
|
];
|
|
const newClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user2', permission: WriteRoleVal }
|
|
];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(0);
|
|
});
|
|
|
|
it('should handle multiple changes at once', () => {
|
|
const oldClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user2', permission: WriteRoleVal }
|
|
];
|
|
const newClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: WriteRoleVal }, // changed
|
|
{ tmbId: 'user3', permission: ManageRoleVal } // new
|
|
];
|
|
// user2 is deleted
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(3);
|
|
|
|
const user1Change = result.find((r) => r.tmbId === 'user1');
|
|
const user2Change = result.find((r) => r.tmbId === 'user2');
|
|
const user3Change = result.find((r) => r.tmbId === 'user3');
|
|
|
|
expect(user1Change?.deleted).toBe(false);
|
|
expect(user2Change?.deleted).toBe(true);
|
|
expect(user3Change?.deleted).toBe(false);
|
|
});
|
|
|
|
it('should apply lowest 3 bits rule correctly', () => {
|
|
// When changing from read (0b100) to write (0b010), XOR gives 0b110
|
|
// The lowest 3 bits are 0b110, lowest set bit is 0b010
|
|
const oldClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: 0b100 }];
|
|
const newClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: 0b010 }];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
// XOR: 0b100 ^ 0b010 = 0b110
|
|
// Low 3 bits: 0b110
|
|
// Lowest bit: 0b010
|
|
expect(result[0].changedRole & 0b111).toBe(0b010);
|
|
});
|
|
|
|
it('should handle groupId collaborators', () => {
|
|
const oldClbs: CollaboratorItemType[] = [{ groupId: 'group1', permission: ReadRoleVal }];
|
|
const newClbs: CollaboratorItemType[] = [{ groupId: 'group1', permission: WriteRoleVal }];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0].groupId).toBe('group1');
|
|
});
|
|
|
|
it('should handle orgId collaborators', () => {
|
|
const oldClbs: CollaboratorItemType[] = [{ orgId: 'org1', permission: ReadRoleVal }];
|
|
const newClbs: CollaboratorItemType[] = [{ orgId: 'org1', permission: WriteRoleVal }];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0].orgId).toBe('org1');
|
|
});
|
|
|
|
it('should preserve higher bits when applying lowest 3 bits rule', () => {
|
|
// Test with permission that has higher bits set
|
|
const oldClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: 0b1100 } // Higher bit + read
|
|
];
|
|
const newClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: 0b1010 } // Higher bit + write
|
|
];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
// XOR: 0b1100 ^ 0b1010 = 0b0110
|
|
// Should preserve higher bits and apply lowest bit rule to low 3 bits
|
|
const changedRole = result[0].changedRole;
|
|
expect(changedRole & 0b111).toBe(0b010); // Lowest bit of low 3 bits
|
|
});
|
|
});
|
|
|
|
describe('checkRoleUpdateConflict', () => {
|
|
it('should return false when parentClbs is empty', () => {
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs: [],
|
|
newChildClbs: [{ tmbId: 'user1', permission: ReadRoleVal }]
|
|
});
|
|
|
|
expect(result).toBe(false);
|
|
});
|
|
|
|
it('should return false when no conflicts exist', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const newChildClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal }, // Same permission, no change
|
|
{ tmbId: 'user2', permission: WriteRoleVal } // New user, not in parent
|
|
];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
expect(result).toBe(false);
|
|
});
|
|
|
|
it('should return true when child changes parent permission', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const newChildClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal | WriteRoleVal } // Added write permission
|
|
];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
// Changed role is 0b010 (write bit), parent has 0b100 (read bit)
|
|
// 0b010 & 0b100 = 0, so no conflict
|
|
expect(result).toBe(false);
|
|
});
|
|
|
|
it('should return true when child deletes parent collaborator', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const newChildClbs: CollaboratorItemType[] = [];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
expect(result).toBe(true);
|
|
});
|
|
|
|
it('should return false when child adds new collaborator not in parent', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const newChildClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user2', permission: WriteRoleVal }
|
|
];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
expect(result).toBe(false);
|
|
});
|
|
|
|
it('should return false when permissions remain unchanged', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const newChildClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
expect(result).toBe(false);
|
|
});
|
|
|
|
it('should handle multiple collaborators with mixed changes', () => {
|
|
const parentClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user2', permission: WriteRoleVal }
|
|
];
|
|
const newChildClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal }, // unchanged
|
|
{ tmbId: 'user2', permission: ReadRoleVal | WriteRoleVal | ManageRoleVal }, // added manage
|
|
{ tmbId: 'user3', permission: ReadRoleVal } // new
|
|
];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
// user2 changed from 0b010 to 0b111, XOR = 0b101, lowest bit = 0b001 (manage)
|
|
// parent has 0b010 (write), 0b001 & 0b010 = 0, so no conflict
|
|
expect(result).toBe(false);
|
|
});
|
|
|
|
it('should handle groupId collaborators', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ groupId: 'group1', permission: ReadRoleVal }];
|
|
const newChildClbs: CollaboratorItemType[] = [
|
|
{ groupId: 'group1', permission: ReadRoleVal | WriteRoleVal }
|
|
];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
// Changed role is 0b010 (write), parent has 0b100 (read)
|
|
// 0b010 & 0b100 = 0, no conflict
|
|
expect(result).toBe(false);
|
|
});
|
|
|
|
it('should handle orgId collaborators', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ orgId: 'org1', permission: ReadRoleVal }];
|
|
const newChildClbs: CollaboratorItemType[] = [
|
|
{ orgId: 'org1', permission: ReadRoleVal | WriteRoleVal }
|
|
];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
// Changed role is 0b010 (write), parent has 0b100 (read)
|
|
// 0b010 & 0b100 = 0, no conflict
|
|
expect(result).toBe(false);
|
|
});
|
|
|
|
it('should detect conflict when changed role overlaps with parent permission', () => {
|
|
const parentClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: 0b110 } // read + write
|
|
];
|
|
const newChildClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: 0b100 } // only read (removed write)
|
|
];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
// Changed role is 0b010 (write bit changed)
|
|
// Parent permission is 0b110
|
|
// 0b010 & 0b110 = 0b010 (non-zero, so conflict)
|
|
expect(result).toBe(true);
|
|
});
|
|
|
|
it('should not detect conflict when changed role does not overlap', () => {
|
|
const parentClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: 0b100 } // only read
|
|
];
|
|
const newChildClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: 0b110 } // read + write (added write)
|
|
];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs
|
|
});
|
|
|
|
// Changed role is 0b010 (write bit changed)
|
|
// Parent permission is 0b100
|
|
// 0b010 & 0b100 = 0b000 (zero, so no conflict)
|
|
expect(result).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe('mergeCollaboratorList', () => {
|
|
it('should merge empty lists', () => {
|
|
const result = mergeCollaboratorList({
|
|
parentClbs: [],
|
|
childClbs: []
|
|
});
|
|
|
|
expect(result).toHaveLength(0);
|
|
});
|
|
|
|
it('should return parent list when child is empty', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs: []
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0]).toMatchObject({
|
|
tmbId: 'user1',
|
|
permission: ReadRoleVal
|
|
});
|
|
});
|
|
|
|
it('should return child list when parent is empty', () => {
|
|
const childClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: WriteRoleVal }];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs: [],
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0]).toMatchObject({
|
|
tmbId: 'user1',
|
|
permission: WriteRoleVal
|
|
});
|
|
});
|
|
|
|
it('should merge permissions for same collaborator', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const childClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: WriteRoleVal }];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0]).toMatchObject({
|
|
tmbId: 'user1',
|
|
permission: ReadRoleVal | WriteRoleVal
|
|
});
|
|
});
|
|
|
|
it('should include collaborators from both lists', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const childClbs: CollaboratorItemType[] = [{ tmbId: 'user2', permission: WriteRoleVal }];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(2);
|
|
|
|
const user1 = result.find((c) => c.tmbId === 'user1');
|
|
const user2 = result.find((c) => c.tmbId === 'user2');
|
|
|
|
expect(user1?.permission).toBe(ReadRoleVal);
|
|
expect(user2?.permission).toBe(WriteRoleVal);
|
|
});
|
|
|
|
it('should convert owner permission to manage permission in parent', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: OwnerRoleVal }];
|
|
const childClbs: CollaboratorItemType[] = [];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0]).toMatchObject({
|
|
tmbId: 'user1',
|
|
permission: ManageRoleVal
|
|
});
|
|
});
|
|
|
|
it('should not convert owner permission in child', () => {
|
|
const parentClbs: CollaboratorItemType[] = [];
|
|
const childClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: OwnerRoleVal }];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0]).toMatchObject({
|
|
tmbId: 'user1',
|
|
permission: OwnerRoleVal
|
|
});
|
|
});
|
|
|
|
it('should handle complex merge scenario', () => {
|
|
const parentClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user2', permission: WriteRoleVal },
|
|
{ tmbId: 'user3', permission: OwnerRoleVal }
|
|
];
|
|
const childClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: WriteRoleVal }, // merge with parent
|
|
{ tmbId: 'user4', permission: ManageRoleVal } // new
|
|
];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(4);
|
|
|
|
const user1 = result.find((c) => c.tmbId === 'user1');
|
|
const user2 = result.find((c) => c.tmbId === 'user2');
|
|
const user3 = result.find((c) => c.tmbId === 'user3');
|
|
const user4 = result.find((c) => c.tmbId === 'user4');
|
|
|
|
expect(user1?.permission).toBe(ReadRoleVal | WriteRoleVal);
|
|
expect(user2?.permission).toBe(WriteRoleVal);
|
|
expect(user3?.permission).toBe(ManageRoleVal); // Owner converted to Manage
|
|
expect(user4?.permission).toBe(ManageRoleVal);
|
|
});
|
|
|
|
it('should handle groupId collaborators', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ groupId: 'group1', permission: ReadRoleVal }];
|
|
const childClbs: CollaboratorItemType[] = [{ groupId: 'group1', permission: WriteRoleVal }];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0]).toMatchObject({
|
|
groupId: 'group1',
|
|
permission: ReadRoleVal | WriteRoleVal
|
|
});
|
|
});
|
|
|
|
it('should handle orgId collaborators', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ orgId: 'org1', permission: ReadRoleVal }];
|
|
const childClbs: CollaboratorItemType[] = [{ orgId: 'org1', permission: WriteRoleVal }];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0]).toMatchObject({
|
|
orgId: 'org1',
|
|
permission: ReadRoleVal | WriteRoleVal
|
|
});
|
|
});
|
|
|
|
it('should handle mixed ID types', () => {
|
|
const parentClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ groupId: 'group1', permission: WriteRoleVal }
|
|
];
|
|
const childClbs: CollaboratorItemType[] = [
|
|
{ orgId: 'org1', permission: ManageRoleVal },
|
|
{ tmbId: 'user1', permission: WriteRoleVal }
|
|
];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(3);
|
|
|
|
const user1 = result.find((c) => c.tmbId === 'user1');
|
|
const group1 = result.find((c) => c.groupId === 'group1');
|
|
const org1 = result.find((c) => c.orgId === 'org1');
|
|
|
|
expect(user1?.permission).toBe(ReadRoleVal | WriteRoleVal);
|
|
expect(group1?.permission).toBe(WriteRoleVal);
|
|
expect(org1?.permission).toBe(ManageRoleVal);
|
|
});
|
|
|
|
it('should preserve all properties when merging', () => {
|
|
type ExtendedCollaborator = CollaboratorItemType & { name?: string };
|
|
|
|
const parentClbs: ExtendedCollaborator[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal, name: 'User One' }
|
|
];
|
|
const childClbs: ExtendedCollaborator[] = [
|
|
{ tmbId: 'user1', permission: WriteRoleVal, name: 'User One Updated' }
|
|
];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
// Child properties should be preserved in merge
|
|
expect(result[0].name).toBe('User One');
|
|
expect(result[0].permission).toBe(ReadRoleVal | WriteRoleVal);
|
|
});
|
|
|
|
it('should handle all permissions being merged', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
const childClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: WriteRoleVal | ManageRoleVal }
|
|
];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0].permission).toBe(ReadRoleVal | WriteRoleVal | ManageRoleVal);
|
|
});
|
|
|
|
it('should not duplicate collaborators', () => {
|
|
const parentClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: ReadRoleVal },
|
|
{ tmbId: 'user1', permission: WriteRoleVal } // Duplicate in parent
|
|
];
|
|
const childClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ManageRoleVal }];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
// Should have only one entry for user1
|
|
const user1Entries = result.filter((c) => c.tmbId === 'user1');
|
|
expect(user1Entries).toHaveLength(1);
|
|
});
|
|
|
|
it('should handle zero permission values', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: 0 }];
|
|
const childClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0].permission).toBe(ReadRoleVal);
|
|
});
|
|
});
|
|
|
|
describe('edge cases and additional coverage', () => {
|
|
it('sumPer should handle empty array correctly', () => {
|
|
const result = sumPer(...[]);
|
|
expect(result).toBeUndefined();
|
|
});
|
|
|
|
it('getChangedCollaborators should handle empty new list', () => {
|
|
const oldClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: []
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
expect(result[0].deleted).toBe(true);
|
|
});
|
|
|
|
it('getChangedCollaborators should handle complex permission changes with higher bits', () => {
|
|
const oldClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: 0b11100 } // Higher bits + read
|
|
];
|
|
const newClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: 0b11010 } // Higher bits + write
|
|
];
|
|
|
|
const result = getChangedCollaborators({
|
|
oldRealClbs: oldClbs,
|
|
newRealClbs: newClbs
|
|
});
|
|
|
|
expect(result).toHaveLength(1);
|
|
// XOR: 0b11100 ^ 0b11010 = 0b00110
|
|
// Low 3 bits: 0b110, lowest bit: 0b010
|
|
// Higher bits are cleared in the low 3 bits processing
|
|
expect(result[0].changedRole).toBe(0b010);
|
|
});
|
|
|
|
it('checkRoleUpdateConflict should handle empty new child list', () => {
|
|
const parentClbs: CollaboratorItemType[] = [{ tmbId: 'user1', permission: ReadRoleVal }];
|
|
|
|
const result = checkRoleUpdateConflict({
|
|
parentClbs,
|
|
newChildClbs: []
|
|
});
|
|
|
|
// Deleting a parent collaborator is a conflict
|
|
expect(result).toBe(true);
|
|
});
|
|
|
|
it('mergeCollaboratorList should handle owner permission correctly in complex scenario', () => {
|
|
const parentClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: OwnerRoleVal },
|
|
{ tmbId: 'user2', permission: ReadRoleVal }
|
|
];
|
|
const childClbs: CollaboratorItemType[] = [
|
|
{ tmbId: 'user1', permission: WriteRoleVal },
|
|
{ tmbId: 'user3', permission: OwnerRoleVal }
|
|
];
|
|
|
|
const result = mergeCollaboratorList({
|
|
parentClbs,
|
|
childClbs
|
|
});
|
|
|
|
const user1 = result.find((c) => c.tmbId === 'user1');
|
|
const user3 = result.find((c) => c.tmbId === 'user3');
|
|
|
|
// user1: parent owner converted to manage, merged with child write
|
|
expect(user1?.permission).toBe(ManageRoleVal | WriteRoleVal);
|
|
// user3: child owner not converted
|
|
expect(user3?.permission).toBe(OwnerRoleVal);
|
|
});
|
|
});
|
|
});
|