From 9f3345ade174ac2c22384851cb119c16b67c932f Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Tue, 5 Sep 2023 09:57:45 +0200 Subject: [PATCH 1/5] DISPLAY-1030: Code authorization flow changes --- CHANGELOG.md | 2 ++ src/components/user/login.jsx | 8 ++++---- src/index.js | 8 +++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7ee2bb7..890faca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +- [#214](https://github.com/os2display/display-admin-client/pull/214) + OIDC Code authorization flow - [#210](https://github.com/os2display/display-admin-client/pull/210) Use thumbnails for media list if they are set diff --git a/src/components/user/login.jsx b/src/components/user/login.jsx index 41a1aeed..ac2f15bd 100644 --- a/src/components/user/login.jsx +++ b/src/components/user/login.jsx @@ -130,19 +130,19 @@ function Login() { useEffect(() => { let isMounted = true; - let idToken = null; + let code = null; let state = null; if (search) { const query = queryString.parse(search); - idToken = query.id_token; + code = query.code; state = query.state; } ConfigLoader.loadConfig().then((config) => { - if (state && idToken) { + if (state && code) { fetch( - `${config.api}v1/authentication/oidc/token?state=${state}&id_token=${idToken}`, + `${config.api}v1/authentication/oidc/token?state=${state}&code=${code}`, { mode: "cors", credentials: "include", diff --git a/src/index.js b/src/index.js index 71232d41..fa4d7780 100644 --- a/src/index.js +++ b/src/index.js @@ -10,10 +10,8 @@ const root = createRoot(container); root.render( - - - - - + + + ); From c62138572bf19ad3a0c0cf076e8d75a6e0057b06 Mon Sep 17 00:00:00 2001 From: jekuaitk Date: Tue, 5 Sep 2023 15:09:44 +0200 Subject: [PATCH 2/5] DISPLAY-1030: Updated CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 890faca2..1b75c51b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - [#214](https://github.com/os2display/display-admin-client/pull/214) - OIDC Code authorization flow + Use OIDC Code authorization flow and remove React StrictMode. - [#210](https://github.com/os2display/display-admin-client/pull/210) Use thumbnails for media list if they are set From 0f5b7c11bba56cd2367626ead9cac99c038469a1 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:55:03 +0200 Subject: [PATCH 3/5] SUPPORT-1257: Added pagination button to drag-and-drop-table --- CHANGELOG.md | 2 ++ .../util/drag-and-drop-table/drag-and-drop-table.jsx | 9 +++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67fad407..c5c5db35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +- Fixed missing pagination button in drag-and-drop-table. + ## [1.4.0] - 2023-09-14 - [#210](https://github.com/os2display/display-admin-client/pull/210) diff --git a/src/components/util/drag-and-drop-table/drag-and-drop-table.jsx b/src/components/util/drag-and-drop-table/drag-and-drop-table.jsx index 54b6257b..08d98950 100644 --- a/src/components/util/drag-and-drop-table/drag-and-drop-table.jsx +++ b/src/components/util/drag-and-drop-table/drag-and-drop-table.jsx @@ -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. @@ -126,7 +122,7 @@ function DragAndDropTable({ {data.map((item, index) => ( {(providedDraggable, providedSnapshot) => ( @@ -164,7 +160,7 @@ function DragAndDropTable({ {totalItems > data.length && ( - + )} @@ -184,4 +180,5 @@ DragAndDropTable.propTypes = { callback: PropTypes.func.isRequired, totalItems: PropTypes.number.isRequired, }; + export default DragAndDropTable; From 0b2fe00c8da2d67d84d943212500e32c76489bd2 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Mon, 9 Oct 2023 12:07:50 +0200 Subject: [PATCH 4/5] SUPPORT-1257: Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5c5db35..ebce0516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ 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. ## [1.4.0] - 2023-09-14 From facb1f49a7d15bb0916f90ead329b5a798423e64 Mon Sep 17 00:00:00 2001 From: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> Date: Thu, 26 Oct 2023 12:27:13 +0200 Subject: [PATCH 5/5] SUPPORT-1258: Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76f3c1be..8c89baf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [1.5.0] - 2023-10-26 + - [#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)