From 9698beff07d1c83d98a36b46c0cec8bcca5d41d2 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Wed, 12 Nov 2025 21:55:36 +0700 Subject: [PATCH 1/2] Enable formatting check Signed-off-by: Andrey Sobolev --- .github/workflows/ci.yml | 10 ++++++++++ packages/middleware/src/spacePermissions.ts | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1474647..1f88535 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,16 @@ jobs: run: node common/scripts/install-run-rush.js install - name: Rush validate run: node common/scripts/install-run-rush.js validate --verbose + - name: Formatting... + run: node common/scripts/install-run-rush.js format --force + - name: Check files formatting + run: | + echo '================================================================' + echo 'Checking for diff files' + echo '================================================================' + git diff '*.js' '*.ts' '*.svelte' '*.json' '*.yaml' | cat + [ -z "$(git diff --name-only '*.js' '*.ts' '*.svelte' '*.json' '*.yaml' | cat)" ] + echo '================================================================' - name: Prepare server run: | cd ./tests diff --git a/packages/middleware/src/spacePermissions.ts b/packages/middleware/src/spacePermissions.ts index b570c8a..1a0b1c5 100644 --- a/packages/middleware/src/spacePermissions.ts +++ b/packages/middleware/src/spacePermissions.ts @@ -160,10 +160,15 @@ export class SpacePermissionsMiddleware extends BaseMiddleware implements Middle private checkPermission (ctx: MeasureContext, space: Ref, tx: TxCUD): boolean { const account = ctx.contextData.account const permissions = this.permissionsBySpace[space]?.[account.uuid] ?? [] - let withoutMatch: Permission | undefined = undefined + let withoutMatch: Permission | undefined for (const permission of permissions) { if (permission.txClass === undefined || permission.txClass !== tx._class) continue - if (permission.objectClass !== undefined && !this.context.hierarchy.isDerived(tx.objectClass, permission.objectClass)) continue + if ( + permission.objectClass !== undefined && + !this.context.hierarchy.isDerived(tx.objectClass, permission.objectClass) + ) { + continue + } if (permission.txMatch === undefined) { withoutMatch = permission continue From e61afca207fd0c606115e41ec52624ca1023d3c5 Mon Sep 17 00:00:00 2001 From: Andrey Sobolev Date: Wed, 12 Nov 2025 21:59:16 +0700 Subject: [PATCH 2/2] Add change Signed-off-by: Andrey Sobolev --- .../middleware/fix-formatting_2025-11-12-14-59.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@hcengineering/middleware/fix-formatting_2025-11-12-14-59.json diff --git a/common/changes/@hcengineering/middleware/fix-formatting_2025-11-12-14-59.json b/common/changes/@hcengineering/middleware/fix-formatting_2025-11-12-14-59.json new file mode 100644 index 0000000..b78e3e8 --- /dev/null +++ b/common/changes/@hcengineering/middleware/fix-formatting_2025-11-12-14-59.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@hcengineering/middleware", + "comment": "Fix formatting", + "type": "none" + } + ], + "packageName": "@hcengineering/middleware" +} \ No newline at end of file