From 197e45098d1b42c5cb81ec8036ffcdba4d22098a Mon Sep 17 00:00:00 2001 From: "LAPTOP-RSOLLPLO\\sl" Date: Fri, 13 Mar 2026 13:52:58 +0100 Subject: [PATCH 1/4] #352 Feature: Add API version field to feed source form --- .../feed-sources/templates/brnd-feed-type.jsx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/components/feed-sources/templates/brnd-feed-type.jsx b/src/components/feed-sources/templates/brnd-feed-type.jsx index 8143dfd6..def80ad6 100644 --- a/src/components/feed-sources/templates/brnd-feed-type.jsx +++ b/src/components/feed-sources/templates/brnd-feed-type.jsx @@ -44,6 +44,16 @@ const BrndFeedType = ({ handleInput, formStateObject, mode }) => { } value={formStateObject?.api_auth_key} /> + + ); }; @@ -54,6 +64,7 @@ BrndFeedType.propTypes = { api_base_uri: PropTypes.string, company_id: PropTypes.string, api_auth_key: PropTypes.string, + api_version: PropTypes.string, }), mode: PropTypes.string, }; From 5af0658a52ed838314fd1ebd8fa98152b91e3afd Mon Sep 17 00:00:00 2001 From: "LAPTOP-RSOLLPLO\\sl" Date: Fri, 13 Mar 2026 13:55:39 +0100 Subject: [PATCH 2/4] Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d377ce6..0599e8a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +- Added api_version configuration field to BRND feed source settings, allowing administrators to specify which BRND API version to use. Issue: https://github.com/os2display/display-api-service/issues/352 + - [#295](https://github.com/os2display/display-admin-client/pull/295) - Fixed slide media array not syncing with content on media removal. From c004618512ee54dfb6bed666816820c3d993e9be Mon Sep 17 00:00:00 2001 From: simonllange <57776501+simonllange@users.noreply.github.com> Date: Wed, 29 Apr 2026 09:44:31 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md Co-authored-by: Troels Ugilt Jensen <6103205+tuj@users.noreply.github.com> --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0599e8a4..48899b0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] -- Added api_version configuration field to BRND feed source settings, allowing administrators to specify which BRND API version to use. Issue: https://github.com/os2display/display-api-service/issues/352 +- [#299](https://github.com/os2display/display-admin-client/pull/299) + - Added api_version configuration field to BRND feed source settings, allowing administrators to specify which BRND API version to use. - [#295](https://github.com/os2display/display-admin-client/pull/295) - Fixed slide media array not syncing with content on media removal. From cce29ce3d5fb10d79c73e6022e329568e342be4d Mon Sep 17 00:00:00 2001 From: "LAPTOP-RSOLLPLO\\sl" Date: Wed, 29 Apr 2026 11:50:39 +0200 Subject: [PATCH 4/4] Changed to select dropdown field for api versions --- .../feed-sources/feed-source-manager.jsx | 1 + .../feed-sources/templates/brnd-feed-type.jsx | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/components/feed-sources/feed-source-manager.jsx b/src/components/feed-sources/feed-source-manager.jsx index aac3663a..e3bac791 100644 --- a/src/components/feed-sources/feed-source-manager.jsx +++ b/src/components/feed-sources/feed-source-manager.jsx @@ -88,6 +88,7 @@ function FeedSourceManager({ api_base_uri: "", company_id: "", api_auth_key: "", + api_version: "1.0", }, }, { diff --git a/src/components/feed-sources/templates/brnd-feed-type.jsx b/src/components/feed-sources/templates/brnd-feed-type.jsx index def80ad6..d20aec26 100644 --- a/src/components/feed-sources/templates/brnd-feed-type.jsx +++ b/src/components/feed-sources/templates/brnd-feed-type.jsx @@ -2,11 +2,16 @@ import React from "react"; import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; import FormInput from "../../util/forms/form-input"; +import Select from "../../util/forms/select"; const BrndFeedType = ({ handleInput, formStateObject, mode }) => { const { t } = useTranslation("common", { keyPrefix: "brnd-feed-type", }); + const apiVersionOptions = [ + { key: "api-version-1-0", title: "1.0", value: "1.0" }, + { key: "api-version-2-0", title: "2.0", value: "2.0" }, + ]; return ( <> @@ -45,14 +50,14 @@ const BrndFeedType = ({ handleInput, formStateObject, mode }) => { value={formStateObject?.api_auth_key} /> - );