Table data!

frontend/src/locale/en/translation.json

@@ -179,7 +179,10 @@
       "title": "Points and redeems",
       "subtitle": "User leaderboard and pending reward redeems",
       "queue-tab": "Redeem queue",
-      "users-tab": "Manage points"
+      "users-tab": "Manage points",
+      "username": "Viewer",
+      "points": "Points",
+      "username-filter": "Search by username"
     }
   },
   "form-actions": {

frontend/src/ui/components/DataTable.tsx

@@ -0,0 +1,126 @@
+import { ChevronDownIcon, ChevronUpIcon } from '@radix-ui/react-icons';
+import React, { useState } from 'react';
+import { styled } from '../theme';
+import { Table, TableHeader } from '../theme/table';
+import PageList from './PageList';
+
+interface SortingOrder<T> {
+  key: keyof T;
+  order: 'asc' | 'desc';
+}
+
+export interface DataTableProps<T> {
+  data: T[];
+  columns: ({
+    title: string;
+  } & React.HTMLAttributes<HTMLTableCellElement> &
+    (
+      | {
+          sortable: true;
+          key: Extract<keyof T, string>;
+        }
+      | {
+          sortable: false;
+          key: string;
+        }
+    ))[];
+  defaultSort: SortingOrder<T>;
+  view: (data: T) => React.ReactNode;
+  sort: (key: keyof T) => (a: T, b: T) => number;
+}
+
+const Sortable = styled('div', {
+  display: 'flex',
+  gap: '0.3rem',
+  alignItems: 'center',
+  cursor: 'pointer',
+});
+
+/**
+ * DataTable is a component that displays a list of data in a table format with sorting and pagination.
+ */
+export function DataTable<T>({
+  data,
+  columns,
+  defaultSort,
+  sort,
+  view,
+}: DataTableProps<T>): React.ReactElement {
+  const [entriesPerPage, setEntriesPerPage] = useState(15);
+  const [page, setPage] = useState(0);
+  const [sorting, setSorting] = useState<SortingOrder<T>>(defaultSort);
+
+  const changeSort = (key: keyof T) => {
+    if (sorting.key === key) {
+      // Same key, swap sorting order
+      setSorting({
+        ...sorting,
+        order: sorting.order === 'asc' ? 'desc' : 'asc',
+      });
+    } else {
+      // Different key, change to sort that key
+      setSorting({ ...sorting, key, order: 'asc' });
+    }
+  };
+
+  const sortedEntries = data.slice(0);
+  const sortFn = sort(sorting.key);
+  if (sortFn) {
+    sortedEntries.sort((a, b) => {
+      const result = sortFn(a, b);
+      switch (sorting.order) {
+        case 'asc':
+          return result;
+        case 'desc':
+          return -result;
+      }
+    });
+  }
+
+  const offset = page * entriesPerPage;
+  const paged = sortedEntries.slice(offset, offset + entriesPerPage);
+  const totalPages = Math.floor(sortedEntries.length / entriesPerPage);
+
+  return (
+    <>
+      <PageList
+        current={page + 1}
+        min={1}
+        max={totalPages + 1}
+        itemsPerPage={entriesPerPage}
+        onSelectChange={(em) => setEntriesPerPage(em)}
+        onPageChange={(p) => setPage(p - 1)}
+      />
+      <Table>
+        <thead>
+          {columns.map((props) => (
+            <TableHeader {...props} key={props.key}>
+              {props.sortable ? (
+                <Sortable onClick={() => changeSort(props.key)}>
+                  {props.title}
+                  {sorting.key === props.key &&
+                    (sorting.order === 'asc' ? (
+                      <ChevronUpIcon />
+                    ) : (
+                      <ChevronDownIcon />
+                    ))}
+                </Sortable>
+              ) : (
+                props.title
+              )}
+            </TableHeader>
+          ))}
+        </thead>
+        <tbody>{paged.map(view)}</tbody>
+      </Table>
+      <PageList
+        current={page + 1}
+        min={1}
+        max={totalPages + 1}
+        itemsPerPage={entriesPerPage}
+        onSelectChange={(em) => setEntriesPerPage(em)}
+        onPageChange={(p) => setPage(p - 1)}
+      />
+    </>
+  );
+}

frontend/src/ui/components/PageList.tsx

@@ -86,6 +86,7 @@ function PageList({
         </ToolbarComboBox>
       </ToolbarSection>
       <ToolbarSection>
+        <div style={{ padding: '0 0.25rem' }}>{t('pagination.page')}</div>
         {current > min ? (
           <ToolbarButton
             className="button pagination-link"

frontend/src/ui/pages/LoyaltyQueue.tsx

@@ -3,8 +3,11 @@ import { useTranslation } from 'react-i18next';
 import { useDispatch } from 'react-redux';
 import { useModule, useUserPoints } from '../../lib/react-utils';
 import { modules } from '../../store/api/reducer';
-import PageList from '../components/PageList';
+import { DataTable } from '../components/DataTable';
 import {
+  Button,
+  Field,
+  InputBox,
   PageContainer,
   PageHeader,
   PageTitle,
@@ -14,6 +17,7 @@ import {
   TabList,
   TextBlock,
 } from '../theme';
+import { TableCell, TableRow } from '../theme/table';
 
 interface UserSortingOrder {
   key: 'user' | 'points';
@@ -36,80 +40,75 @@ function UserList() {
   const users = useUserPoints();
   const dispatch = useDispatch();
 
-  const [entriesPerPage, setEntriesPerPage] = useState(15);
+  const [config] = useModule(modules.loyaltyConfig);
-  const [page, setPage] = useState(0);
   const [usernameFilter, setUsernameFilter] = useState('');
-  const [sorting, setSorting] = useState<UserSortingOrder>({
+  const filtered = Object.entries(users ?? [])
-    key: 'points',
+    .filter(([user]) => user.includes(usernameFilter))
-    order: 'desc',
+    .map(([username, data]) => ({
-  });
+      username,
+      ...data,
+    }));
+  type UserEntry = typeof filtered[0];
 
-  const changeSort = (key: 'user' | 'points') => {
+  type SortFn = (a: UserEntry, b: UserEntry) => number;
-    if (sorting.key === key) {
+
-      // Same key, swap sorting order
+  const sortfn = (key: keyof UserEntry): SortFn => {
-      setSorting({
+    switch (key) {
-        ...sorting,
+      case 'username': {
-        order: sorting.order === 'asc' ? 'desc' : 'asc',
+        return (a, b) => a.username.localeCompare(b.username);
-      });
+      }
-    } else {
+      case 'points': {
-      // Different key, change to sort that key
+        return (a: UserEntry, b: UserEntry) => a.points - b.points;
-      setSorting({ ...sorting, key, order: 'asc' });
+      }
     }
   };
 
-  const rawEntries = Object.entries(users ?? []);
-  const filtered = rawEntries.filter(([user]) => user.includes(usernameFilter));
-
-  const sortedEntries = filtered;
-  switch (sorting.key) {
-    case 'user':
-      if (sorting.order === 'asc') {
-        sortedEntries.sort(([userA], [userB]) => (userA > userB ? 1 : -1));
-      } else {
-        sortedEntries.sort(([userA], [userB]) => (userA < userB ? 1 : -1));
-      }
-      break;
-    case 'points':
-      if (sorting.order === 'asc') {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        sortedEntries.sort(([_a, a], [_b, b]) => a.points - b.points);
-      } else {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        sortedEntries.sort(([_a, a], [_b, b]) => b.points - a.points);
-      }
-      break;
-    default:
-    // unreacheable
-  }
-
-  const offset = page * entriesPerPage;
-  const paged = sortedEntries.slice(offset, offset + entriesPerPage);
-  const totalPages = Math.floor(sortedEntries.length / entriesPerPage);
-
   return (
     <>
-      <PageList
+      <Field size="fullWidth" spacing="none">
-        current={page + 1}
+        <InputBox
-        min={1}
+          placeholder={t('pages.loyalty-queue.username-filter')}
-        max={totalPages + 1}
+          value={usernameFilter}
-        itemsPerPage={entriesPerPage}
+          onChange={(e) => setUsernameFilter(e.target.value)}
-        onSelectChange={(em) => setEntriesPerPage(em)}
+        />
-        onPageChange={(p) => setPage(p - 1)}
+      </Field>
-      />
+      <DataTable
-
+        sort={sortfn}
-      {paged.map(([user, { points }]) => (
+        data={filtered}
-        <article key={user}>
+        columns={[
-          {user} - {points}
+          {
-        </article>
+            key: 'username',
-      ))}
+            title: t('pages.loyalty-queue.username'),
-
+            sortable: true,
-      <PageList
+            style: {
-        current={page + 1}
+              width: '100%',
-        min={1}
+              textAlign: 'left',
-        max={totalPages + 1}
+            },
-        itemsPerPage={entriesPerPage}
+          },
-        onSelectChange={(em) => setEntriesPerPage(em)}
+          {
-        onPageChange={(p) => setPage(p - 1)}
+            key: 'points',
+            title: config?.currency || t('pages.loyalty-queue.points'),
+            sortable: true,
+            style: {
+              textTransform: 'capitalize',
+            },
+          },
+          {
+            key: 'actions',
+            title: '',
+            sortable: false,
+          },
+        ]}
+        defaultSort={{ key: 'points', order: 'desc' }}
+        view={({ username, points }) => (
+          <TableRow key="username">
+            <TableCell css={{ width: '100%' }}>{username}</TableCell>
+            <TableCell>{points}</TableCell>
+            <TableCell>
+              <Button size="small">Edit</Button>
+            </TableCell>
+          </TableRow>
+        )}
       />
     </>
   );

frontend/src/ui/theme/forms.ts

@@ -15,6 +15,9 @@ export const Field = styled('fieldset', {
       narrow: {
         marginBottom: '1rem',
       },
+      none: {
+        marginBottom: 0,
+      },
     },
     size: {
       fullWidth: {
@@ -109,6 +112,7 @@ export const MultiButton = styled('div', {
 export const Button = styled('button', {
   all: 'unset',
   cursor: 'pointer',
+  userSelect: 'none',
   color: '$gray12',
   fontWeight: '300',
   padding: '0.5rem 1rem',

frontend/src/ui/theme/table.ts

@@ -0,0 +1,37 @@
+import { theme, styled } from './theme';
+
+export const Table = styled('table', {
+  border: '1px solid $gray3',
+  borderCollapse: 'collapse',
+});
+
+export const TableRow = styled('tr', {
+  all: 'unset',
+  display: 'table-row',
+  padding: '0.5rem',
+  verticalAlign: 'middle',
+  textAlign: 'left',
+  backgroundColor: '$gray1',
+  '&:nth-child(even)': {
+    backgroundColor: '$gray2',
+  },
+});
+
+export const TableHeader = styled('th', {
+  all: 'unset',
+  display: 'table-cell',
+  padding: '0.25rem 0.5rem',
+  height: '2rem',
+  verticalAlign: 'middle',
+  textAlign: 'left',
+  backgroundColor: '$gray3',
+  fontWeight: 'bold',
+});
+
+export const TableCell = styled('td', {
+  all: 'unset',
+  display: 'table-cell',
+  padding: '0.25rem 0.5rem',
+  verticalAlign: 'middle',
+  textAlign: 'left',
+});

frontend/src/ui/theme/toolbar.ts

@@ -23,6 +23,7 @@ const itemStyles = {
   lineHeight: 1,
   alignItems: 'center',
   justifyContent: 'center',
+  userSelect: 'none',
 };
 
 export const ToolbarButton = styled(ToolbarPrimitive.Button, {