From 157ba76e4eb2a6c22d4d62e1646457dae89f5bd0 Mon Sep 17 00:00:00 2001
From: Hugo NOUTS <hnouts@grandlyon.com>
Date: Thu, 2 Feb 2023 10:46:33 +0000
Subject: [PATCH] feat(konnector): added info text to konnector card on arrival
time of data
---
.gitignore | 1 +
src/components/Connection/ConnectionResult.tsx | 15 ++++++++++++---
src/components/Connection/connectionResult.scss | 4 ++++
src/locales/fr.json | 5 +++++
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 226f552a4..978c511aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
node_modules/
npm-debug.log
yarn-error.log
+.yarn
# Scripts
scripts/AAAA*
diff --git a/src/components/Connection/ConnectionResult.tsx b/src/components/Connection/ConnectionResult.tsx
index f4fa59af7..214dadb43 100644
--- a/src/components/Connection/ConnectionResult.tsx
+++ b/src/components/Connection/ConnectionResult.tsx
@@ -11,7 +11,7 @@ import {
AccountSgeData,
FluidConnection,
FluidStatus,
- Trigger,
+ Trigger
} from 'models'
import React, { useCallback, useEffect, useState } from 'react'
import { useDispatch } from 'react-redux'
@@ -21,7 +21,7 @@ import TriggerService from 'services/triggers.service'
import {
setShouldRefreshConsent,
updatedFluidConnection,
- updateSgeStore,
+ updateSgeStore
} from 'store/global/global.actions'
import { getKonnectorUpdateError } from 'utils/utils'
import './connectionResult.scss'
@@ -210,7 +210,10 @@ const ConnectionResult: React.FC<ConnectionResultProps> = ({
hasUpdatedToday={hasUpdatedToday()}
/>
) : (
- <DisplayLastUpdateDate lastExecutionDate={lastExecutionDate} />
+ <DisplayLastUpdateDate
+ fluidType={fluidType}
+ lastExecutionDate={lastExecutionDate}
+ />
)}
</div>
<div className="inline-buttons">
@@ -398,8 +401,10 @@ const DisplayManualUpdate = () => {
const DisplayLastUpdateDate = ({
lastExecutionDate,
+ fluidType,
}: {
lastExecutionDate: string | DateTime
+ fluidType: FluidType
}) => {
const { t } = useI18n()
return (
@@ -408,6 +413,10 @@ const DisplayLastUpdateDate = ({
{t('konnector_form.label_updated_at')}
</div>
<div className="text-16-bold">{lastExecutionDate.toLocaleString()}</div>
+ <br />
+ <div className="text-14-normal delta-caption">
+ {t(`konnector_form.konnector_delta.${FluidType[fluidType]}`)}
+ </div>
</div>
)
}
diff --git a/src/components/Connection/connectionResult.scss b/src/components/Connection/connectionResult.scss
index 49753c53b..6d46ca068 100644
--- a/src/components/Connection/connectionResult.scss
+++ b/src/components/Connection/connectionResult.scss
@@ -31,6 +31,10 @@
}
}
+.delta-caption {
+ color: $soft-grey;
+}
+
.inline-buttons {
display: flex;
flex-flow: row nowrap;
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 735d8a727..522a87379 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -743,6 +743,11 @@
"error_update_oauth": "Votre autorisation pour afficher vos données %{fluid} a expiré.",
"button_oauth_reload": "Redonner mon consentement",
"OK": "Ok",
+ "konnector_delta": {
+ "ELECTRICITY": "La donnée de consommation électrique arrive normalement à J+1. Un retard d'un ou deux jours est parfois constaté.",
+ "GAS": "La donnée de consommation de gaz arrive normalement à J+3. Un retard d'un ou deux jours est parfois constaté.",
+ "WATER": "La donnée de consommation d'eau arrive normalement à J+3. Un retard d'un ou deux jours est parfois constaté."
+ },
"accessibility": {
"button_install": "Installer le connecteur",
"button_update": "Mettre à jour votre connexion",
--
GitLab