|
@@ -1,5 +1,6 @@
|
|
import {useState} from 'react';
|
|
import {useState} from 'react';
|
|
import styled from '@emotion/styled';
|
|
import styled from '@emotion/styled';
|
|
|
|
+import debounce from 'lodash/debounce';
|
|
import isEqual from 'lodash/isEqual';
|
|
import isEqual from 'lodash/isEqual';
|
|
|
|
|
|
import AvatarList from 'sentry/components/avatar/avatarList';
|
|
import AvatarList from 'sentry/components/avatar/avatarList';
|
|
@@ -13,11 +14,13 @@ import {CheckWrap} from 'sentry/components/compactSelect/styles';
|
|
import UserBadge from 'sentry/components/idBadge/userBadge';
|
|
import UserBadge from 'sentry/components/idBadge/userBadge';
|
|
import {InnerWrap, LeadingItems} from 'sentry/components/menuListItem';
|
|
import {InnerWrap, LeadingItems} from 'sentry/components/menuListItem';
|
|
import {Tooltip} from 'sentry/components/tooltip';
|
|
import {Tooltip} from 'sentry/components/tooltip';
|
|
|
|
+import {DEFAULT_DEBOUNCE_DURATION} from 'sentry/constants';
|
|
import {t, tct} from 'sentry/locale';
|
|
import {t, tct} from 'sentry/locale';
|
|
import {space} from 'sentry/styles/space';
|
|
import {space} from 'sentry/styles/space';
|
|
import type {Team} from 'sentry/types/organization';
|
|
import type {Team} from 'sentry/types/organization';
|
|
import type {User} from 'sentry/types/user';
|
|
import type {User} from 'sentry/types/user';
|
|
import {defined} from 'sentry/utils';
|
|
import {defined} from 'sentry/utils';
|
|
|
|
+import {useTeams} from 'sentry/utils/useTeams';
|
|
import {useTeamsById} from 'sentry/utils/useTeamsById';
|
|
import {useTeamsById} from 'sentry/utils/useTeamsById';
|
|
import {useUser} from 'sentry/utils/useUser';
|
|
import {useUser} from 'sentry/utils/useUser';
|
|
import type {DashboardDetails, DashboardPermissions} from 'sentry/views/dashboards/types';
|
|
import type {DashboardDetails, DashboardPermissions} from 'sentry/views/dashboards/types';
|
|
@@ -35,10 +38,15 @@ function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorP
|
|
const currentUser: User = useUser();
|
|
const currentUser: User = useUser();
|
|
const dashboardCreator: User | undefined = dashboard.createdBy;
|
|
const dashboardCreator: User | undefined = dashboard.createdBy;
|
|
const isCurrentUserDashboardOwner = dashboardCreator?.id === currentUser.id;
|
|
const isCurrentUserDashboardOwner = dashboardCreator?.id === currentUser.id;
|
|
- const {teams} = useTeamsById();
|
|
|
|
- const teamIds: string[] = Object.values(teams).map(team => team.id);
|
|
|
|
|
|
+
|
|
|
|
+ // Retrieves teams from the team store, which may contain only a subset of all teams
|
|
|
|
+ const {teams: teamsToRender} = useTeamsById();
|
|
|
|
+ const {onSearch} = useTeams();
|
|
|
|
+ const teamIds: string[] = Object.values(teamsToRender).map(team => team.id);
|
|
|
|
+
|
|
const [selectedOptions, setSelectedOptions] = useState<string[]>(getSelectedOptions());
|
|
const [selectedOptions, setSelectedOptions] = useState<string[]>(getSelectedOptions());
|
|
const [isMenuOpen, setMenuOpen] = useState<boolean>(false);
|
|
const [isMenuOpen, setMenuOpen] = useState<boolean>(false);
|
|
|
|
+ const {teams: selectedTeam} = useTeamsById({ids: [selectedOptions[1]]});
|
|
|
|
|
|
// Handles state change when dropdown options are selected
|
|
// Handles state change when dropdown options are selected
|
|
const onSelectOptions = newSelectedOptions => {
|
|
const onSelectOptions = newSelectedOptions => {
|
|
@@ -131,7 +139,7 @@ function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorP
|
|
key="avatar-list-2-badges"
|
|
key="avatar-list-2-badges"
|
|
typeAvatars="users"
|
|
typeAvatars="users"
|
|
users={[dashboardCreator]}
|
|
users={[dashboardCreator]}
|
|
- teams={[teams.find(team => team.id === selectedOptions[1])!]}
|
|
|
|
|
|
+ teams={selectedTeam ? selectedTeam : []}
|
|
maxVisibleAvatars={1}
|
|
maxVisibleAvatars={1}
|
|
avatarSize={25}
|
|
avatarSize={25}
|
|
renderUsersFirst
|
|
renderUsersFirst
|
|
@@ -162,7 +170,7 @@ function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorP
|
|
{
|
|
{
|
|
value: '_teams',
|
|
value: '_teams',
|
|
label: t('Teams'),
|
|
label: t('Teams'),
|
|
- options: teams.map(makeTeamOption),
|
|
|
|
|
|
+ options: teamsToRender.map(makeTeamOption),
|
|
showToggleAllButton: isCurrentUserDashboardOwner,
|
|
showToggleAllButton: isCurrentUserDashboardOwner,
|
|
disabled: !isCurrentUserDashboardOwner,
|
|
disabled: !isCurrentUserDashboardOwner,
|
|
},
|
|
},
|
|
@@ -236,6 +244,7 @@ function EditAccessSelector({dashboard, onChangeEditAccess}: EditAccessSelectorP
|
|
}
|
|
}
|
|
}}
|
|
}}
|
|
menuFooter={dropdownFooterButtons}
|
|
menuFooter={dropdownFooterButtons}
|
|
|
|
+ onSearch={debounce(val => void onSearch(val), DEFAULT_DEBOUNCE_DURATION)}
|
|
/>
|
|
/>
|
|
);
|
|
);
|
|
|
|
|