From 748e8462a43cfd5e5846d57ffec7a011027e50fe Mon Sep 17 00:00:00 2001
From: Ildar Iskhakov <Ildar.iskhakov@grafana.com>
Date: Wed, 22 Mar 2023 14:38:31 +0800
Subject: [PATCH] Fix teams duplication and user list permission control
 (#1591)

# What this PR does

## Which issue(s) this PR fixes

## Checklist

- [ ] Tests updated
- [ ] Documentation added
- [ ] `CHANGELOG.md` updated
---
 engine/apps/user_management/models/user.py    |  2 +-
 .../src/containers/TeamsList/TeamsList.tsx    | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/engine/apps/user_management/models/user.py b/engine/apps/user_management/models/user.py
index 27acee64..3ff977e8 100644
--- a/engine/apps/user_management/models/user.py
+++ b/engine/apps/user_management/models/user.py
@@ -188,7 +188,7 @@ class User(models.Model):
     def available_teams(self):
         if self.role == LegacyAccessControlRole.ADMIN:
             return self.organization.teams.all()
-        return self.organization.teams.filter(Q(is_sharing_resources_to_all=True) | Q(users=self))
+        return self.organization.teams.filter(Q(is_sharing_resources_to_all=True) | Q(users=self)).distinct()
 
     @property
     def is_authenticated(self):
diff --git a/grafana-plugin/src/containers/TeamsList/TeamsList.tsx b/grafana-plugin/src/containers/TeamsList/TeamsList.tsx
index 7b76f495..78bede89 100644
--- a/grafana-plugin/src/containers/TeamsList/TeamsList.tsx
+++ b/grafana-plugin/src/containers/TeamsList/TeamsList.tsx
@@ -52,20 +52,20 @@ const TeamsList = observer(() => {
 
   const renderActionButtons = (record: GrafanaTeam) => {
     const editButton = (
-      <WithPermissionControlTooltip userAction={UserActions.APIKeysWrite}>
-        <HorizontalGroup justify="flex-end">
-          <Tooltip content="Default team will be selected when creating new resources">
-            <Button
-              onClick={async () => {
-                await userStore.updateCurrentUser({ current_team: record.id });
-                store.grafanaTeamStore.updateItems();
-              }}
-              disabled={isTeamDefault(record)}
-              fill="text"
-            >
-              Make default
-            </Button>
-          </Tooltip>
+      <HorizontalGroup justify="flex-end">
+        <Tooltip content="Default team will be selected when creating new resources">
+          <Button
+            onClick={async () => {
+              await userStore.updateCurrentUser({ current_team: record.id });
+              store.grafanaTeamStore.updateItems();
+            }}
+            disabled={isTeamDefault(record)}
+            fill="text"
+          >
+            Make default
+          </Button>
+        </Tooltip>
+        <WithPermissionControlTooltip userAction={UserActions.TeamsWrite}>
           <Button
             fill="text"
             disabled={record.id === 'null'}
@@ -76,8 +76,8 @@ const TeamsList = observer(() => {
           >
             Edit
           </Button>
-        </HorizontalGroup>
-      </WithPermissionControlTooltip>
+        </WithPermissionControlTooltip>
+      </HorizontalGroup>
     );
     return editButton;
   };