Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-25 00:07:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix PR comments

Browse Source
This commit is contained in:
andreas-unleash 2022-06-07 11:54:16 +03:00
parent 406c187372
commit dd9a291e09
4 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
frontend/src/component/archive/ArchiveTable/ArchiveTable.tsx
View File

@ -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) => {
reviveFeature(feature)
.then(refetch)
.then(() =>
setToastData({
type: 'success',
title: "And we're back!",
text: 'The feature toggle has been revived.',
confetti: true,
})
)
.catch(e => setToastApiError(e.toString()));
const onRevive = async (feature: string) => {
try {
await reviveFeature(feature);
await refetch();
setToastData({
type: 'success',
title: "And we're back!",
text: 'The feature toggle has been revived.',
confetti: true,
});
} catch (e: any) {
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) => {
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>
);
})}
{renderRows()}
</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) => {
),
},
];
};
}

2
frontend/src/component/common/Table/cells/ReviveArchivedFeatureCell/ReviveArchivedFeatureCell.tsx → frontend/src/component/archive/ArchiveTable/ReviveArchivedFeatureCell/ReviveArchivedFeatureCell.tsx
View File

@ -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';

2
frontend/src/component/archive/FeaturesArchiveTable.tsx
View File

@ -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,

3
frontend/src/component/project/Project/ProjectFeaturesArchive/ProjectFeaturesArchive.tsx
View File

@ -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} />;
};