From 9cb128d17aeff894707910e925e8dd2de8728b9c Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Tue, 2 Nov 2021 14:17:12 -0400 Subject: [PATCH] Teams API: Free tier no longer calls team API throughout the app (#2766) --- changes/issue-2517-free-tier-no-teams-api | 1 + frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tsx | 2 +- frontend/pages/packs/EditPackPage/EditPackPage.tsx | 1 + .../schedule/ManageSchedulePage/ManageSchedulePage.tsx | 6 +----- 4 files changed, 4 insertions(+), 6 deletions(-) create mode 100644 changes/issue-2517-free-tier-no-teams-api diff --git a/changes/issue-2517-free-tier-no-teams-api b/changes/issue-2517-free-tier-no-teams-api new file mode 100644 index 0000000000..218a493747 --- /dev/null +++ b/changes/issue-2517-free-tier-no-teams-api @@ -0,0 +1 @@ +* Bug fix: Free Tier does not call teams API (fix: host details page, edit packs page) \ No newline at end of file diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tsx index 476601c960..2d56bbbcc9 100644 --- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tsx +++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tsx @@ -172,7 +172,7 @@ const HostDetailsPage = ({ Error, ITeam[] >("teams", () => teamAPI.loadAll(), { - enabled: !!hostIdFromURL && isPremiumTier, + enabled: !!hostIdFromURL && !!isPremiumTier, refetchOnMount: false, refetchOnReconnect: false, refetchOnWindowFocus: false, diff --git a/frontend/pages/packs/EditPackPage/EditPackPage.tsx b/frontend/pages/packs/EditPackPage/EditPackPage.tsx index c2644199c1..4052e4d8e2 100644 --- a/frontend/pages/packs/EditPackPage/EditPackPage.tsx +++ b/frontend/pages/packs/EditPackPage/EditPackPage.tsx @@ -161,6 +161,7 @@ const EditPacksPage = ({ ["all teams"], () => teamsAPI.loadAll(), { + enabled: !!isPremiumTier, select: (data: IStoredTeamsResponse) => data.teams, } ); diff --git a/frontend/pages/schedule/ManageSchedulePage/ManageSchedulePage.tsx b/frontend/pages/schedule/ManageSchedulePage/ManageSchedulePage.tsx index 22a6e81f31..15431561e3 100644 --- a/frontend/pages/schedule/ManageSchedulePage/ManageSchedulePage.tsx +++ b/frontend/pages/schedule/ManageSchedulePage/ManageSchedulePage.tsx @@ -148,7 +148,7 @@ const ManageSchedulePage = ({ const { MANAGE_PACKS } = paths; const handleAdvanced = () => dispatch(push(MANAGE_PACKS)); - const { currentUser, isOnGlobalTeam } = useContext(AppContext); + const { currentUser, isOnGlobalTeam, isPremiumTier } = useContext(AppContext); const isTeamMaintainerOrTeamAdmin = (() => { return !!permissionUtils.isTeamMaintainerOrTeamAdmin(currentUser, teamId); @@ -204,10 +204,6 @@ const ManageSchedulePage = ({ ); }, [dispatch, teamId]); - const isPremiumTier = useSelector((state: IRootState) => { - return state.app.config.tier === "premium"; - }); - const user = useSelector( (state: IRootState): IUser => { return state.auth.user;