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.

Fix report create for view only, fix createdby on save and add column in team websites table

Francis Cao8fbd6871f767
diff --git a/src/app/(main)/reports/ReportsHeader.tsx b/src/app/(main)/reports/ReportsHeader.tsx
index 068c03698..92f538ea8 100644
--- a/src/app/(main)/reports/ReportsHeader.tsx
+++ b/src/app/(main)/reports/ReportsHeader.tsx
@@ -1,20 +1,25 @@
import PageHeader from 'components/layout/PageHeader';
import { Icon, Icons, Text } from 'react-basics';
-import { useMessages, useTeamUrl } from 'components/hooks';
+import { useLogin, useMessages, useTeamUrl } from 'components/hooks';
import LinkButton from 'components/common/LinkButton';
+import { ROLES } from 'lib/constants';
export function ReportsHeader() {
const { formatMessage, labels } = useMessages();
const { renderTeamUrl } = useTeamUrl();
+ const { user } = useLogin();
+ const canEdit = user.role !== ROLES.viewOnly;
return (
<PageHeader title={formatMessage(labels.reports)}>
- <LinkButton href={renderTeamUrl('/reports/create')} variant="primary">
- <Icon>
- <Icons.Plus />
- </Icon>
- <Text>{formatMessage(labels.createReport)}</Text>
- </LinkButton>
+ {canEdit && (
+ <LinkButton href={renderTeamUrl('/reports/create')} variant="primary">
+ <Icon>
+ <Icons.Plus />
+ </Icon>
+ <Text>{formatMessage(labels.createReport)}</Text>
+ </LinkButton>
+ )}
</PageHeader>
);
}
diff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx
index 086cc03a5..dc6760a6b 100644
--- a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx
+++ b/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx
@@ -13,12 +13,15 @@ export function TeamWebsitesTable({
allowEdit?: boolean;
}) {
const { user } = useLogin();
-
const { formatMessage, labels } = useMessages();
+
return (
<GridTable data={data}>
<GridColumn name="name" label={formatMessage(labels.name)} />
<GridColumn name="domain" label={formatMessage(labels.domain)} />
+ <GridColumn name="createdBy" label={formatMessage(labels.createdBy)}>
+ {row => row?.createUser?.username}
+ </GridColumn>
<GridColumn name="action" label=" " alignment="end">
{row => {
const { id: websiteId } = row;
diff --git a/src/components/messages.ts b/src/components/messages.ts
index 2710e99d1..0487004a4 100644
--- a/src/components/messages.ts
+++ b/src/components/messages.ts
@@ -26,6 +26,7 @@ export const labels = defineMessages({
myWebsites: { id: 'label.my-websites', defaultMessage: 'My websites' },
teamWebsites: { id: 'label.team-websites', defaultMessage: 'Team websites' },
created: { id: 'label.created', defaultMessage: 'Created' },
+ createdBy: { id: 'label.created-by', defaultMessage: 'Created By' },
edit: { id: 'label.edit', defaultMessage: 'Edit' },
name: { id: 'label.name', defaultMessage: 'Name' },
member: { id: 'label.member', defaultMessage: 'Member' },
diff --git a/src/pages/api/websites/index.ts b/src/pages/api/websites/index.ts
index eb5744154..0b7826ac3 100644
--- a/src/pages/api/websites/index.ts
+++ b/src/pages/api/websites/index.ts
@@ -62,6 +62,7 @@ export default async (
const data: any = {
id: uuid(),
+ createdBy: userId,
name,
domain,
shareId,
diff --git a/src/queries/admin/website.ts b/src/queries/admin/website.ts
index 01d520198..cef7f15d2 100644
--- a/src/queries/admin/website.ts
+++ b/src/queries/admin/website.ts
@@ -87,7 +87,7 @@ export async function getTeamWebsites(
teamId,
},
include: {
- user: {
+ createUser: {
select: {
id: true,
username: true,