Fix PR comments

frontend/src/component/archive/ArchiveTable/ArchiveTable.tsx

@@ -27,7 +27,7 @@ import { FeatureSeenCell } from '../../common/Table/cells/FeatureSeenCell/Featur
 import { LinkCell } from '../../common/Table/cells/LinkCell/LinkCell';
 import { FeatureStaleCell } from '../../feature/FeatureToggleList/FeatureStaleCell/FeatureStaleCell';
 import { TimeAgoCell } from '../../common/Table/cells/TimeAgoCell/TimeAgoCell';
-import { ReviveArchivedFeatureCell } from 'component/common/Table/cells/ReviveArchivedFeatureCell/ReviveArchivedFeatureCell';
+import { ReviveArchivedFeatureCell } from 'component/archive/ArchiveTable/ReviveArchivedFeatureCell/ReviveArchivedFeatureCell';
 import { useStyles } from '../../feature/FeatureToggleList/styles';
 import { useVirtualizedRange } from '../../../hooks/useVirtualizedRange';
 import {
@@ -68,21 +68,22 @@ export const ArchiveTable = ({
 
     const { reviveFeature } = useFeatureArchiveApi();
 
-    const onRevive = (feature: string) => {
+    const onRevive = async (feature: string) => {
-        reviveFeature(feature)
+        try {
-            .then(refetch)
+            await reviveFeature(feature);
-            .then(() =>
+            await refetch();
-                setToastData({
+            setToastData({
-                    type: 'success',
+                type: 'success',
-                    title: "And we're back!",
+                title: "And we're back!",
-                    text: 'The feature toggle has been revived.',
+                text: 'The feature toggle has been revived.',
-                    confetti: true,
+                confetti: true,
-                })
+            });
-            )
+        } catch (e: any) {
-            .catch(e => setToastApiError(e.toString()));
+            setToastApiError(e.toString());
+        }
     };
 
-    const columns = useColumns(onRevive);
+    const columns = getColumns(onRevive);
 
     const data = useMemo(
         () =>
@@ -160,6 +161,41 @@ export const ArchiveTable = ({
     const [firstRenderedIndex, lastRenderedIndex] =
         useVirtualizedRange(rowHeight);
 
+    const renderRows = () => {
+        return (
+            <>
+                {rows.map((row, index) => {
+                    const isVirtual =
+                        index < firstRenderedIndex || index > lastRenderedIndex;
+
+                    if (isVirtual) {
+                        return null;
+                    }
+
+                    prepareRow(row);
+                    return (
+                        <TableRow hover {...row.getRowProps()}>
+                            {row.cells.map(cell => (
+                                <TableCell
+                                    {...cell.getCellProps({
+                                        style: {
+                                            flex: cell.column.minWidth
+                                                ? '1 0 auto'
+                                                : undefined,
+                                        },
+                                    })}
+                                    className={classes.cell}
+                                >
+                                    {cell.render('Cell')}
+                                </TableCell>
+                            ))}
+                        </TableRow>
+                    );
+                })}
+            </>
+        );
+    };
+
     return (
         <PageContent
             isLoading={loading}
@@ -194,40 +230,7 @@ export const ArchiveTable = ({
                                     headerGroups={headerGroups as any}
                                 />
                                 <TableBody {...getTableBodyProps()}>
-                                    {rows.map((row, index) => {
+                                    {renderRows()}
-                                        const isVirtual =
-                                            index < firstRenderedIndex ||
-                                            index > lastRenderedIndex;
-
-                                        if (isVirtual) {
-                                            return null;
-                                        }
-
-                                        prepareRow(row);
-                                        return (
-                                            <TableRow
-                                                hover
-                                                {...row.getRowProps()}
-                                            >
-                                                {row.cells.map(cell => (
-                                                    <TableCell
-                                                        {...cell.getCellProps({
-                                                            style: {
-                                                                flex: cell
-                                                                    .column
-                                                                    .minWidth
-                                                                    ? '1 0 auto'
-                                                                    : undefined,
-                                                            },
-                                                        })}
-                                                        className={classes.cell}
-                                                    >
-                                                        {cell.render('Cell')}
-                                                    </TableCell>
-                                                ))}
-                                            </TableRow>
-                                        );
-                                    })}
                                 </TableBody>
                             </Table>
                         </SearchHighlightProvider>
@@ -249,7 +252,7 @@ export const ArchiveTable = ({
     );
 };
 
-const useColumns = (onRevive: any) => {
+function getColumns(onRevive: (feature: string) => Promise<void>) {
     return [
         {
             id: 'Seen',
@@ -323,4 +326,4 @@ const useColumns = (onRevive: any) => {
             ),
         },
     ];
-};
+}

frontend/src/component/archive/ArchiveTable/ReviveArchivedFeatureCell/ReviveArchivedFeatureCell.tsx

@@ -1,5 +1,5 @@
 import { VFC } from 'react';
-import { ActionCell } from '../ActionCell/ActionCell';
+import { ActionCell } from '../../../common/Table/cells/ActionCell/ActionCell';
 import { Undo } from '@mui/icons-material';
 import { IconButton } from '@mui/material';
 

frontend/src/component/archive/FeaturesArchiveTable.tsx

@@ -3,10 +3,12 @@ import { ArchiveTable } from './ArchiveTable/ArchiveTable';
 import { useSearchParams } from 'react-router-dom';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { SortingRule } from 'react-table';
+import { usePageTitle } from '../../hooks/usePageTitle';
 
 const defaultSort: SortingRule<string> = { id: 'createdAt', desc: true };
 
 export const FeaturesArchiveTable = () => {
+    usePageTitle('Archived');
     const {
         archivedFeatures = [],
         loading,

frontend/src/component/project/Project/ProjectFeaturesArchive/ProjectFeaturesArchive.tsx

@@ -1,4 +1,5 @@
 import { ProjectFeaturesArchiveTable } from '../../../archive/ProjectFeaturesArchiveTable';
+import { usePageTitle } from '../../../../hooks/usePageTitle';
 
 interface IProjectFeaturesArchiveProps {
     projectId: string;
@@ -7,7 +8,7 @@ interface IProjectFeaturesArchiveProps {
 export const ProjectFeaturesArchive = ({
     projectId,
 }: IProjectFeaturesArchiveProps) => {
-    // usePageTitle('Project Archived Features');
+    usePageTitle('Project Archived Features');
 
     return <ProjectFeaturesArchiveTable projectId={projectId} />;
 };