From 02816917a842bf04197fc288f44b6f78c728a33f Mon Sep 17 00:00:00 2001 From: Kevin Aleman Date: Mon, 10 Nov 2025 11:58:07 -0600 Subject: [PATCH 1/3] new setting for abac attributes --- apps/meteor/ee/server/settings/abac.ts | 7 +++++++ packages/i18n/src/locales/en.i18n.json | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/meteor/ee/server/settings/abac.ts b/apps/meteor/ee/server/settings/abac.ts index f187e17703cdd..63a766450beb1 100644 --- a/apps/meteor/ee/server/settings/abac.ts +++ b/apps/meteor/ee/server/settings/abac.ts @@ -15,6 +15,13 @@ export function addSettings(): void { section: 'ABAC', i18nDescription: 'ABAC_Enabled_Description', }); + await this.add('ABAC_ShowAttributesInRooms', false, { + type: 'boolean', + public: true, + invalidValue: false, + section: 'ABAC', + enableQuery: { _id: 'ABAC_Enabled', value: true }, + }); }, ); }); diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json index 920d0dd53559f..83c51ec29a5f6 100644 --- a/packages/i18n/src/locales/en.i18n.json +++ b/packages/i18n/src/locales/en.i18n.json @@ -21,6 +21,8 @@ "ABAC_Warning_Modal_Title": "Deactivate ABAC", "ABAC_Warning_Modal_Confirm_Text": "Deactivate ABAC", "ABAC_Warning_Modal_Content": "You will not be able to automatically or manually manage users in existing ABAC-managed rooms. To restore a room's default access control, it must be removed from ABAC management in <1>ABAC > Rooms.", + "ABAC_ShowAttributesInRooms": "Show ABAC attributes in rooms", + "ABAC_ShowAttributesInRooms_Description": "Display the ABAC attributes assigned to the room in the contextual bar", "abac-management": "Manage ABAC configuration", "abac_removed_user_from_the_room": "was removed by ABAC", "AI_Actions": "AI actions", @@ -7108,4 +7110,4 @@ "timestamps.fullDateTimeDescription": "December 31, 2020 12:00 AM", "timestamps.fullDateTimeLongDescription": "Thursday, December 31, 2020 12:00:00 AM", "timestamps.relativeTimeDescription": "1 year ago" -} \ No newline at end of file +} From 55f946be932720d59fc82e859e042ac6067800a5 Mon Sep 17 00:00:00 2001 From: Kevin Aleman Date: Mon, 10 Nov 2025 12:18:56 -0600 Subject: [PATCH 2/3] fix --- packages/i18n/src/locales/en.i18n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json index 83c51ec29a5f6..e208a2b19a792 100644 --- a/packages/i18n/src/locales/en.i18n.json +++ b/packages/i18n/src/locales/en.i18n.json @@ -7110,4 +7110,4 @@ "timestamps.fullDateTimeDescription": "December 31, 2020 12:00 AM", "timestamps.fullDateTimeLongDescription": "Thursday, December 31, 2020 12:00:00 AM", "timestamps.relativeTimeDescription": "1 year ago" -} +} \ No newline at end of file From a43ad1cf2e10ce6b30382e460caf730692e597ff Mon Sep 17 00:00:00 2001 From: Kevin Aleman Date: Tue, 11 Nov 2025 08:45:49 -0600 Subject: [PATCH 3/3] lint --- apps/meteor/ee/server/settings/abac.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/meteor/ee/server/settings/abac.ts b/apps/meteor/ee/server/settings/abac.ts index a1bd7e1222776..14be029d785d6 100644 --- a/apps/meteor/ee/server/settings/abac.ts +++ b/apps/meteor/ee/server/settings/abac.ts @@ -21,13 +21,13 @@ export function addSettings(): void { invalidValue: false, section: 'ABAC', enableQuery: { _id: 'ABAC_Enabled', value: true }, - }); + }); await this.add('Abac_Cache_Decision_Time_Seconds', 300, { type: 'int', public: true, section: 'ABAC', invalidValue: 0, - enableQuery: { _id: 'ABAC_Enabled', value: true }, + enableQuery: { _id: 'ABAC_Enabled', value: true }, }); }, );