Merge branch 'develop' into feature/external-login

os2display · Jan 22, 2024 · d4c306b · d4c306b
2 parents c0556e8 + 6018974
commit d4c306b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- Added fetch all to avoid removing slides when saving playlist and all slides have not been fetched.
 - [#220](https://github.com/os2display/display-admin-client/pull/220)
   - Adds CRUD flows for external users and activation codes.
   - Added login and activation flow for external users.

diff --git a/src/components/util/multi-and-table/select-slides-table.jsx b/src/components/util/multi-and-table/select-slides-table.jsx
@@ -46,6 +46,11 @@ function SelectSlidesTable({ handleChange, name, slideId }) {
         return slide;
       });
       setSelectedData([...selectedData, ...newSlides]);
+
+      // Get all selected slides. If a next page is defined, get the next page.
+      if (data["hydra:view"]["hydra:next"]) {
+        setPage(page + 1);
+      }
     }
   }, [data]);