Skip to content

Commit 9eb5bf1

Browse files
committed
MMI-3273 Fix Merge Show/Program
1 parent fdc2f21 commit 9eb5bf1

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

app/editor/src/features/admin/series/SeriesList.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const SeriesList: React.FC = () => {
1212
const navigate = useNavigate();
1313
const [{ series }, api] = useSeries();
1414

15+
const [pageIndex, setPageIndex] = React.useState(0);
1516
const [items, setItems] = React.useState<ISeriesModel[]>([]);
1617

1718
React.useEffect(() => {
@@ -42,6 +43,7 @@ const SeriesList: React.FC = () => {
4243
onFilterChange={(filter) => {
4344
if (filter && filter.length) {
4445
const value = filter.toLocaleLowerCase();
46+
setPageIndex(0);
4547
setItems(
4648
series.filter(
4749
(i) =>
@@ -52,6 +54,7 @@ const SeriesList: React.FC = () => {
5254
),
5355
);
5456
} else {
57+
setPageIndex(0);
5558
setItems(series);
5659
}
5760
}}
@@ -62,7 +65,12 @@ const SeriesList: React.FC = () => {
6265
columns={columns}
6366
showSort={true}
6467
onRowClick={(row) => navigate(`${row.original.id}`)}
65-
pagingEnabled={false}
68+
pagingEnabled={true}
69+
pageIndex={pageIndex}
70+
pageSize={15}
71+
onPageChange={(page) => {
72+
setPageIndex(page.pageIndex);
73+
}}
6674
/>
6775
</FormPage>
6876
</styled.SeriesList>

app/editor/src/features/admin/series/SeriesMerge.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ const SeriesMerge: React.FC = () => {
4949
}, [api, targetSeries?.id, targetSeriesId]);
5050

5151
React.useEffect(() => {
52-
setSeriesOptions(
53-
series.filter((f) => !f.isOther).map((m: any) => new OptionItem(m.name, m.id, !m.isEnabled)),
54-
);
52+
setSeriesOptions(series.map((m: any) => new OptionItem(m.name, m.id, !m.isEnabled)));
5553
}, [series]);
5654

5755
return (

0 commit comments

Comments
 (0)