π OpenHands: AI-Driven Development
feat: add manage automations permission and broadcast org selection (#13908)
Hiep Le58df84e16c78
diff --git a/enterprise/server/auth/authorization.py b/enterprise/server/auth/authorization.pyindex 89d1666f97..3cb7308f5e 100644--- a/enterprise/server/auth/authorization.py+++ b/enterprise/server/auth/authorization.py@@ -87,6 +87,9 @@ class Permission(str, Enum):# Git organization claimsMANAGE_ORG_CLAIMS = 'manage_org_claims'+ # Manage Automations+ MANAGE_AUTOMATIONS = 'manage_automations'+class RoleName(str, Enum):"""Role names used in the system."""@@ -123,6 +126,8 @@ ROLE_PERMISSIONS: dict[RoleName, frozenset[Permission]] = {Permission.DELETE_ORGANIZATION,# Git organization claimsPermission.MANAGE_ORG_CLAIMS,+ # Manage Automations+ Permission.MANAGE_AUTOMATIONS,]),RoleName.ADMIN: frozenset(@@ -146,6 +151,8 @@ ROLE_PERMISSIONS: dict[RoleName, frozenset[Permission]] = {Permission.EDIT_ORG_SETTINGS,# Git organization claimsPermission.MANAGE_ORG_CLAIMS,+ # Manage Automations+ Permission.MANAGE_AUTOMATIONS,]),RoleName.MEMBER: frozenset(@@ -159,6 +166,8 @@ ROLE_PERMISSIONS: dict[RoleName, frozenset[Permission]] = {# Settings (View only)Permission.VIEW_ORG_SETTINGS,Permission.VIEW_LLM_SETTINGS,+ # Manage Automations+ Permission.MANAGE_AUTOMATIONS,]),}diff --git a/enterprise/tests/unit/test_authorization.py b/enterprise/tests/unit/test_authorization.pyindex 5a35c3836d..62394fec94 100644--- a/enterprise/tests/unit/test_authorization.py+++ b/enterprise/tests/unit/test_authorization.py@@ -56,6 +56,7 @@ class TestPermission:assert Permission.VIEW_ORG_SETTINGS.value == 'view_org_settings'assert Permission.CHANGE_ORGANIZATION_NAME.value == 'change_organization_name'assert Permission.DELETE_ORGANIZATION.value == 'delete_organization'+ assert Permission.MANAGE_AUTOMATIONS.value == 'manage_automations'def test_permission_from_string(self):"""@@ -142,6 +143,7 @@ class TestRolePermissions:assert Permission.CHANGE_USER_ROLE_OWNER in owner_permsassert Permission.CHANGE_ORGANIZATION_NAME in owner_permsassert Permission.DELETE_ORGANIZATION in owner_perms+ assert Permission.MANAGE_AUTOMATIONS in owner_permsdef test_admin_has_admin_permissions(self):"""@@ -159,6 +161,7 @@ class TestRolePermissions:assert Permission.INVITE_USER_TO_ORGANIZATION in admin_permsassert Permission.CHANGE_USER_ROLE_MEMBER in admin_permsassert Permission.CHANGE_USER_ROLE_ADMIN in admin_perms+ assert Permission.MANAGE_AUTOMATIONS in admin_perms# Admin should NOT have owner-only permissionsassert Permission.CHANGE_USER_ROLE_OWNER not in admin_permsassert Permission.CHANGE_ORGANIZATION_NAME not in admin_perms@@ -177,6 +180,7 @@ class TestRolePermissions:assert Permission.MANAGE_INTEGRATIONS in member_permsassert Permission.MANAGE_APPLICATION_SETTINGS in member_permsassert Permission.MANAGE_API_KEYS in member_perms+ assert Permission.MANAGE_AUTOMATIONS in member_permsassert Permission.VIEW_LLM_SETTINGS in member_permsassert Permission.VIEW_ORG_SETTINGS in member_perms# Member should NOT have admin/owner permissionsdiff --git a/frontend/src/hooks/mutation/use-switch-organization.ts b/frontend/src/hooks/mutation/use-switch-organization.tsindex 1bb36b09ba..170511e8bc 100644--- a/frontend/src/hooks/mutation/use-switch-organization.ts+++ b/frontend/src/hooks/mutation/use-switch-organization.ts@@ -5,6 +5,7 @@ import { organizationService } from "#/api/organization-service/organization-serimport { useSelectedOrganizationId } from "#/context/use-selected-organization";import { I18nKey } from "#/i18n/declaration";import { displaySuccessToast } from "#/utils/custom-toast-handlers";+import { setSelectedOrg } from "#/utils/local-storage";export const useSwitchOrganization = () => {const { t } = useTranslation();@@ -33,6 +34,8 @@ export const useSwitchOrganization = () => {// Update local state - this triggers automatic refetch for all org-scoped queries// since their query keys include organizationId (e.g., ["settings", orgId], ["secrets", orgId])setOrganizationId(orgId);+ // Broadcast org change to other apps (e.g. Automations) via localStorage+ setSelectedOrg(orgId);// Invalidate conversations to fetch data for the new org contextqueryClient.invalidateQueries({ queryKey: ["user", "conversations"] });// Remove all individual conversation queries to clear any stale/null datadiff --git a/frontend/src/hooks/use-auto-select-organization.ts b/frontend/src/hooks/use-auto-select-organization.tsindex fd226a8ba2..3fe867aae7 100644--- a/frontend/src/hooks/use-auto-select-organization.ts+++ b/frontend/src/hooks/use-auto-select-organization.ts@@ -1,6 +1,7 @@import React from "react";import { useSelectedOrganizationId } from "#/context/use-selected-organization";import { useOrganizations } from "#/hooks/query/use-organizations";+import { setSelectedOrg } from "#/utils/local-storage";/*** Hook that automatically selects an organization when:@@ -28,6 +29,8 @@ export function useAutoSelectOrganization() {// Revalidation is only needed when user explicitly switches organizations// to redirect away from admin-only pages they may no longer have access to.setOrganizationId(initialOrgId, { skipRevalidation: true });+ // Broadcast org selection to other apps (e.g. Automations) via localStorage+ setSelectedOrg(initialOrgId);}}, [organizationId, organizations, currentOrgId, setOrganizationId]);}diff --git a/frontend/src/utils/local-storage.ts b/frontend/src/utils/local-storage.tsindex 656f1dd2fc..1b6877cb87 100644--- a/frontend/src/utils/local-storage.ts+++ b/frontend/src/utils/local-storage.ts@@ -3,6 +3,7 @@ export const LOCAL_STORAGE_KEYS = {LOGIN_METHOD: "openhands_login_method",ENTERPRISE_FORM_SAAS: "openhands_enterprise_form_saas",ENTERPRISE_FORM_SELF_HOSTED: "openhands_enterprise_form_self_hosted",+ SELECTED_ORG: "openhands_selected_org",};// Login methods@@ -39,6 +40,10 @@ export const clearLoginData = (): void => {localStorage.removeItem(LOCAL_STORAGE_KEYS.LOGIN_METHOD);};+export const setSelectedOrg = (orgId: string): void => {+ localStorage.setItem(LOCAL_STORAGE_KEYS.SELECTED_ORG, orgId);+};+// CTA locations that can be dismissedexport type CTALocation = "homepage";