Admin section updates.

src/app/(main)/settings/teams/WebsiteTags.module.css

@@ -1,11 +0,0 @@
-.filters {
-  display: flex;
-  justify-content: flex-start;
-  align-items: flex-start;
-}
-
-.tag {
-  text-align: center;
-  margin-bottom: 10px;
-  margin-inline-end: 20px;
-}

src/app/(main)/settings/teams/WebsiteTags.tsx

@@ -1,38 +0,0 @@
-import { Button, Icon, Text } from '@umami/react-zen';
-import { Close } from '@/components/icons';
-import styles from './WebsiteTags.module.css';
-
-export function WebsiteTags({
-  items = [],
-  websites = [],
-  onClick,
-}: {
-  items: any[];
-  websites: any[];
-  onClick: (e: Event) => void;
-}) {
-  if (websites.length === 0) {
-    return null;
-  }
-
-  return (
-    <div className={styles.filters}>
-      {websites.map(websiteId => {
-        const website = items.find(a => a.id === websiteId);
-
-        return (
-          <div key={websiteId} className={styles.tag}>
-            <Button onPress={() => onClick(websiteId)} variant="primary" size="sm">
-              <Text>
-                <b>{`${website.name}`}</b>
-              </Text>
-              <Icon>
-                <Close />
-              </Icon>
-            </Button>
-          </div>
-        );
-      })}
-    </div>
-  );
-}

src/app/(main)/settings/websites/[websiteId]/WebsiteData.tsx

@@ -19,19 +19,21 @@ export function WebsiteData({ websiteId, onSave }: { websiteId: string; onSave?:
   const { touch } = useModified();
   const { teamId, renderUrl } = useNavigation();
   const router = useRouter();
-  const { data } = useUserTeamsQuery(user.id);
+  const { data: teams } = useUserTeamsQuery(user.id);
+
   const canTransferWebsite =
     (
-      !teamId &&
-      data.filter(({ teamUser }) =>
-        teamUser.find(
-          ({ role, userId }) =>
-            [ROLES.teamOwner, ROLES.teamManager].includes(role) && userId === user.id,
-        ),
-      )
+      (!teamId &&
+        teams?.data?.filter(({ teamUser }) =>
+          teamUser.find(
+            ({ role, userId }) =>
+              [ROLES.teamOwner, ROLES.teamManager].includes(role) && userId === user.id,
+          ),
+        )) ||
+      []
     ).length > 0 ||
     (teamId &&
-      !!data
+      !!teams?.data
         ?.find(({ id }) => id === teamId)
         ?.teamUser.find(({ role, userId }) => role === ROLES.teamOwner && userId === user.id));
 

src/app/(main)/settings/websites/[websiteId]/WebsiteShareForm.tsx

@@ -6,17 +6,13 @@ import {
   Switch,
   FormSubmitButton,
   Column,
-  Icon,
-  Grid,
   Label,
   useToast,
-  TooltipTrigger,
-  Tooltip,
+  Row,
 } from '@umami/react-zen';
 import { useState } from 'react';
 import { getRandomChars } from '@/lib/crypto';
 import { useApi, useMessages, useModified } from '@/components/hooks';
-import { Refresh } from '@/components/icons';
 
 const generateId = () => getRandomChars(16);
 
@@ -70,24 +66,19 @@ export function WebsiteShareForm({ websiteId, shareId, onSave, onClose }: Websit
         {id && (
           <Column>
             <Label>{formatMessage(labels.shareUrl)}</Label>
-            <Grid columns="1fr auto" gap>
-              <TextField value={url} isReadOnly allowCopy />
-              <TooltipTrigger>
-                <Button onPress={handleGenerate} variant="quiet" size="sm">
-                  <Icon>
-                    <Refresh />
-                  </Icon>
-                </Button>
-                <Tooltip>{formatMessage(labels.regenerate)}</Tooltip>
-              </TooltipTrigger>
-            </Grid>
+            <TextField value={url} isReadOnly allowCopy />
           </Column>
         )}
-        <FormButtons>
-          <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>
-          <FormSubmitButton isDisabled={false} isLoading={isPending}>
-            {formatMessage(labels.save)}
-          </FormSubmitButton>
+        <FormButtons justifyContent="space-between">
+          <Row>
+            {id && <Button onPress={handleGenerate}>{formatMessage(labels.regenerate)}</Button>}
+          </Row>
+          <Row>
+            {onClose && <Button onPress={onClose}>{formatMessage(labels.cancel)}</Button>}
+            <FormSubmitButton isDisabled={false} isLoading={isPending}>
+              {formatMessage(labels.save)}
+            </FormSubmitButton>
+          </Row>
         </FormButtons>
       </Column>
     </Form>

src/app/(main)/settings/websites/[websiteId]/WebsiteTransferForm.tsx

@@ -31,15 +31,16 @@ export function WebsiteTransferForm({
   const { mutate, error } = useMutation({
     mutationFn: (data: any) => post(`/websites/${websiteId}/transfer`, data),
   });
-  const { result, query } = useUserTeamsQuery(user.id);
+  const { data: teams, isLoading } = useUserTeamsQuery(user.id);
   const isTeamWebsite = !!website?.teamId;
 
-  const items = result.data.filter(({ teamUser }) =>
-    teamUser.find(
-      ({ role, userId }) =>
-        [ROLES.teamOwner, ROLES.teamManager].includes(role) && userId === user.id,
-    ),
-  );
+  const items =
+    teams?.data?.filter(({ teamUser }) =>
+      teamUser.find(
+        ({ role, userId }) =>
+          [ROLES.teamOwner, ROLES.teamManager].includes(role) && userId === user.id,
+      ),
+    ) || [];
 
   const handleSubmit = async () => {
     mutate(
@@ -60,7 +61,7 @@ export function WebsiteTransferForm({
     setTeamId(key as string);
   };
 
-  if (query.isLoading) {
+  if (isLoading) {
     return <Loading icon="dots" position="center" />;
   }