fix: remove duplicate values found in common.keys#23477
fix: remove duplicate values found in common.keys#23477GeneCodeSavvy wants to merge 4 commits intocalcom:mainfrom
Conversation
|
@GeneCodeSavvy is attempting to deploy a commit to the cal Team on Vercel. A member of the Team first needs to authorize it. |
WalkthroughThe PR renames several translation i18n keys and updates components to use the new shorter keys. It deletes multiple keys from apps/web/public/static/locales/en/common.json and updates usages in AppPage.tsx, WebhookForm.tsx, permission registry (permission-registry.ts), and event-type tab navigation hooks. No runtime control flow, APIs, or data structures were changed. Assessment against linked issues
Assessment against linked issues: Out-of-scope changes
Possibly related PRs
📜 Recent review detailsConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro 💡 Knowledge Base configuration:
You can enable these sources in your CodeRabbit configuration. 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
⏰ Context from checks skipped due to timeout of 180000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (4)
✨ Finishing Touches
🧪 Generate unit tests
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. CodeRabbit Commands (Invoked using PR/Issue comments)Type Other keywords and placeholders
Status, Documentation and Community
|
|
Hey there and thank you for opening this pull request! 👋🏼 We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted. Details: |
GeneCodeSavvy
force-pushed
the
rm-duplicates
branch
from
2bd046d to
63e091a
Compare
GeneCodeSavvy
changed the title
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
🧹 Nitpick comments (3)
packages/platform/atoms/event-types/hooks/usePlatformTabsNavigations.tsx (1)
171-180: Key simplification looks goodSwitching to t("advanced") matches the locale cleanup while keeping data-testid stable. Consider aligning the test id in a follow-up for consistency.
packages/features/pbac/domain/types/permission-registry.ts (2)
261-266: Copy mismatch: “members” vs “admins”description says “Invite organization members” but descriptionI18nKey points to invite_organization_admins. Align them.
Apply one of:
- Update fallback copy to match key:
- description: "Invite organization members", + description: "Invite organization admins",
- Or switch to a “members” i18n key if present:
- descriptionI18nKey: "invite_organization_admins", + descriptionI18nKey: "invite_organization_members",Verify the chosen key exists in common.json with the script above.
106-108: Mixed pbac_resource_ vs generic nouns — ensure pbac keys weren’t removed; consider standardizing*Several resource.i18nKey entries still use pbac_resource* while others moved to generic nouns (teams, bookings, insights, workflows, attributes). If the PR removed these pbac_resource_* keys from common.json, lookups will fail. Either keep the keys in JSON or migrate these to generic nouns for consistency.
You can reuse the earlier script; it will flag any missing pbac_resource_* keys so you can switch to generic alternatives (e.g., roles, event_types, organization, routing_forms).
Also applies to: 118-121, 150-152, 236-238, 419-421
📜 Review details
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
💡 Knowledge Base configuration:
- MCP integration is disabled by default for public repositories
- Jira integration is disabled by default for public repositories
- Linear integration is disabled by default for public repositories
You can enable these sources in your CodeRabbit configuration.
📒 Files selected for processing (7)
apps/web/components/apps/AppPage.tsx(1 hunks)apps/web/public/static/locales/en/common.json(0 hunks)packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsx(1 hunks)packages/features/pbac/domain/types/permission-registry.ts(11 hunks)packages/features/webhooks/components/WebhookForm.tsx(2 hunks)packages/platform/atoms/event-types/hooks/usePlatformTabsNavigations.tsx(1 hunks)packages/platform/atoms/event-types/hooks/useTabsNavigations.tsx(1 hunks)
💤 Files with no reviewable changes (1)
- apps/web/public/static/locales/en/common.json
🧰 Additional context used
📓 Path-based instructions (4)
**/*.tsx
📄 CodeRabbit inference engine (.cursor/rules/review.mdc)
Always use
t()for text localization in frontend code; direct text embedding should trigger a warning
Files:
packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsxpackages/platform/atoms/event-types/hooks/useTabsNavigations.tsxpackages/features/webhooks/components/WebhookForm.tsxpackages/platform/atoms/event-types/hooks/usePlatformTabsNavigations.tsxapps/web/components/apps/AppPage.tsx
**/*.{ts,tsx}
📄 CodeRabbit inference engine (.cursor/rules/review.mdc)
Flag excessive Day.js use in performance-critical code; prefer native Date or Day.js
.utc()in hot paths like loops
Files:
packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsxpackages/platform/atoms/event-types/hooks/useTabsNavigations.tsxpackages/features/webhooks/components/WebhookForm.tsxpackages/platform/atoms/event-types/hooks/usePlatformTabsNavigations.tsxapps/web/components/apps/AppPage.tsxpackages/features/pbac/domain/types/permission-registry.ts
**/*.{ts,tsx,js,jsx}
⚙️ CodeRabbit configuration file
Flag default exports and encourage named exports. Named exports provide better tree-shaking, easier refactoring, and clearer imports. Exempt main components like pages, layouts, and components that serve as the primary export of a module.
Files:
packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsxpackages/platform/atoms/event-types/hooks/useTabsNavigations.tsxpackages/features/webhooks/components/WebhookForm.tsxpackages/platform/atoms/event-types/hooks/usePlatformTabsNavigations.tsxapps/web/components/apps/AppPage.tsxpackages/features/pbac/domain/types/permission-registry.ts
**/*.ts
📄 CodeRabbit inference engine (.cursor/rules/review.mdc)
**/*.ts: For Prisma queries, only select data you need; never useinclude, always useselect
Ensure thecredential.keyfield is never returned from tRPC endpoints or APIs
Files:
packages/features/pbac/domain/types/permission-registry.ts
🧠 Learnings (1)
📚 Learning: 2025-08-27T13:32:46.887Z
Learnt from: supalarry
PR: calcom/cal.com#23364
File: apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformers/internal-to-api/internal-to-api.spec.ts:295-296
Timestamp: 2025-08-27T13:32:46.887Z
Learning: In calcom/cal.com, when transforming booking fields from internal to API format, tests in organizations-event-types.e2e-spec.ts already expect name field label and placeholder to be empty strings ("") rather than undefined. PR changes that set these to explicit empty strings are typically fixing implementation to match existing test expectations rather than breaking changes.
Applied to files:
packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsx
⏰ Context from checks skipped due to timeout of 180000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (2)
- GitHub Check: Install dependencies / Yarn install & cache
- GitHub Check: Codacy Static Code Analysis
🔇 Additional comments (5)
packages/features/eventtypes/components/tabs/advanced/CustomEventTypeModal.tsx (1)
134-135: Verify copy: “webhook_title” in an event-type contextUsing webhook_* text here may read oddly next to {Event type title}. If the goal is deduping keys, confirm the string for webhook_title makes sense in this UI context (e.g., “The event’s title”). Otherwise consider a more neutral key like “title” for reuse across features.
apps/web/components/apps/AppPage.tsx (1)
368-372: Missing “free” key in non-English locales
The canonical “free” key is only defined in en/common.json (line 3551); add translations for “free” to all other locale files to prevent fallback to English.⛔ Skipped due to learnings
Learnt from: bandhan-majumder PR: calcom/cal.com#23192 File: packages/features/insights/components/booking/LeastCompletedBookings.tsx:31-31 Timestamp: 2025-08-21T05:55:35.187Z Learning: Cal.com uses an automated i18n system with lingo.dev that automatically propagates new translation keys from en/common.json to all other locale files and creates PRs with proper translations. The system includes a check-missing-translations.ts script that adds English placeholders for missing keys, and a GitHub workflow that triggers lingo.dev automation to translate and create PRs.packages/platform/atoms/event-types/hooks/useTabsNavigations.tsx (1)
212-217: Consistent move to t("advanced")Matches the platform hook change; no behavioral impact expected.
packages/features/webhooks/components/WebhookForm.tsx (2)
127-132: Possible mismatch: cancellationReason vs “webhook_cancellation_host”Variable is “cancellationReason” (free-text reason), but the label key implies “who canceled.” Verify intent and copy. If it’s the reason, prefer a key that communicates “reason”; if it’s the actor, consider renaming the variable in UI/docs to match.
194-201: Teams category key change looks fineUsing t("teams") is consistent with the key consolidation. Please confirm the key exists across locales.
| description: "All actions on all resources", | ||
| category: "system", | ||
| i18nKey: "pbac_resource_all", | ||
| i18nKey: "event_types_page_title", |
There was a problem hiding this comment.
💡 Verification agent
🧩 Analysis chain
Wrong i18n key for “All” action
Using event_types_page_title for CrudAction.All is semantically incorrect and will render an unrelated label. Map to a generic key (e.g., all) or keep a dedicated pbac_action_all key.
Apply this diff:
- i18nKey: "event_types_page_title",
+ i18nKey: "all",Run the verification script below (next comment) to confirm the all key exists as a scalar string in common.json.
🏁 Script executed:
#!/bin/bash
set -e
# Locate all common.json files in the repository
files=$(find . -type f -name common.json)
if [ -z "$files" ]; then
echo "No common.json files found."
exit 1
fi
echo "Found common.json at:"
echo "$files"
# Verify that the key "all" exists as a top-level string key
for f in $files; do
echo "Checking $f for key \"all\"..."
if grep -P '"all"\s*:\s*"[^"]+"' "$f" >/dev/null; then
echo "✔️ Key \"all\" exists in $f"
else
echo "❌ Key \"all\" NOT found in $f"
exit 1
fi
doneLength of output: 16796
Missing “all” key in translations – add or use a dedicated key
The proposed change to map CrudAction.All to "all" will break Indonesian locale (apps/web/public/static/locales/id/common.json), where "all" is absent. Add the "all": "All" entry (and translations) to that file (and any others missing it) or introduce a new pbac_action_all key across all common.json files before applying this diff.
🤖 Prompt for AI Agents
In packages/features/pbac/domain/types/permission-registry.ts around line 112,
the change mapping CrudAction.All to the string "all" will break locales missing
that key (notably apps/web/public/static/locales/id/common.json); add an "all":
"All" entry (and translated values) to that Indonesian common.json and any other
locale files missing it, or alternatively introduce a new key like
"pbac_action_all" in every common.json and update the mapping to use that key
consistently across all locales before applying this diff so translations remain
complete.
| description: "Update settings", | ||
| category: "team", | ||
| i18nKey: "pbac_action_update", | ||
| i18nKey: "edit", | ||
| descriptionI18nKey: "pbac_desc_update_team_settings", | ||
| dependsOn: ["team.read"], | ||
| }, |
There was a problem hiding this comment.
💡 Verification agent
🧩 Analysis chain
Sanity-check dependsOn strings resolve to defined permissions
Guard against typos in dependsOn (e.g., organization.listMembers). Verify each dependsOn maps to an actually defined [Resource].[Action] in PERMISSION_REGISTRY.
Also applies to: 294-300, 335-341, 436-441, 442-448
🏁 Script executed:
#!/bin/bash
set -euo pipefail
TS="packages/features/pbac/domain/types/permission-registry.ts"
node - <<'NODE'
const fs = require('fs');
const src = fs.readFileSync(process.env.TS, 'utf8');
// Parse enums into maps
function parseEnum(name){
const m = src.match(new RegExp(`export enum ${name} \\{([\\s\\S]*?)\\}`, 'm'));
const body = m ? m[1] : '';
const map = {};
for (const line of body.split('\n')) {
const mm = line.match(/^\s*(\w+)\s*=\s*"(.*)"/);
if (mm) map[mm[1]] = mm[2];
}
return map;
}
const Resource = parseEnum('Resource');
const CrudAction = parseEnum('CrudAction');
const CustomAction = parseEnum('CustomAction');
// Build set of defined permission strings from PERMISSION_REGISTRY
const regMatch = src.match(/PERMISSION_REGISTRY:\s*PermissionRegistry\s*=\s*\{([\s\S]*)\};/m);
if (!regMatch) { console.error('Registry not found'); process.exit(2); }
const reg = regMatch[1];
const defined = new Set();
const resourceBlocks = [...reg.matchAll(/\[Resource\.(\w+)\]\s*:\s*\{([\s\S]*?)\}\s*,/g)];
for (const [, resKey, block] of resourceBlocks) {
const res = Resource[resKey];
if (!res) continue;
for (const m of block.matchAll(/\[(CrudAction|CustomAction)\.(\w+)\]\s*:/g)) {
const kind = m[1], actionKey = m[2];
const act = (kind === 'CrudAction' ? CrudAction[actionKey] : CustomAction[actionKey]);
if (act) defined.add(`${res}.${act}`);
}
}
// Collect dependsOn strings
const depends = [...reg.matchAll(/dependsOn:\s*\[([^\]]*)\]/g)]
.flatMap(([, list]) => [...list.matchAll(/"([^"]+)"/g)].map(m => m[1]));
const unknown = depends.filter(d => !defined.has(d));
if (unknown.length) {
console.log('Unknown dependsOn entries (do not match any defined permission):');
for (const d of new Set(unknown)) console.log(' -', d);
process.exit(1);
}
console.log('All dependsOn entries resolve to defined permissions.');
NODELength of output: 818
🏁 Script executed:
#!/usr/bin/env bash
set -euo pipefail
# Directly read the file path instead of relying on an unset env var
node << 'NODE'
const fs = require('fs');
const src = fs.readFileSync(
'packages/features/pbac/domain/types/permission-registry.ts',
'utf8'
);
// Parse enums into maps
function parseEnum(name) {
const m = src.match(new RegExp(\`export enum \${name} \\{([\\s\\S]*?)\\}\`, 'm'));
const body = m ? m[1] : '';
const map = {};
for (const line of body.split('\n')) {
const mm = line.match(/^\s*(\w+)\s*=\s*"(.*)"/);
if (mm) map[mm[1]] = mm[2];
}
return map;
}
const Resource = parseEnum('Resource');
const CrudAction = parseEnum('CrudAction');
const CustomAction = parseEnum('CustomAction');
// Build set of defined permission strings from PERMISSION_REGISTRY
const regMatch = src.match(
/PERMISSION_REGISTRY:\s*PermissionRegistry\s*=\s*\{([\s\S]*?)\};/m
);
if (!regMatch) {
console.error('Registry not found');
process.exit(2);
}
const reg = regMatch[1];
const defined = new Set();
const resourceBlocks = [
...reg.matchAll(/\[Resource\.(\w+)\]\s*:\s*\{([\s\S]*?)\}\s*,/g)
];
for (const [, resKey, block] of resourceBlocks) {
const res = Resource[resKey];
if (!res) continue;
for (const m of block.matchAll(/\[(CrudAction|CustomAction)\.(\w+)\]\s*:/g)) {
const kind = m[1],
actionKey = m[2];
const act =
kind === 'CrudAction'
? CrudAction[actionKey]
: CustomAction[actionKey];
if (act) defined.add(\`\${res}.\${act}\`);
}
}
// Collect dependsOn strings
const depends = [...reg.matchAll(/dependsOn:\s*\[([^\]]*)\]/g)]
.flatMap(([, list]) =>
[...list.matchAll(/"([^"]+)"/g)].map((m) => m[1])
);
const unknown = depends.filter((d) => !defined.has(d));
if (unknown.length) {
console.log(
'Unknown dependsOn entries (do not match any defined permission):'
);
for (const d of new Set(unknown)) console.log(' -', d);
process.exit(1);
}
console.log('All dependsOn entries resolve to defined permissions.');
NODELength of output: 711
🏁 Script executed:
#!/usr/bin/env bash
set -euo pipefail
node << 'EOF'
const fs = require('fs');
const src = fs.readFileSync('packages/features/pbac/domain/types/permission-registry.ts', 'utf8');
// Parse enums
const Resource = {}, CrudAction = {}, CustomAction = {};
let mode = null;
src.split('\n').forEach(line => {
if (line.startsWith('export enum Resource')) { mode = 'Resource'; return; }
if (line.startsWith('export enum CrudAction')) { mode = 'CrudAction'; return; }
if (line.startsWith('export enum CustomAction')) { mode = 'CustomAction'; return; }
if (mode && line.trim() === '}') { mode = null; return; }
if (mode) {
const m = line.match(/^\s*(\w+)\s*=\s*"(.*)"/);
if (m) {
const [, key, val] = m;
if (mode === 'Resource') Resource[key] = val;
if (mode === 'CrudAction') CrudAction[key] = val;
if (mode === 'CustomAction') CustomAction[key] = val;
}
}
});
// Build defined permission set
const defined = new Set();
let inRegistry = false, currentRes = null;
src.split('\n').forEach(line => {
if (!inRegistry && line.includes('PERMISSION_REGISTRY')) {
inRegistry = true;
return;
}
if (inRegistry) {
const start = line.match(/\[Resource\.(\w+)\]\s*:\s*{/);
if (start) {
currentRes = Resource[start[1]];
return;
}
if (currentRes && /^\s*}\s*,\s*$/.test(line)) {
currentRes = null;
return;
}
if (currentRes) {
const m = line.match(/\[(CrudAction|CustomAction)\.(\w+)\]/);
if (m) {
const [, kind, actionKey] = m;
const act = kind === 'CrudAction' ? CrudAction[actionKey] : CustomAction[actionKey];
defined.add(`${currentRes}.${act}`);
}
}
}
});
// Extract dependsOn entries
const deps = [];
const regex = /dependsOn\s*:\s*\[([^\]]*)\]/g;
let match;
while ((match = regex.exec(src)) !== null) {
const list = match[1];
list.split(',').map(item => item.trim().replace(/^"|"$/g, '')).forEach(s => s && deps.push(s));
}
// Report unknown entries
const unknown = deps.filter(d => !defined.has(d));
if (unknown.length) {
console.log('Unknown dependsOn entries:');
for (const u of [...new Set(unknown)]) console.log(' -', u);
process.exit(1);
}
console.log('All dependsOn entries resolve to defined permissions.');
EOFLength of output: 231
Undefined dependsOn entries in PERMISSION_REGISTRY
The following dependsOn values have no matching Resource.Action in packages/features/pbac/domain/types/permission-registry.ts:
- role.read
- eventType.read
- team.read
- organization.read
- organization.listMembers
- booking.read
- workflow.read
- organization.attributes.read
- routingForm.read
Ensure each dependsOn string is either corrected or the corresponding permission is added to PERMISSION_REGISTRY.
GeneCodeSavvy
changed the title
| "pbac_resource_all": "All Resources", | ||
| "pbac_resource_event_type": "Event Types", | ||
| "pbac_resource_team": "Teams", | ||
| "pbac_resource_organization": "Organization", | ||
| "pbac_resource_booking": "Bookings", | ||
| "pbac_resource_insights": "Insights", |
There was a problem hiding this comment.
These keys were removed due to duplication, but I think they are still not fully removed, or their alternatives are not being used in the code. Please verify all the removed keys. cc @kart1ka for quick review
There was a problem hiding this comment.
"pbac_resource_all" is currently being used, so keep it
There was a problem hiding this comment.
Actionable comments posted: 1
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
packages/features/pbac/domain/types/permission-registry.ts (1)
124-147: Missing "create" key in Croatian locale
apps/web/public/static/locales/hr/common.json lacks the"create"entry for the generic action i18n keys. Add"create"(and verify that all other shared keys—edit, delete, invite, remove, etc.—are present as strings) in this file.
♻️ Duplicate comments (1)
packages/features/pbac/domain/types/permission-registry.ts (1)
39-53: Optional: centralize action i18n keys to avoid typosExtract a small const and reuse across the registry.
+export const ActionI18nKeys = { + create: "create", + read: "pbac_action_read", + edit: "edit", + delete: "delete", + invite: "invite", + remove: "remove", +} as const;
🧹 Nitpick comments (3)
packages/features/pbac/domain/types/permission-registry.ts (3)
150-152: Use a generic resource key for Event Typesevent_types_page_title is page-specific. Prefer a generic noun key for the resource label to keep consistency with teams/bookings/etc.
- i18nKey: "event_types_page_title", + i18nKey: "event_types",Please confirm "event_types" exists (and is a string) across locales before changing.
262-268: Description key targets “admins” but the action is “Invite organization members”Align the description key with the action scope to avoid misleading copy.
- descriptionI18nKey: "invite_organization_admins", + descriptionI18nKey: "pbac_desc_invite_organization_members",Verify that pbac_desc_invite_organization_members exists in en/common.json (and translations) or add it; lingo.dev can propagate.
419-421: Align RoutingForm resource label with generic nounsOther resources use generic keys (teams, bookings, workflows, attributes). Consider the same here.
- i18nKey: "pbac_resource_routing_form", + i18nKey: "routing_form",Confirm routing_form exists in all locales or add it and let translation automation propagate.
📜 Review details
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro
💡 Knowledge Base configuration:
- MCP integration is disabled by default for public repositories
- Jira integration is disabled by default for public repositories
- Linear integration is disabled by default for public repositories
You can enable these sources in your CodeRabbit configuration.
📒 Files selected for processing (1)
packages/features/pbac/domain/types/permission-registry.ts(13 hunks)
🧰 Additional context used
📓 Path-based instructions (3)
**/*.ts
📄 CodeRabbit inference engine (.cursor/rules/review.mdc)
**/*.ts: For Prisma queries, only select data you need; never useinclude, always useselect
Ensure thecredential.keyfield is never returned from tRPC endpoints or APIs
Files:
packages/features/pbac/domain/types/permission-registry.ts
**/*.{ts,tsx}
📄 CodeRabbit inference engine (.cursor/rules/review.mdc)
Flag excessive Day.js use in performance-critical code; prefer native Date or Day.js
.utc()in hot paths like loops
Files:
packages/features/pbac/domain/types/permission-registry.ts
**/*.{ts,tsx,js,jsx}
⚙️ CodeRabbit configuration file
Flag default exports and encourage named exports. Named exports provide better tree-shaking, easier refactoring, and clearer imports. Exempt main components like pages, layouts, and components that serve as the primary export of a module.
Files:
packages/features/pbac/domain/types/permission-registry.ts
🧠 Learnings (1)
📓 Common learnings
Learnt from: bandhan-majumder
PR: calcom/cal.com#23192
File: packages/features/insights/components/booking/LeastCompletedBookings.tsx:31-31
Timestamp: 2025-08-21T05:55:35.187Z
Learning: Cal.com uses an automated i18n system with lingo.dev that automatically propagates new translation keys from en/common.json to all other locale files and creates PRs with proper translations. The system includes a check-missing-translations.ts script that adds English placeholders for missing keys, and a GitHub workflow that triggers lingo.dev automation to translate and create PRs.
⏰ Context from checks skipped due to timeout of 180000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)
- GitHub Check: Tests / Unit
- GitHub Check: Linters / lint
- GitHub Check: Type check / check-types
| dependsOn: ["role.read"], | ||
| }, |
There was a problem hiding this comment.
💡 Verification agent
🧩 Analysis chain
Sanity-check dependsOn strings resolve to defined permissions
Guard against typos by verifying each dependsOn matches a defined [Resource].[Action] in this registry.
Also applies to: 139-140, 171-172, 178-179, 191-192, 204-205, 211-212, 218-219, 225-226, 259-260, 267-268, 275-276, 291-292, 299-300, 318-319, 326-327, 333-334, 340-341, 363-364, 376-377, 383-384, 401-402, 408-409, 415-416, 427-428, 440-441, 447-448
🏁 Script executed:
#!/usr/bin/env bash
set -euo pipefail
TS='packages/features/pbac/domain/types/permission-registry.ts'
node <<'NODE'
const fs=require('fs');const src=fs.readFileSync(process.env.TS||'packages/features/pbac/domain/types/permission-registry.ts','utf8');
function parseEnum(name){const m=src.match(new RegExp(`export enum ${name} \\{([\\s\\S]*?)\\}`,'m'));const body=m?m[1]:'';const map={};for(const ln of body.split('\n')){const mm=ln.match(/^\s*(\w+)\s*=\s*"(.*)"/);if(mm)map[mm[1]]=mm[2];}return map;}
const Resource=parseEnum('Resource'),CrudAction=parseEnum('CrudAction'),CustomAction=parseEnum('CustomAction');
const reg=(src.match(/PERMISSION_REGISTRY:[\s\S]*?=\s*\{([\s\S]*?)\};/m)||[])[1]||'';
const defined=new Set();
for (const m of reg.matchAll(/\[Resource\.(\w+)\]\s*:\s*\{([\s\S]*?)\}\s*,/g)){
const res=Resource[m[1]], block=m[2];
for (const a of block.matchAll(/\[(CrudAction|CustomAction)\.(\w+)\]\s*:/g)){
const act = a[1]==='CrudAction'?CrudAction[a[2]]:CustomAction[a[2]];
if (res&&act) defined.add(`${res}.${act}`);
}
}
const deps=[...reg.matchAll(/dependsOn:\s*\[([^\]]*)\]/g)]
.flatMap(([,list])=>[...list.matchAll(/"([^"]+)"/g)].map(m=>m[1]));
const unknown=[...new Set(deps.filter(d=>!defined.has(d)))];
if(unknown.length){console.log('Unknown dependsOn:', ...unknown);process.exit(1);}else{console.log('All dependsOn entries resolve.');}
NODELength of output: 260
Resolve undefined dependsOn permissions: The following dependsOn entries have no matching Resource.Action in permission-registry.ts: role.read, eventType.read, team.read, organization.read, organization.listMembers, booking.read, workflow.read, organization.attributes.read, routingForm.read. Add or correct these permission definitions so each dependsOn value matches an existing enum entry.
🤖 Prompt for AI Agents
In packages/features/pbac/domain/types/permission-registry.ts around lines
126-127, several dependsOn entries reference non-existent Resource.Action values
(role.read, eventType.read, team.read, organization.read,
organization.listMembers, booking.read, workflow.read,
organization.attributes.read, routingForm.read); update the file so each
dependsOn string matches a real enum member: either add the missing
Resource.Action enum entries with the exact names used in dependsOn or change
the dependsOn values to the correct existing enum identifiers used elsewhere in
this registry; after editing, run tsc/CI to ensure no unresolved enum references
remain.
volnei
left a comment
volnei
left a comment
There was a problem hiding this comment.
@GeneCodeSavvy @anikdhabal
I'm not sure we should go this route. While these values are duplicated, we need to make sure the labels remain independent.
Too generic labels can lead errors and in the future, if we change a value, it might lose its meaning when used elsewhere.
@emrysal @keithwillcode thoughts?
|
Agree with @volnei. Context is king |
|
Closing due to inactivity and also the approach needs to be addressed once again. |
5 participants
What does this PR do?
Visual Demo (For contributors especially)
A visual demonstration is strongly recommended, for both the original and new change (video / image - any one).
Video Demo (if applicable):
Image Demo (if applicable):
Mandatory Tasks (DO NOT REMOVE)
How should this be tested?