From 5ef9a93371b0ba2309ebd0ffdaea27ebda52d4ed Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 27 Nov 2022 13:12:40 -0600
Subject: [PATCH 1/4] Admin Reports: restyle with Tailwind

---
 app/soapbox/components/ui/text/text.tsx       |  2 +-
 .../admin/components/report-status.tsx        | 96 +++----------------
 .../features/admin/components/report.tsx      | 87 ++++++++++-------
 app/soapbox/features/admin/tabs/reports.tsx   |  1 +
 app/styles/components/admin.scss              | 80 ----------------
 5 files changed, 68 insertions(+), 198 deletions(-)

diff --git a/app/soapbox/components/ui/text/text.tsx b/app/soapbox/components/ui/text/text.tsx
index 221c070fc..973d0c8b2 100644
--- a/app/soapbox/components/ui/text/text.tsx
+++ b/app/soapbox/components/ui/text/text.tsx
@@ -51,7 +51,7 @@ const families = {
 };
 
 export type Sizes = keyof typeof sizes
-type Tags = 'abbr' | 'p' | 'span' | 'pre' | 'time' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'label'
+type Tags = 'abbr' | 'p' | 'span' | 'pre' | 'time' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'label' | 'blockquote'
 type Directions = 'ltr' | 'rtl'
 
 interface IText extends Pick<React.HTMLAttributes<HTMLParagraphElement>, 'dangerouslySetInnerHTML' | 'tabIndex' | 'lang'> {
diff --git a/app/soapbox/features/admin/components/report-status.tsx b/app/soapbox/features/admin/components/report-status.tsx
index f81deeab7..d990d8e81 100644
--- a/app/soapbox/features/admin/components/report-status.tsx
+++ b/app/soapbox/features/admin/components/report-status.tsx
@@ -1,16 +1,14 @@
-import noop from 'lodash/noop';
 import React from 'react';
 import { useIntl, defineMessages } from 'react-intl';
 
-import { openModal } from 'soapbox/actions/modals';
 import { deleteStatusModal } from 'soapbox/actions/moderation';
 import StatusContent from 'soapbox/components/status-content';
+import StatusMedia from 'soapbox/components/status-media';
+import { HStack, Stack } from 'soapbox/components/ui';
 import DropdownMenu from 'soapbox/containers/dropdown-menu-container';
-import Bundle from 'soapbox/features/ui/components/bundle';
-import { MediaGallery, Video, Audio } from 'soapbox/features/ui/util/async-components';
 import { useAppDispatch } from 'soapbox/hooks';
 
-import type { AdminReport, Attachment, Status } from 'soapbox/types/entities';
+import type { AdminReport, Status } from 'soapbox/types/entities';
 
 const messages = defineMessages({
   viewStatus: { id: 'admin.reports.actions.view_status', defaultMessage: 'View post' },
@@ -26,10 +24,6 @@ const ReportStatus: React.FC<IReportStatus> = ({ status }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
 
-  const handleOpenMedia = (media: Attachment, index: number) => {
-    dispatch(openModal('MEDIA', { media, status, index }));
-  };
-
   const handleDeleteStatus = () => {
     dispatch(deleteStatusModal(intl, status.id));
   };
@@ -49,84 +43,20 @@ const ReportStatus: React.FC<IReportStatus> = ({ status }) => {
     }];
   };
 
-  const getMedia = () => {
-    const firstAttachment = status.media_attachments.get(0);
-
-    if (firstAttachment) {
-      if (status.media_attachments.some(item => item.type === 'unknown')) {
-        // Do nothing
-      } else if (firstAttachment.type === 'video') {
-        const video = firstAttachment;
-
-        return (
-          <Bundle fetchComponent={Video} >
-            {(Component: any) => (
-              <Component
-                preview={video.preview_url}
-                blurhash={video.blurhash}
-                src={video.url}
-                alt={video.description}
-                aspectRatio={video.meta.getIn(['original', 'aspect'])}
-                width={239}
-                height={110}
-                inline
-                sensitive={status.sensitive}
-                onOpenVideo={noop}
-              />
-            )}
-          </Bundle>
-        );
-      } else if (firstAttachment.type === 'audio') {
-        const audio = firstAttachment;
-
-        return (
-          <Bundle fetchComponent={Audio}>
-            {(Component: any) => (
-              <Component
-                src={audio.url}
-                alt={audio.description}
-                inline
-                sensitive={status.sensitive}
-                onOpenAudio={noop}
-              />
-            )}
-          </Bundle>
-        );
-      } else {
-        return (
-          <Bundle fetchComponent={MediaGallery}>
-            {(Component: any) => (
-              <Component
-                media={status.media_attachments}
-                sensitive={status.sensitive}
-                height={110}
-                onOpenMedia={handleOpenMedia}
-              />
-            )}
-          </Bundle>
-        );
-      }
-    }
-
-    return null;
-  };
-
-  const media = getMedia();
   const menu = makeMenu();
 
   return (
-    <div className='admin-report__status'>
-      <div className='admin-report__status-content'>
+    <HStack space={2} alignItems='start'>
+      <Stack space={2} grow>
         <StatusContent status={status} />
-        {media}
-      </div>
-      <div className='admin-report__status-actions'>
-        <DropdownMenu
-          items={menu}
-          src={require('@tabler/icons/dots-vertical.svg')}
-        />
-      </div>
-    </div>
+        <StatusMedia status={status} />
+      </Stack>
+
+      <DropdownMenu
+        items={menu}
+        src={require('@tabler/icons/dots-vertical.svg')}
+      />
+    </HStack>
   );
 };
 
diff --git a/app/soapbox/features/admin/components/report.tsx b/app/soapbox/features/admin/components/report.tsx
index 4c37b7b61..605eea32c 100644
--- a/app/soapbox/features/admin/components/report.tsx
+++ b/app/soapbox/features/admin/components/report.tsx
@@ -7,7 +7,7 @@ import { deactivateUserModal, deleteUserModal } from 'soapbox/actions/moderation
 import snackbar from 'soapbox/actions/snackbar';
 import Avatar from 'soapbox/components/avatar';
 import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper';
-import { Accordion, Button, HStack } from 'soapbox/components/ui';
+import { Accordion, Button, Stack, HStack, Text } from 'soapbox/components/ui';
 import DropdownMenu from 'soapbox/containers/dropdown-menu-container';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 import { makeGetReport } from 'soapbox/selectors';
@@ -82,49 +82,68 @@ const Report: React.FC<IReport> = ({ id }) => {
   const reporterAcct = account.acct as string;
 
   return (
-    <div className='admin-report' key={report.id}>
-      <div className='admin-report__avatar'>
-        <HoverRefWrapper accountId={targetAccount.id as string} inline>
-          <Link to={`/@${acct}`} title={acct}>
-            <Avatar account={targetAccount} size={32} />
-          </Link>
-        </HoverRefWrapper>
-      </div>
-      <div className='admin-report__content'>
-        <h4 className='admin-report__title'>
+    <HStack space={3} className='p-3' key={report.id}>
+      <HoverRefWrapper accountId={targetAccount.id} inline>
+        <Link to={`/@${acct}`} title={acct}>
+          <Avatar account={targetAccount} size={32} />
+        </Link>
+      </HoverRefWrapper>
+
+      <Stack space={3} grow>
+        <Text tag='h4' weight='bold' truncate>
           <FormattedMessage
             id='admin.reports.report_title'
             defaultMessage='Report on {acct}'
             values={{ acct: (
-              <HoverRefWrapper accountId={account.id as string} inline>
+              <HoverRefWrapper accountId={account.id} inline>
                 <Link to={`/@${acct}`} title={acct}>@{acct}</Link>
               </HoverRefWrapper>
             ) }}
           />
-        </h4>
-        <div className='admin-report__statuses'>
-          {statusCount > 0 && (
-            <Accordion
-              headline={`Reported posts (${statusCount})`}
-              expanded={accordionExpanded}
-              onToggle={handleAccordionToggle}
-            >
-              {statuses.map(status => <ReportStatus report={report} status={status} key={status.id} />)}
-            </Accordion>
-          )}
-        </div>
-        <div className='admin-report__quote'>
+        </Text>
+
+        {statusCount > 0 && (
+          <Accordion
+            headline={`Reported posts (${statusCount})`}
+            expanded={accordionExpanded}
+            onToggle={handleAccordionToggle}
+          >
+            <Stack space={4}>
+              {statuses.map(status => (
+                <ReportStatus
+                  key={status.id}
+                  report={report}
+                  status={status}
+                />
+              ))}
+            </Stack>
+          </Accordion>
+        )}
+
+        <Stack>
           {(report.comment || '').length > 0 && (
-            <blockquote className='md' dangerouslySetInnerHTML={{ __html: report.comment }} />
+            <Text
+              tag='blockquote'
+              dangerouslySetInnerHTML={{ __html: report.comment }}
+            />
           )}
-          <span className='byline'>
-            &mdash;
-            <HoverRefWrapper accountId={account.id as string} inline>
-              <Link to={`/@${reporterAcct}`} title={reporterAcct}>@{reporterAcct}</Link>
+
+          <HStack space={1}>
+            <Text theme='muted' tag='span'>&mdash;</Text>
+
+            <HoverRefWrapper accountId={account.id} inline>
+              <Link
+                to={`/@${reporterAcct}`}
+                title={reporterAcct}
+                className='text-primary-600 dark:text-accent-blue hover:underline'
+              >
+                @{reporterAcct}
+              </Link>
             </HoverRefWrapper>
-          </span>
-        </div>
-      </div>
+          </HStack>
+        </Stack>
+      </Stack>
+
       <HStack space={2} alignItems='start'>
         <Button onClick={handleCloseReport}>
           <FormattedMessage id='admin.reports.actions.close' defaultMessage='Close' />
@@ -132,7 +151,7 @@ const Report: React.FC<IReport> = ({ id }) => {
 
         <DropdownMenu items={menu} src={require('@tabler/icons/dots-vertical.svg')} />
       </HStack>
-    </div>
+    </HStack>
   );
 };
 
diff --git a/app/soapbox/features/admin/tabs/reports.tsx b/app/soapbox/features/admin/tabs/reports.tsx
index 8975fff5c..d066f34e1 100644
--- a/app/soapbox/features/admin/tabs/reports.tsx
+++ b/app/soapbox/features/admin/tabs/reports.tsx
@@ -35,6 +35,7 @@ const Reports: React.FC = () => {
       showLoading={showLoading}
       scrollKey='admin-reports'
       emptyMessage={intl.formatMessage(messages.emptyMessage)}
+      className='divide-y divide-solid divide-gray-200 dark:divide-gray-800'
     >
       {reports.map(report => report && <Report id={report} key={report} />)}
     </ScrollableList>
diff --git a/app/styles/components/admin.scss b/app/styles/components/admin.scss
index 302baa4e1..bba02ffe8 100644
--- a/app/styles/components/admin.scss
+++ b/app/styles/components/admin.scss
@@ -56,86 +56,6 @@
   }
 }
 
-.admin-report {
-  padding: 15px;
-  display: flex;
-  border-bottom: 1px solid var(--brand-color--faint);
-
-  &__content {
-    padding: 0 16px;
-    flex: 1;
-    overflow: hidden;
-  }
-
-  &__title {
-    font-weight: bold;
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
-
-  &__quote {
-    font-size: 14px;
-
-    a {
-      color: var(--brand-color--hicontrast);
-    }
-
-    .byline {
-      font-size: 12px;
-
-      a {
-        text-decoration: none;
-      }
-    }
-  }
-
-  &__actions {
-    display: flex;
-    align-items: center;
-    height: fit-content;
-    margin-left: auto;
-
-    .icon-button {
-      padding-left: 10px;
-
-      > div {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-
-        > .svg-icon {
-          height: 20px;
-          width: 20px;
-        }
-      }
-    }
-  }
-
-  &__status-content {
-    overflow: hidden;
-  }
-
-  &__status {
-    display: flex;
-    border-bottom: 1px solid var(--accent-color--med);
-    padding: 10px 0;
-
-    &:last-child {
-      border: 0;
-    }
-
-    .status__content {
-      flex: 1;
-      padding: 0;
-    }
-
-    &-actions {
-      padding: 3px 10px;
-      margin-left: auto;
-    }
-  }
-}
-
 .logentry {
   padding: 15px;
 

From 92053cefb0970367bbbf80f89839ca226e8b8fff Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 27 Nov 2022 13:23:43 -0600
Subject: [PATCH 2/4] Admin Report: use better icons for 'deactivate' and
 'delete'

---
 app/soapbox/features/admin/components/report.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/admin/components/report.tsx b/app/soapbox/features/admin/components/report.tsx
index 605eea32c..09e111dc8 100644
--- a/app/soapbox/features/admin/components/report.tsx
+++ b/app/soapbox/features/admin/components/report.tsx
@@ -44,13 +44,14 @@ const Report: React.FC<IReport> = ({ id }) => {
 
   const makeMenu = () => {
     return [{
-      text: intl.formatMessage(messages.deactivateUser, { name: targetAccount.username as string }),
+      text: intl.formatMessage(messages.deactivateUser, { name: targetAccount.username }),
       action: handleDeactivateUser,
-      icon: require('@tabler/icons/user-off.svg'),
+      icon: require('@tabler/icons/hourglass-empty.svg'),
     }, {
-      text: intl.formatMessage(messages.deleteUser, { name: targetAccount.username as string }),
+      text: intl.formatMessage(messages.deleteUser, { name: targetAccount.username }),
       action: handleDeleteUser,
-      icon: require('@tabler/icons/user-minus.svg'),
+      icon: require('@tabler/icons/trash.svg'),
+      destructive: true,
     }];
   };
 

From 946545f86921b88ecf26f5a2f8f95aae8b06836b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 27 Nov 2022 13:33:41 -0600
Subject: [PATCH 3/4] Admin Report: fix report flowing off screen on mobile

---
 app/soapbox/features/admin/components/report.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/admin/components/report.tsx b/app/soapbox/features/admin/components/report.tsx
index 09e111dc8..4669e4d34 100644
--- a/app/soapbox/features/admin/components/report.tsx
+++ b/app/soapbox/features/admin/components/report.tsx
@@ -91,7 +91,7 @@ const Report: React.FC<IReport> = ({ id }) => {
       </HoverRefWrapper>
 
       <Stack space={3} grow>
-        <Text tag='h4' weight='bold' truncate>
+        <Text tag='h4' weight='bold'>
           <FormattedMessage
             id='admin.reports.report_title'
             defaultMessage='Report on {acct}'
@@ -145,7 +145,7 @@ const Report: React.FC<IReport> = ({ id }) => {
         </Stack>
       </Stack>
 
-      <HStack space={2} alignItems='start'>
+      <HStack space={2} alignItems='start' className='flex-none'>
         <Button onClick={handleCloseReport}>
           <FormattedMessage id='admin.reports.actions.close' defaultMessage='Close' />
         </Button>

From f87cf765b334eceb9c7278a4dfb8e52c9dc7cc05 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 28 Nov 2022 09:41:19 -0600
Subject: [PATCH 4/4] Admin Reports: fix overflow issues

---
 .../features/admin/components/report-status.tsx      | 12 +++++++-----
 app/soapbox/features/admin/components/report.tsx     |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/features/admin/components/report-status.tsx b/app/soapbox/features/admin/components/report-status.tsx
index d990d8e81..3caacd1a8 100644
--- a/app/soapbox/features/admin/components/report-status.tsx
+++ b/app/soapbox/features/admin/components/report-status.tsx
@@ -47,15 +47,17 @@ const ReportStatus: React.FC<IReportStatus> = ({ status }) => {
 
   return (
     <HStack space={2} alignItems='start'>
-      <Stack space={2} grow>
+      <Stack space={2} className='overflow-hidden' grow>
         <StatusContent status={status} />
         <StatusMedia status={status} />
       </Stack>
 
-      <DropdownMenu
-        items={menu}
-        src={require('@tabler/icons/dots-vertical.svg')}
-      />
+      <div className='flex-none'>
+        <DropdownMenu
+          items={menu}
+          src={require('@tabler/icons/dots-vertical.svg')}
+        />
+      </div>
     </HStack>
   );
 };
diff --git a/app/soapbox/features/admin/components/report.tsx b/app/soapbox/features/admin/components/report.tsx
index 4669e4d34..3bf550419 100644
--- a/app/soapbox/features/admin/components/report.tsx
+++ b/app/soapbox/features/admin/components/report.tsx
@@ -90,7 +90,7 @@ const Report: React.FC<IReport> = ({ id }) => {
         </Link>
       </HoverRefWrapper>
 
-      <Stack space={3} grow>
+      <Stack space={3} className='overflow-hidden' grow>
         <Text tag='h4' weight='bold'>
           <FormattedMessage
             id='admin.reports.report_title'