From f8c293eef66995410b830f0f8d3415172471f92d Mon Sep 17 00:00:00 2001 From: Michel Verbraak Date: Wed, 19 Jun 2024 14:59:18 +0200 Subject: [PATCH 1/5] Add device attribute to disable forwarding of events for a specific device --- src/common/attributes/useDeviceAttributes.js | 4 ++++ src/resources/l10n/en.json | 1 + src/resources/l10n/nl.json | 1 + 3 files changed, 6 insertions(+) diff --git a/src/common/attributes/useDeviceAttributes.js b/src/common/attributes/useDeviceAttributes.js index eab9b8f68d..d05775e014 100644 --- a/src/common/attributes/useDeviceAttributes.js +++ b/src/common/attributes/useDeviceAttributes.js @@ -30,4 +30,8 @@ export default (t) => useMemo(() => ({ name: t('attributeDeviceInactivityPeriod'), type: 'number', }, + deviceDisableForwarding: { + name: t('attributeDeviceDisableForwarding'), + type: 'boolean', + }, }), [t]); diff --git a/src/resources/l10n/en.json b/src/resources/l10n/en.json index 631634db46..9bcb5982ca 100644 --- a/src/resources/l10n/en.json +++ b/src/resources/l10n/en.json @@ -131,6 +131,7 @@ "attributeDeviceImage": "Device Image", "attributeDeviceInactivityStart": "Device Inactivity Start", "attributeDeviceInactivityPeriod": "Device Inactivity Period", + "attributeDeviceDisableForwarding": "Do Not Forward Device Events", "attributeProcessingCopyAttributes": "Processing: Copy Attributes", "attributeColor": "Color", "attributeWebLiveRouteLength": "Web: Live Route Length", diff --git a/src/resources/l10n/nl.json b/src/resources/l10n/nl.json index 6a22a8d6fb..582ca5070a 100644 --- a/src/resources/l10n/nl.json +++ b/src/resources/l10n/nl.json @@ -131,6 +131,7 @@ "attributeDeviceImage": "Apparaatafbeelding", "attributeDeviceInactivityStart": "Start van inactiviteit", "attributeDeviceInactivityPeriod": "Inactiviteitperiode", + "attributeDeviceDisableForwarding": "Stuur events voor device niet door", "attributeProcessingCopyAttributes": "Verwerking: kopieer attributen", "attributeColor": "Kleur", "attributeWebLiveRouteLength": "Web: live routelengte", From 4cffeab855c66880d4d2996e2bba182fa7c50125 Mon Sep 17 00:00:00 2001 From: Michel Verbraak Date: Thu, 27 Jun 2024 12:48:59 +0200 Subject: [PATCH 2/5] Change to global config and attributes per device for position and event forwarding --- src/common/attributes/useDeviceAttributes.js | 8 ++++++-- src/resources/l10n/en.json | 3 ++- src/resources/l10n/nl.json | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/common/attributes/useDeviceAttributes.js b/src/common/attributes/useDeviceAttributes.js index d05775e014..d83d76e384 100644 --- a/src/common/attributes/useDeviceAttributes.js +++ b/src/common/attributes/useDeviceAttributes.js @@ -30,8 +30,12 @@ export default (t) => useMemo(() => ({ name: t('attributeDeviceInactivityPeriod'), type: 'number', }, - deviceDisableForwarding: { - name: t('attributeDeviceDisableForwarding'), + deviceAllowPositionForwarding: { + name: t('attributeDeviceAllowPositionForwarding'), + type: 'boolean', + }, + deviceAllowEventForwarding: { + name: t('attributeDeviceAllowEventForwarding'), type: 'boolean', }, }), [t]); diff --git a/src/resources/l10n/en.json b/src/resources/l10n/en.json index 9bcb5982ca..4d78fc4e2d 100644 --- a/src/resources/l10n/en.json +++ b/src/resources/l10n/en.json @@ -131,7 +131,8 @@ "attributeDeviceImage": "Device Image", "attributeDeviceInactivityStart": "Device Inactivity Start", "attributeDeviceInactivityPeriod": "Device Inactivity Period", - "attributeDeviceDisableForwarding": "Do Not Forward Device Events", + "attributeDeviceAllowPositionForwarding": "Forward Device Positions", + "attributeDeviceAllowEventForwarding": "Forward Device Events", "attributeProcessingCopyAttributes": "Processing: Copy Attributes", "attributeColor": "Color", "attributeWebLiveRouteLength": "Web: Live Route Length", diff --git a/src/resources/l10n/nl.json b/src/resources/l10n/nl.json index 582ca5070a..4e24f4299f 100644 --- a/src/resources/l10n/nl.json +++ b/src/resources/l10n/nl.json @@ -131,7 +131,8 @@ "attributeDeviceImage": "Apparaatafbeelding", "attributeDeviceInactivityStart": "Start van inactiviteit", "attributeDeviceInactivityPeriod": "Inactiviteitperiode", - "attributeDeviceDisableForwarding": "Stuur events voor device niet door", + "attributeDeviceAllowPositionForwarding": "Stuur posities voor device door", + "attributeDeviceAllowEventForwarding": "Stuur events voor device door", "attributeProcessingCopyAttributes": "Verwerking: kopieer attributen", "attributeColor": "Kleur", "attributeWebLiveRouteLength": "Web: live routelengte", From 9ff012ba2bc8229d58f9d2413835f09c323bcd83 Mon Sep 17 00:00:00 2001 From: Michel Verbraak Date: Fri, 28 Jun 2024 08:44:06 +0200 Subject: [PATCH 3/5] Changes after conversation --- src/common/attributes/useDeviceAttributes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/attributes/useDeviceAttributes.js b/src/common/attributes/useDeviceAttributes.js index d83d76e384..41267fc091 100644 --- a/src/common/attributes/useDeviceAttributes.js +++ b/src/common/attributes/useDeviceAttributes.js @@ -30,11 +30,11 @@ export default (t) => useMemo(() => ({ name: t('attributeDeviceInactivityPeriod'), type: 'number', }, - deviceAllowPositionForwarding: { + allowPositionForwarding: { name: t('attributeDeviceAllowPositionForwarding'), type: 'boolean', }, - deviceAllowEventForwarding: { + enableEventForwarding: { name: t('attributeDeviceAllowEventForwarding'), type: 'boolean', }, From 83be58b52101d66e385284ab94e3a12d69233f80 Mon Sep 17 00:00:00 2001 From: Michel Verbraak Date: Fri, 28 Jun 2024 08:46:25 +0200 Subject: [PATCH 4/5] Remove Dutch translation --- src/resources/l10n/nl.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/resources/l10n/nl.json b/src/resources/l10n/nl.json index 4e24f4299f..6a22a8d6fb 100644 --- a/src/resources/l10n/nl.json +++ b/src/resources/l10n/nl.json @@ -131,8 +131,6 @@ "attributeDeviceImage": "Apparaatafbeelding", "attributeDeviceInactivityStart": "Start van inactiviteit", "attributeDeviceInactivityPeriod": "Inactiviteitperiode", - "attributeDeviceAllowPositionForwarding": "Stuur posities voor device door", - "attributeDeviceAllowEventForwarding": "Stuur events voor device door", "attributeProcessingCopyAttributes": "Verwerking: kopieer attributen", "attributeColor": "Kleur", "attributeWebLiveRouteLength": "Web: live routelengte", From 5bc825cddbd1c682aba65605029d13725b55d39e Mon Sep 17 00:00:00 2001 From: Michel Verbraak Date: Mon, 1 Jul 2024 09:01:02 +0200 Subject: [PATCH 5/5] Rename attribute background name to be same as enableEventForwarding --- src/common/attributes/useDeviceAttributes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/attributes/useDeviceAttributes.js b/src/common/attributes/useDeviceAttributes.js index 41267fc091..fe32959668 100644 --- a/src/common/attributes/useDeviceAttributes.js +++ b/src/common/attributes/useDeviceAttributes.js @@ -30,7 +30,7 @@ export default (t) => useMemo(() => ({ name: t('attributeDeviceInactivityPeriod'), type: 'number', }, - allowPositionForwarding: { + enablePositionForwarding: { name: t('attributeDeviceAllowPositionForwarding'), type: 'boolean', },