Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SUPPORT-1257: Added pagination button to drag-and-drop-table #221

Merged
merged 3 commits into from
Oct 13, 2023
Merged

SUPPORT-1257: Added pagination button to drag-and-drop-table #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f5b7c1
SUPPORT-1257: Added pagination button to drag-and-drop-table
tuj Oct 9, 2023
0b2fe00
SUPPORT-1257: Updated changelog
tuj Oct 9, 2023
b01d292
Merge branch 'develop' into hotfix/support-1257-fixed-missing-paginat…
tuj Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

- [#221](https://github.com/os2display/display-admin-client/pull/221)
- Fixed missing pagination button in drag-and-drop-table.
- [#214](https://github.com/os2display/display-admin-client/pull/214)
Use OIDC Code authorization flow and remove React StrictMode.
- Use OIDC Code authorization flow and remove React StrictMode.

## [1.4.0] - 2023-09-14

Expand Down
9 changes: 3 additions & 6 deletions src/components/util/drag-and-drop-table/drag-and-drop-table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import ColumnProptypes from "../../proptypes/column-proptypes";
import PaginationButton from "../forms/multiselect-dropdown/pagination-button";
import "./drag-and-drop-table.scss";

// Drag and drop component (react-beautiful-dnd) is replaced with hello-pangea/dnd,
// because the drag and drop component does not work with react 18
// https://github.com/atlassian/react-beautiful-dnd/issues/2350
// If it some day works with react, we should consider changing it back
/**
* @param {object} props The props.
* @param {Array} props.columns The columns for the table.
Expand Down Expand Up @@ -126,7 +122,7 @@ function DragAndDropTable({
{data.map((item, index) => (
<Draggable
key={item["@id"]}
draggableId={item.title}
draggableId={item["@id"]}
index={index}
>
{(providedDraggable, providedSnapshot) => (
Expand Down Expand Up @@ -164,7 +160,7 @@ function DragAndDropTable({
<Row>
<Col>
{totalItems > data.length && (
<PaginationButton label={label} callback={callback} />
<PaginationButton label={label} callback={callback} showButton />
)}
</Col>
</Row>
Expand All @@ -184,4 +180,5 @@ DragAndDropTable.propTypes = {
callback: PropTypes.func.isRequired,
totalItems: PropTypes.number.isRequired,
};

export default DragAndDropTable;