Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Updated teams button.

Mike Cao44393472cfeb
diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx
index 15b233559..e69ef1cda 100644
--- a/src/app/(main)/NavBar.tsx
+++ b/src/app/(main)/NavBar.tsx
@@ -8,13 +8,12 @@ import LanguageButton from 'components/input/LanguageButton';
import ProfileButton from 'components/input/ProfileButton';
import TeamsButton from 'components/input/TeamsButton';
import Icons from 'components/icons';
-import { useLogin, useMessages, useNavigation, useTeamUrl } from 'components/hooks';
+import { useMessages, useNavigation, useTeamUrl } from 'components/hooks';
import styles from './NavBar.module.css';
export function NavBar() {
- const { user } = useLogin();
const { formatMessage, labels } = useMessages();
- const { pathname } = useNavigation();
+ const { pathname, router } = useNavigation();
const { teamId, renderTeamUrl } = useTeamUrl();
const cloudMode = !!process.env.cloudMode;
@@ -60,6 +59,12 @@ export function NavBar() {
!cloudMode && { label: formatMessage(labels.logout), url: '/logout' },
].filter(n => n);
+ const handleTeamChange = (teamId: string) => {
+ const url = teamId ? `/teams/${teamId}` : '/';
+
+ router.push(cloudMode ? `${process.env.cloudUrl}${url}` : url);
+ };
+
return (
<div className={styles.navbar}>
<div className={styles.logo}>
@@ -83,7 +88,7 @@ export function NavBar() {
})}
</div>
<div className={styles.actions}>
- {user?.teams?.length && <TeamsButton teamId={teamId} />}
+ <TeamsButton teamId={teamId} onChange={handleTeamChange} />
<ThemeButton />
<LanguageButton />
<ProfileButton />
diff --git a/src/app/(main)/settings/teams/TeamsDataTable.tsx b/src/app/(main)/settings/teams/TeamsDataTable.tsx
index 1890af8ad..fe92b6a05 100644
--- a/src/app/(main)/settings/teams/TeamsDataTable.tsx
+++ b/src/app/(main)/settings/teams/TeamsDataTable.tsx
@@ -1,6 +1,6 @@
import DataTable from 'components/common/DataTable';
import TeamsTable from 'app/(main)/settings/teams/TeamsTable';
-import { useTeams } from 'components/hooks';
+import { useLogin, useTeams } from 'components/hooks';
export function TeamsDataTable({
allowEdit,
@@ -9,7 +9,8 @@ export function TeamsDataTable({
allowEdit?: boolean;
showActions?: boolean;
}) {
- const queryResult = useTeams();
+ const { user } = useLogin();
+ const queryResult = useTeams(user.id);
return (
<DataTable queryResult={queryResult}>
diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
index c43b29bfc..080b9b5ce 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx
@@ -1,6 +1,6 @@
import { Button, Modal, ModalTrigger, ActionForm } from 'react-basics';
import { useRouter } from 'next/navigation';
-import { useLogin, useMessages, useModified, useTeamUrl } from 'components/hooks';
+import { useLogin, useMessages, useModified, useTeams, useTeamUrl } from 'components/hooks';
import WebsiteDeleteForm from './WebsiteDeleteForm';
import WebsiteResetForm from './WebsiteResetForm';
import WebsiteTransferForm from './WebsiteTransferForm';
@@ -12,11 +12,12 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
const { touch } = useModified();
const { teamId, renderTeamUrl } = useTeamUrl();
const router = useRouter();
- const hasTeams = user?.teams?.length > 0;
+ const { result } = useTeams(user.id);
+ const hasTeams = result?.data?.length > 0;
const isTeamOwner =
(!teamId && hasTeams) ||
(hasTeams &&
- user?.teams
+ result?.data
?.find(({ id }) => id === teamId)
?.teamUser.find(({ role, userId }) => role === ROLES.teamOwner && userId === user.id));
diff --git a/src/components/hooks/queries/useTeams.ts b/src/components/hooks/queries/useTeams.ts
index f80840257..be7108078 100644
--- a/src/components/hooks/queries/useTeams.ts
+++ b/src/components/hooks/queries/useTeams.ts
@@ -1,18 +1,15 @@
import useApi from './useApi';
import useFilterQuery from './useFilterQuery';
-import useLogin from './useLogin';
import useModified from '../useModified';
-export function useTeams(userId?: string) {
+export function useTeams(userId: string) {
const { get } = useApi();
- const { user } = useLogin();
- const id = userId || user?.id;
const { modified } = useModified(`teams`);
return useFilterQuery({
- queryKey: ['teams', { userId: id, modified }],
+ queryKey: ['teams', { userId, modified }],
queryFn: (params: any) => {
- return get(`/teams`, params);
+ return get(`/users/${userId}/teams`, params);
},
});
}
diff --git a/src/components/hooks/queries/useWebsites.ts b/src/components/hooks/queries/useWebsites.ts
index 941989750..8bfad3334 100644
--- a/src/components/hooks/queries/useWebsites.ts
+++ b/src/components/hooks/queries/useWebsites.ts
@@ -13,9 +13,8 @@ export function useWebsites(
return useFilterQuery({
queryKey: ['websites', { userId, teamId, modified, ...params }],
- queryFn: (data: any) => {
+ queryFn: () => {
return get(teamId ? `/teams/${teamId}/websites` : `/users/${userId || user.id}/websites`, {
- ...data,
...params,
});
},
diff --git a/src/components/input/TeamsButton.tsx b/src/components/input/TeamsButton.tsx
index ae995acac..8dc01ba71 100644
--- a/src/components/input/TeamsButton.tsx
+++ b/src/components/input/TeamsButton.tsx
@@ -2,25 +2,30 @@ import { Key } from 'react';
import { Text, Icon, Button, Popup, Menu, Item, PopupTrigger, Flexbox } from 'react-basics';
import classNames from 'classnames';
import Icons from 'components/icons';
-import { useLogin, useMessages, useNavigation } from 'components/hooks';
+import { useLogin, useMessages, useTeams } from 'components/hooks';
import styles from './TeamsButton.module.css';
-export function TeamsButton({ teamId }: { teamId: string }) {
+export function TeamsButton({
+ teamId,
+ onChange,
+}: {
+ teamId: string;
+ onChange?: (value: string) => void;
+}) {
const { user } = useLogin();
const { formatMessage, labels } = useMessages();
- const { router } = useNavigation();
- const team = user?.teams?.find(({ id }) => id === teamId);
- const cloudMode = !!process.env.cloudMode;
+ const { result } = useTeams(user?.id);
+ const team = result?.data?.find(({ id }) => id === teamId);
const handleSelect = (close: () => void, id: Key) => {
- if (id !== user.id) {
- router.push(cloudMode ? `${process.env.cloudUrl}/teams/${id}` : `/teams/${id}`);
- } else {
- router.push('/');
- }
+ onChange?.(id as string);
close();
};
+ if (!result) {
+ return null;
+ }
+
return (
<PopupTrigger>
<Button className={styles.button} variant="quiet">
@@ -40,7 +45,7 @@ export function TeamsButton({ teamId }: { teamId: string }) {
</Flexbox>
</Item>
<div className={styles.heading}>{formatMessage(labels.team)}</div>
- {user?.teams?.map(({ id, name }) => (
+ {result?.data?.map(({ id, name }) => (
<Item key={id} className={classNames({ [styles.selected]: id === teamId })}>
<Flexbox gap={10} alignItems="center">
<Icon>
diff --git a/src/pages/api/auth/verify.ts b/src/pages/api/auth/verify.ts
index ddd4a1a84..3cc78ed30 100644
--- a/src/pages/api/auth/verify.ts
+++ b/src/pages/api/auth/verify.ts
@@ -2,16 +2,11 @@ import { NextApiRequestAuth } from 'lib/types';
import { useAuth } from 'lib/middleware';
import { NextApiResponse } from 'next';
import { ok } from 'next-basics';
-import { getUserTeams } from 'queries/admin/team';
export default async (req: NextApiRequestAuth, res: NextApiResponse) => {
await useAuth(req, res);
const { user } = req.auth;
- const teams = await getUserTeams(user.id);
-
- user['teams'] = teams.data.map(n => n);
-
return ok(res, user);
};
diff --git a/src/pages/api/me/teams.ts b/src/pages/api/me/teams.ts
index 1f6de446d..3b88689d1 100644
--- a/src/pages/api/me/teams.ts
+++ b/src/pages/api/me/teams.ts
@@ -3,7 +3,7 @@ import { NextApiRequestQueryBody } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { methodNotAllowed } from 'next-basics';
-import userTeams from 'pages/api/users/[userId]/teams';
+import userTeamsRoute from 'pages/api/users/[userId]/teams';
import * as yup from 'yup';
const schema = {
@@ -20,7 +20,7 @@ export default async (req: NextApiRequestQueryBody, res: NextApiResponse) => {
if (req.method === 'GET') {
req.query.userId = req.auth.user.id;
- return userTeams(req, res);
+ return userTeamsRoute(req, res);
}
return methodNotAllowed(res);
diff --git a/src/pages/api/me/websites.ts b/src/pages/api/me/websites.ts
index 7a1139910..48800f90e 100644
--- a/src/pages/api/me/websites.ts
+++ b/src/pages/api/me/websites.ts
@@ -3,7 +3,7 @@ import { NextApiRequestQueryBody } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { methodNotAllowed } from 'next-basics';
-import userWebsites from 'pages/api/users/[userId]/websites';
+import userWebsitesRoute from 'pages/api/users/[userId]/websites';
import * as yup from 'yup';
const schema = {
@@ -20,7 +20,7 @@ export default async (req: NextApiRequestQueryBody, res: NextApiResponse) => {
if (req.method === 'GET') {
req.query.userId = req.auth.user.id;
- return userWebsites(req, res);
+ return userWebsitesRoute(req, res);
}
return methodNotAllowed(res);
diff --git a/src/pages/api/teams/index.ts b/src/pages/api/teams/index.ts
index def8dfb8a..08bf8f847 100644
--- a/src/pages/api/teams/index.ts
+++ b/src/pages/api/teams/index.ts
@@ -1,3 +1,4 @@
+import * as yup from 'yup';
import { Team } from '@prisma/client';
import { canCreateTeam } from 'lib/auth';
import { uuid } from 'lib/crypto';
@@ -6,8 +7,7 @@ import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { pageInfo } from 'lib/schema';
import { NextApiResponse } from 'next';
import { getRandomChars, methodNotAllowed, ok, unauthorized } from 'next-basics';
-import { createTeam, getUserTeams } from 'queries';
-import * as yup from 'yup';
+import { createTeam } from 'queries';
export interface TeamsRequestQuery extends SearchFilter {}
export interface TeamsRequestBody {
@@ -34,18 +34,6 @@ export default async (
user: { id: userId },
} = req.auth;
- if (req.method === 'GET') {
- const { page, query, pageSize } = req.query;
-
- const results = await getUserTeams(userId, {
- page,
- query,
- pageSize,
- });
-
- return ok(res, results);
- }
-
if (req.method === 'POST') {
if (!(await canCreateTeam(req.auth))) {
return unauthorized(res);
diff --git a/src/pages/api/users/[userId]/teams.ts b/src/pages/api/users/[userId]/teams.ts
index 0a75ff980..dda65355d 100644
--- a/src/pages/api/users/[userId]/teams.ts
+++ b/src/pages/api/users/[userId]/teams.ts
@@ -32,10 +32,10 @@ export default async (
await useValidate(schema, req, res);
const { user } = req.auth;
- const { id: userId } = req.query;
+ const { userId } = req.query;
if (req.method === 'GET') {
- if (!user.isAdmin && user.id !== userId) {
+ if (!user.isAdmin && (!userId || user.id !== userId)) {
return unauthorized(res);
}
diff --git a/src/pages/api/websites/index.ts b/src/pages/api/websites/index.ts
index 686c48239..eb5744154 100644
--- a/src/pages/api/websites/index.ts
+++ b/src/pages/api/websites/index.ts
@@ -5,7 +5,7 @@ import { NextApiRequestQueryBody, SearchFilter } from 'lib/types';
import { NextApiResponse } from 'next';
import { methodNotAllowed, ok, unauthorized } from 'next-basics';
import { createWebsite } from 'queries';
-import userWebsites from 'pages/api/users/[userId]/websites';
+import userWebsitesRoute from 'pages/api/users/[userId]/websites';
import * as yup from 'yup';
import { pageInfo } from 'lib/schema';
@@ -47,7 +47,7 @@ export default async (
req.query.userId = userId;
}
- return userWebsites(req, res);
+ return userWebsitesRoute(req, res);
}
if (req.method === 'POST') {