Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: disposing unit should not emit error #2529

Merged
merged 13 commits into from
Jun 15, 2024
Merged

ci: disposing unit should not emit error #2529

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9b6d6f5
ci: should throw no error on disposing unit
wzhudev Jun 15, 2024
47c2ce0
ci: trigger error
wzhudev Jun 15, 2024
0dbb76a
chore: fix code style
wzhudev Jun 15, 2024
1d8ef9f
fix: change logic of permission menu
ybzky Jun 15, 2024
bdc7010
fix: fix init value
ybzky Jun 15, 2024
2508e75
chore: change export
ybzky Jun 15, 2024
2d98c60
fix: bugfix
ybzky Jun 15, 2024
dc6b0a9
fix: fix disposing sequence
wzhudev Jun 15, 2024
29fe779
chore: remove redundant code
wzhudev Jun 15, 2024
f5ee3ad
fix: clear sheet permission when dispose unit
ybzky Jun 15, 2024
f88d0dc
fix: fix time sequence error
wzhudev Jun 15, 2024
f9a6163
fix: clear permission point when dispose unit
ybzky Jun 15, 2024
3a50452
fix: fix test
ybzky Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: change logic of permission menu
  • Loading branch information
@ybzky
ybzky committed Jun 15, 2024
commit 1d8ef9f08d656edf43e9643e6c359a0d40187b7e
214 changes: 73 additions & 141 deletions packages/sheets-ui/src/controllers/menu/menu-util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,137 +51,65 @@ export function getCurrentRangeDisable$(accessor: IAccessor, permissionTypes: IP
const selectionManagerService = accessor.get(SelectionManagerService);
const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
const workbook$ = univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET);
const userManagerService = accessor.get(UserManagerService);
const contextService = accessor.get(IContextService);
const focusedOnDrawing$ = contextService.subscribeContextValue$(FOCUSING_COMMON_DRAWINGS).pipe(startWith(false));
if (!workbook) {
return of(true);
}

return combineLatest([userManagerService.currentUser$, workbook.activeSheet$, selectionManagerService.selectionMoveEnd$, focusedOnDrawing$]).pipe(
switchMap(([_, __, selection, focusOnDrawings]) => {
if (focusOnDrawings) {
return combineLatest([userManagerService.currentUser$, workbook$, selectionManagerService.selectionMoveEnd$, focusedOnDrawing$]).pipe(
switchMap(([_, workbook, selection, focusOnDrawings]) => {
if (focusOnDrawings || !workbook) {
return of(true);
}

const worksheet = workbook.getActiveSheet();
if (!worksheet) {
return of(true);
}

const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();

const permissionService = accessor.get(IPermissionService);

const { workbookTypes = [WorkbookEditablePermission], worksheetTypes, rangeTypes } = permissionTypes;

const permissionIds: string[] = [];

workbookTypes?.forEach((F) => {
permissionIds.push(new F(unitId).id);
});

worksheetTypes?.forEach((F) => {
permissionIds.push(new F(unitId, subUnitId).id);
});

const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);

if (worksheetRule) {
return permissionService.composePermission$(permissionIds).pipe(map((list) => {
return list.some((item) => item.value === false);
}));
}

const selectionRanges = selection?.map((selection) => selection.range);
const rules = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
return selectionRanges?.some((range) => {
return rule.ranges.some((ruleRange) => Rectangle.intersects(range, ruleRange));
});
});

rangeTypes?.forEach((F) => {
rules.forEach((rule) => {
permissionIds.push(new F(unitId, subUnitId, rule.permissionId).id);
});
});

return permissionService.composePermission$(permissionIds).pipe(map((list) => {
return list.some((item) => item.value === false);
}));
})
);
}

