From 6ae426dfaef0859b2665d7225a78d46748c10895 Mon Sep 17 00:00:00 2001 From: Agnete Moos Date: Tue, 3 Jun 2025 11:25:21 +0200 Subject: [PATCH 1/6] Initial commit --- .../feed-sources/feed-source-form.jsx | 9 +++ .../feed-sources/feed-source-manager.jsx | 10 +++ .../feed-sources/templates/brnd-feed-type.jsx | 68 +++++++++++++++++++ src/translations/da/common.json | 7 ++ 4 files changed, 94 insertions(+) create mode 100644 src/components/feed-sources/templates/brnd-feed-type.jsx diff --git a/src/components/feed-sources/feed-source-form.jsx b/src/components/feed-sources/feed-source-form.jsx index 31b7d2d8..32e0f05a 100644 --- a/src/components/feed-sources/feed-source-form.jsx +++ b/src/components/feed-sources/feed-source-form.jsx @@ -15,6 +15,7 @@ import EventDatabaseApiFeedType from "./templates/event-database-feed-type"; import ColiboFeedType from "./templates/colibo-feed-type"; import StickyFooter from "../util/sticky-footer"; import EventDatabaseApiV2FeedType from "./templates/event-database-v2-feed-type"; +import BrndFeedType from "./templates/brnd-feed-type"; /** * The feed-source form component. @@ -126,6 +127,14 @@ function FeedSourceForm({ feedSourceId={feedSource["@id"]} /> )} + {feedSource?.feedType === "App\\Feed\\BrndFeedType" && ( + + )} {feedSource?.feedType === "App\\Feed\\EventDatabaseApiFeedType" && ( { + const { t } = useTranslation("common", { + keyPrefix: "brnd-feed-type", + }); + + return ( + <> + + + + + + + + ); +}; + +BrndFeedType.propTypes = { + handleInput: PropTypes.func, + formStateObject: PropTypes.shape({ + api_base_uri: PropTypes.string, + company_id: PropTypes.string, + api_auth_key: PropTypes.string, + }), + feedSourceId: PropTypes.string, + mode: PropTypes.string, +}; + +export default BrndFeedType; diff --git a/src/translations/da/common.json b/src/translations/da/common.json index 716a67d2..212a47b7 100644 --- a/src/translations/da/common.json +++ b/src/translations/da/common.json @@ -1157,6 +1157,13 @@ "save-before-recipients-can-be-set": "Bemærk! Datakilden skal gemmes før der kan tilkobles tilladte modtagergrupper. Gem og åbn datakilden igen.", "allowed-recipients-help": "Det er kun disse modtagergrupper, der vil være tilgængelige, når man opretter et slide, der bruger datakilden." }, + "brnd-feed-type": { + "title": "BRND feed", + "api-base-uri": "API Base URI", + "company-id": "Company ID", + "api_auth_key": "API Auth Key", + "values-info": "Værdierne Company ID og API Auth Key udleveres af BRND. Ret henvendelse til BRND support." + }, "event-database-api-v2-feed-type": { "title": "Event databasen v.2", "host": "Host", From 75cb59ecfecdc79a77647df9a1027e1244a27d55 Mon Sep 17 00:00:00 2001 From: Agnete Moos Date: Tue, 3 Jun 2025 12:47:27 +0200 Subject: [PATCH 2/6] Fix label translations --- src/components/feed-sources/templates/brnd-feed-type.jsx | 4 ++-- src/translations/da/common.json | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/feed-sources/templates/brnd-feed-type.jsx b/src/components/feed-sources/templates/brnd-feed-type.jsx index 0fecdcce..4abba10e 100644 --- a/src/components/feed-sources/templates/brnd-feed-type.jsx +++ b/src/components/feed-sources/templates/brnd-feed-type.jsx @@ -32,7 +32,7 @@ const BrndFeedType = ({ name="company_id" type="text" className="mb-2" - label={t("company_id")} + label={t("company-id")} onChange={handleInput} placeholder={ mode === "PUT" ? t("redacted-value-input-placeholder") : "" @@ -43,7 +43,7 @@ const BrndFeedType = ({ Date: Tue, 3 Jun 2025 14:24:08 +0200 Subject: [PATCH 3/6] Add translation string --- src/translations/da/common.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/translations/da/common.json b/src/translations/da/common.json index 2a6d10d9..858e93e5 100644 --- a/src/translations/da/common.json +++ b/src/translations/da/common.json @@ -1165,7 +1165,8 @@ "api-base-uri": "API Base URI", "company-id": "Company ID", "api-auth-key": "API Auth Key", - "values-info": "Værdierne Company ID og API Auth Key udleveres af BRND. Ret henvendelse til BRND support." + "values-info": "Værdierne Company ID og API Auth Key udleveres af BRND. Ret henvendelse til BRND support.", + "redacted-value-input-placeholder": "Skjult værdi" }, "event-database-api-v2-feed-type": { "title": "Event databasen v.2", From a17f71505288cfcf905f6e0ea158829b6b7be0b4 Mon Sep 17 00:00:00 2001 From: Agnete Moos Date: Thu, 18 Sep 2025 13:32:16 +0200 Subject: [PATCH 4/6] Update CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a56c0e2..d7a455c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +- [#292](https://github.com/os2display/display-admin-client/pull/292) + - Add BRND Booking feed type ## [2.5.2] - 2025-09-25 From f15cad7724853419de5003990655919c506f7b80 Mon Sep 17 00:00:00 2001 From: Agnete Moos Date: Thu, 18 Sep 2025 13:57:21 +0200 Subject: [PATCH 5/6] Fix react coding standards errors --- .../feed-sources/templates/brnd-feed-type.jsx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/components/feed-sources/templates/brnd-feed-type.jsx b/src/components/feed-sources/templates/brnd-feed-type.jsx index 4abba10e..91e0b9e2 100644 --- a/src/components/feed-sources/templates/brnd-feed-type.jsx +++ b/src/components/feed-sources/templates/brnd-feed-type.jsx @@ -1,21 +1,16 @@ -import { React, useEffect, useState } from "react"; +import React from "react"; import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; import FormInput from "../../util/forms/form-input"; -const BrndFeedType = ({ - feedSourceId, - handleInput, - formStateObject, - mode, -}) => { +const BrndFeedType = ({ handleInput, formStateObject, mode }) => { const { t } = useTranslation("common", { keyPrefix: "brnd-feed-type", }); return ( <> - + Date: Thu, 18 Sep 2025 14:02:35 +0200 Subject: [PATCH 6/6] Fix react coding standards error --- src/components/feed-sources/templates/brnd-feed-type.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/feed-sources/templates/brnd-feed-type.jsx b/src/components/feed-sources/templates/brnd-feed-type.jsx index 91e0b9e2..301d372d 100644 --- a/src/components/feed-sources/templates/brnd-feed-type.jsx +++ b/src/components/feed-sources/templates/brnd-feed-type.jsx @@ -10,7 +10,6 @@ const BrndFeedType = ({ handleInput, formStateObject, mode }) => { return ( <> -