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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fixed team websites query.
Mike Cao835289a1f813
diff --git a/components/pages/settings/profile/ProfileSettings.js b/components/pages/settings/profile/ProfileSettings.jsindex d4d35db7d..9d22cfae9 100644--- a/components/pages/settings/profile/ProfileSettings.js+++ b/components/pages/settings/profile/ProfileSettings.js@@ -1,4 +1,3 @@-import { Breadcrumbs, Item } from 'react-basics';import { useIntl } from 'react-intl';import Page from 'components/layout/Page';import PageHeader from 'components/layout/PageHeader';@@ -11,10 +10,7 @@ export default function ProfileSettings() {return (<Page>- <PageHeader>- <Breadcrumbs>- <Item>{formatMessage(labels.profile)}</Item>- </Breadcrumbs>+ <PageHeader title={formatMessage(labels.profile)}><PasswordChangeButton /></PageHeader><ProfileDetails />diff --git a/pages/api/teams/[id]/websites.ts b/pages/api/teams/[id]/websites.tsindex fbb074238..2c35600da 100644--- a/pages/api/teams/[id]/websites.ts+++ b/pages/api/teams/[id]/websites.ts@@ -10,8 +10,8 @@ export interface TeamWebsiteRequestQuery {}export interface TeamWebsiteRequestBody {- website_id: string;- team_website_id?: string;+ websiteId: string;+ teamWebsiteId?: string;}export default async (diff --git a/queries/admin/team.ts b/queries/admin/team.tsindex 9d98aa75e..7d9d7e4e4 100644--- a/queries/admin/team.ts+++ b/queries/admin/team.ts@@ -1,8 +1,7 @@-import { Prisma, Team } from '@prisma/client';+import { Prisma, Team, TeamWebsite } from '@prisma/client';import prisma from 'lib/prisma';import { uuid } from 'lib/crypto';import { ROLES } from 'lib/constants';-import { Website } from 'lib/types';export async function getTeam(where: Prisma.TeamWhereInput): Promise<Team> {return prisma.client.team.findFirst({@@ -16,14 +15,19 @@ export async function getTeams(where: Prisma.TeamWhereInput): Promise<Team[]> {});}-export async function getTeamWebsites(teamId: string): Promise<Website[]> {- return prisma.client.website.findMany({+export async function getTeamWebsites(teamId: string): Promise<TeamWebsite[]> {+ return prisma.client.teamWebsite.findMany({where: {teamId,},+ include: {+ team: true,+ },orderBy: [{- name: 'asc',+ team: {+ name: 'asc',+ },},],} as any);