export function getCommentDisable$(accessor: IAccessor, permissionTypes: IPermissionTypes = {}) {
const univerInstanceService = accessor.get(IUniverInstanceService);
const selectionManagerService = accessor.get(SelectionManagerService);
const rangeProtectionRuleModel = accessor.get(RangeProtectionRuleModel);
const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
const userManagerService = accessor.get(UserManagerService);

const contextService = accessor.get(IContextService);
const focusedOnDrawing$ = contextService.subscribeContextValue$(FOCUSING_COMMON_DRAWINGS);

return combineLatest([userManagerService.currentUser$, selectionManagerService.selectionMoveEnd$, focusedOnDrawing$]).pipe(
switchMap(([_, __, focusOnDrawing]) => {
const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
if (!workbook) {
return of(true);
}

if (focusOnDrawing) {
return of(true);
}

const worksheet = workbook.getActiveSheet();
if (!worksheet) {
return of(true);
}

const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();

const permissionService = accessor.get(IPermissionService);

const { workbookTypes = [WorkbookEditablePermission], worksheetTypes, rangeTypes } = permissionTypes;
return workbook.activeSheet$.pipe(
switchMap((worksheet) => {
if (!worksheet) {
return of(true);
}
const unitId = workbook.getUnitId();
const subUnitId = worksheet.getSheetId();

const permissionIds: string[] = [];
const permissionService = accessor.get(IPermissionService);

workbookTypes?.forEach((F) => {
permissionIds.push(new F(unitId).id);
});
const { workbookTypes = [WorkbookEditablePermission], worksheetTypes, rangeTypes } = permissionTypes;

worksheetTypes?.forEach((F) => {
permissionIds.push(new F(unitId, subUnitId).id);
});
const permissionIds: string[] = [];

const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
workbookTypes?.forEach((F) => {
permissionIds.push(new F(unitId).id);
});

if (worksheetRule) {
return permissionService.composePermission$(permissionIds).pipe(map((list) => {
return list.some((item) => item.value === false);
}));
}
worksheetTypes?.forEach((F) => {
permissionIds.push(new F(unitId, subUnitId).id);
});

const selectionRanges = selectionManagerService.getSelections()?.map((selection) => selection.range);
const rules = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
return selectionRanges?.some((range) => {
return rule.ranges.some((ruleRange) => Rectangle.intersects(range, ruleRange));
});
});
const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);

rangeTypes?.forEach((F) => {
rules.forEach((rule) => {
permissionIds.push(new F(unitId, subUnitId, rule.permissionId).id);
});
});
if (worksheetRule) {
return permissionService.composePermission$(permissionIds).pipe(map((list) => {
return list.some((item) => item.value === false);
}));
}

return permissionService.composePermission$(permissionIds).pipe(map((list) => {
return list.some((item) => item.value === false);
}));
const selectionRanges = selection?.map((selection) => selection.range);
const rules = rangeProtectionRuleModel.getSubunitRuleList(unitId, subUnitId).filter((rule) => {
return selectionRanges?.some((range) => {
return rule.ranges.some((ruleRange) => Rectangle.intersects(range, ruleRange));
});
});

rangeTypes?.forEach((F) => {
rules.forEach((rule) => {
permissionIds.push(new F(unitId, subUnitId, rule.permissionId).id);
});
});

return permissionService.composePermission$(permissionIds).pipe(map((list) => {
return list.some((item) => item.value === false);
}));
})
);
})
);
}
Expand Down Expand Up @@ -416,39 +344,43 @@ export function getCellMenuHidden$(accessor: IAccessor, type: 'row' | 'col') {

export function getWorkbookPermissionDisable$(accessor: IAccessor, workbookPermissionTypes: WorkbookPermissionPointConstructor[]) {
const univerInstanceService = accessor.get(IUniverInstanceService);
const workbook = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
const workbook$ = univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
const worksheetRuleModel = accessor.get(WorksheetProtectionRuleModel);
const selectionRuleModel = accessor.get(RangeProtectionRuleModel);
const permissionService = accessor.get(IPermissionService);
const unitId = workbook.getUnitId();

const activeSheet$ = workbook.activeSheet$;

const userManagerService = accessor.get(UserManagerService);

return combineLatest([userManagerService.currentUser$, activeSheet$]).pipe(
switchMap(([_user, activeSheet]) => {
if (!activeSheet) {
return combineLatest([userManagerService.currentUser$, workbook$]).pipe(
switchMap(([_user, workbook]) => {
if (!workbook) {
return of(true);
}
const workbookPermissionIds: string[] = [];
workbookPermissionTypes.forEach((F) => workbookPermissionIds.push(new F(unitId).id));
const workbookPermission$ = permissionService.composePermission$(workbookPermissionIds).pipe(map((list) => list.every((item) => item.value === true)));
const workbookManageCollaboratorPermission$ = permissionService.getPermissionPoint$(new WorkbookManageCollaboratorPermission(unitId).id)?.pipe(map((permission) => permission.value)) ?? of(false);

return combineLatest([workbookPermission$, workbookManageCollaboratorPermission$]).pipe(
map(([basePermission, manageable]) => {
if (!basePermission) {
return true;
}

const subUnitId = activeSheet.getSheetId();
const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
const worksheetRuleList = selectionRuleModel.getSubunitRuleList(unitId, subUnitId);
if (worksheetRule || worksheetRuleList.length) {
return !manageable;
return workbook.activeSheet$.pipe(
switchMap((activeSheet) => {
if (!activeSheet) {
return of(true);
}
return false;
const unitId = workbook.getUnitId();
const workbookPermissionIds: string[] = [];
workbookPermissionTypes.forEach((F) => workbookPermissionIds.push(new F(unitId).id));
const workbookPermission$ = permissionService.composePermission$(workbookPermissionIds).pipe(map((list) => list.every((item) => item.value === true)));
const workbookManageCollaboratorPermission$ = permissionService.getPermissionPoint$(new WorkbookManageCollaboratorPermission(unitId).id)?.pipe(map((permission) => permission.value)) ?? of(false);

return combineLatest([workbookPermission$, workbookManageCollaboratorPermission$]).pipe(
map(([basePermission, manageable]) => {
if (!basePermission) {
return true;
}

const subUnitId = activeSheet.getSheetId();
const worksheetRule = worksheetRuleModel.getRule(unitId, subUnitId);
const worksheetRuleList = selectionRuleModel.getSubunitRuleList(unitId, subUnitId);
if (worksheetRule || worksheetRuleList.length) {
return !manageable;
}
return false;
})
);
})
);
})
Expand Down
Loading