m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/umami-software/umami into analytics

Browse Source
This commit is contained in:
Francis Cao 2024-02-16 13:09:42 -08:00
commit c6f656e142
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx
View File

@ -12,16 +12,16 @@ export function TeamWebsitesPage({ teamId }: { teamId: string }) {
const { formatMessage, labels } = useMessages(); const { formatMessage, labels } = useMessages();
const { user } = useLogin(); const { user } = useLogin();
const canEdit = team?.teamUser?.find( const allowEdit = !!team?.teamUser?.find(
({ userId, role }) => role !== ROLES.viewOnly && userId === user.id, ({ userId, role }) => userId === user.id && role !== ROLES.teamViewOnly,
); );
return ( return (
<> <>
<PageHeader title={formatMessage(labels.websites)}> <PageHeader title={formatMessage(labels.websites)}>
{canEdit && <WebsiteAddButton teamId={teamId} />} {allowEdit && <WebsiteAddButton teamId={teamId} />}
</PageHeader> </PageHeader>
<TeamWebsitesDataTable teamId={teamId} allowEdit={canEdit} /> <TeamWebsitesDataTable teamId={teamId} allowEdit={allowEdit} />
</> </>
); );
} }

2
src/app/(main)/settings/users/UsersTable.tsx
View File

@ -26,7 +26,7 @@ export function UsersTable({
) )
} }
</GridColumn> </GridColumn>
<GridColumn name="created" label={formatMessage(labels.created)} width={'120px'}> <GridColumn name="created" label={formatMessage(labels.created)} width={'150px'}>
{row => {row =>
formatDistance(new Date(row.createdAt), new Date(), { formatDistance(new Date(row.createdAt), new Date(), {
addSuffix: true, addSuffix: true,