From 890c008966c80ab0f03677bbfbdf00c9b70b4cce Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Fri, 19 Apr 2024 08:04:41 +0000
Subject: [PATCH] refactor: rename uncoming to upcoming
---
.vscode/settings.json | 1 -
.../__snapshots__/MaxConsumptionCard.spec.tsx.snap | 2 +-
src/components/Charts/Bar.tsx | 2 +-
.../Charts/{UncomingBar.spec.tsx => UpcomingBar.spec.tsx} | 6 +++---
src/components/Charts/{UncomingBar.tsx => UpcomingBar.tsx} | 6 +++---
src/components/Charts/__snapshots__/BarChart.spec.tsx.snap | 2 +-
...{UncomingBar.spec.tsx.snap => UpcomingBar.spec.tsx.snap} | 4 ++--
src/components/Duel/DuelChart/DuelBar.tsx | 4 ++--
src/styles/components/_barchart.scss | 2 +-
9 files changed, 14 insertions(+), 15 deletions(-)
rename src/components/Charts/{UncomingBar.spec.tsx => UpcomingBar.spec.tsx} (84%)
rename src/components/Charts/{UncomingBar.tsx => UpcomingBar.tsx} (95%)
rename src/components/Charts/__snapshots__/{UncomingBar.spec.tsx.snap => UpcomingBar.spec.tsx.snap} (84%)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0107733e3..ffbf33c12 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -149,7 +149,6 @@
"timestep",
"TIMESTEP",
"timesteps",
- "UNCOMING",
"Unstarted",
"UNSTARTED",
"usageevent",
diff --git a/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap b/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap
index c81e97ba9..91030a58f 100644
--- a/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap
+++ b/src/components/Analysis/MaxConsumptionCard/__snapshots__/MaxConsumptionCard.spec.tsx.snap
@@ -318,7 +318,7 @@ exports[`MaxConsumptionCard component should be rendered correctly 1`] = `
</lineargradient>
</defs>
<path
- class="bar-ELECTRICITY bar-UNCOMING disabled bounce-3 delay--2"
+ class="bar-ELECTRICITY bar-UPCOMING disabled bounce-3 delay--2"
d="
M0,4
a4,4 0 0 1 4,-4
diff --git a/src/components/Charts/Bar.tsx b/src/components/Charts/Bar.tsx
index c8cdd159d..0b6ccdb99 100644
--- a/src/components/Charts/Bar.tsx
+++ b/src/components/Charts/Bar.tsx
@@ -129,7 +129,7 @@ const Bar = ({
const selected = isSelectedDate ? 'selected' : ''
const getBarClass = () => {
- const upcoming = dataload.value === -1 ? 'bar-UNCOMING' : ''
+ const upcoming = dataload.value === -1 ? 'bar-UPCOMING' : ''
const edgeBrowser = browser && browser.name !== 'edge'
const bounce = edgeBrowser ? '1' : '3'
diff --git a/src/components/Charts/UncomingBar.spec.tsx b/src/components/Charts/UpcomingBar.spec.tsx
similarity index 84%
rename from src/components/Charts/UncomingBar.spec.tsx
rename to src/components/Charts/UpcomingBar.spec.tsx
index 30f5cb0cc..a84b0d4f2 100644
--- a/src/components/Charts/UncomingBar.spec.tsx
+++ b/src/components/Charts/UpcomingBar.spec.tsx
@@ -3,13 +3,13 @@ import { scaleLinear } from 'd3'
import React from 'react'
import { dataLoadArray } from 'tests/__mocks__/chartData.mock'
import { mockXScale } from 'tests/__mocks__/xScale.mock'
-import UncomingBar from './UncomingBar'
+import UpcomingBar from './UpcomingBar'
-describe('Uncoming component', () => {
+describe('Upcoming component', () => {
it('should match snapshot', () => {
const { container } = render(
<svg>
- <UncomingBar
+ <UpcomingBar
index={0}
average={10}
dataload={dataLoadArray[0]}
diff --git a/src/components/Charts/UncomingBar.tsx b/src/components/Charts/UpcomingBar.tsx
similarity index 95%
rename from src/components/Charts/UncomingBar.tsx
rename to src/components/Charts/UpcomingBar.tsx
index 32dcb3c15..7022e3766 100644
--- a/src/components/Charts/UncomingBar.tsx
+++ b/src/components/Charts/UpcomingBar.tsx
@@ -13,7 +13,7 @@ interface BarProps {
average: number
}
-const UncomingBar = ({
+const UpcomingBar = ({
index,
dataload,
xScale,
@@ -32,7 +32,7 @@ const UncomingBar = ({
animationClass = browser?.name !== 'edge' ? 'bounce-1' : 'bounce-3'
animationClass += ` delay--${index % 13}`
}
- const barClass = `bar-UNCOMING ${animationClass}`
+ const barClass = `bar-UPCOMING ${animationClass}`
const topRoundedRectDashedLine = (
x: number,
@@ -114,4 +114,4 @@ const UncomingBar = ({
)
}
-export default UncomingBar
+export default UpcomingBar
diff --git a/src/components/Charts/__snapshots__/BarChart.spec.tsx.snap b/src/components/Charts/__snapshots__/BarChart.spec.tsx.snap
index f7ffac763..9df650b27 100644
--- a/src/components/Charts/__snapshots__/BarChart.spec.tsx.snap
+++ b/src/components/Charts/__snapshots__/BarChart.spec.tsx.snap
@@ -293,7 +293,7 @@ exports[`BarChart component should render correctly 1`] = `
</lineargradient>
</defs>
<path
- class="bar-ELECTRICITY bar-UNCOMING selected bounce-2 delay"
+ class="bar-ELECTRICITY bar-UPCOMING selected bounce-2 delay"
d="
M0,4
a4,4 0 0 1 4,-4
diff --git a/src/components/Charts/__snapshots__/UncomingBar.spec.tsx.snap b/src/components/Charts/__snapshots__/UpcomingBar.spec.tsx.snap
similarity index 84%
rename from src/components/Charts/__snapshots__/UncomingBar.spec.tsx.snap
rename to src/components/Charts/__snapshots__/UpcomingBar.spec.tsx.snap
index 0b62bbcd9..c54a776a9 100644
--- a/src/components/Charts/__snapshots__/UncomingBar.spec.tsx.snap
+++ b/src/components/Charts/__snapshots__/UpcomingBar.spec.tsx.snap
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`Uncoming component should match snapshot 1`] = `
+exports[`Upcoming component should match snapshot 1`] = `
<div>
<svg>
<g>
@@ -20,7 +20,7 @@ exports[`Uncoming component should match snapshot 1`] = `
transform="translate(undefined, 10)"
>
<path
- class="bar-UNCOMING bounce-1 delay--0"
+ class="bar-UPCOMING bounce-1 delay--0"
d="M0,40v-36 a4,4 0 0 1 4,-4h-5.5a4,4 0 0 1 4,4v36"
fill="url(#gradient)"
stroke="#61f0f2"
diff --git a/src/components/Duel/DuelChart/DuelBar.tsx b/src/components/Duel/DuelChart/DuelBar.tsx
index a23d20f57..d90ebddce 100644
--- a/src/components/Duel/DuelChart/DuelBar.tsx
+++ b/src/components/Duel/DuelChart/DuelBar.tsx
@@ -1,7 +1,7 @@
import AxisBottom from 'components/Charts/AxisBottom'
import AxisRight from 'components/Charts/AxisRight'
import Bar from 'components/Charts/Bar'
-import UncomingBar from 'components/Charts/UncomingBar'
+import UpcomingBar from 'components/Charts/UpcomingBar'
import { scaleBand, ScaleBand, scaleLinear, ScaleLinear } from 'd3-scale'
import { FluidType, TimeStep } from 'enums'
import { DateTime } from 'luxon'
@@ -116,7 +116,7 @@ const DuelBar = ({
)
} else {
return (
- <UncomingBar
+ <UpcomingBar
key={d.date.toISO()}
index={index}
dataload={d}
diff --git a/src/styles/components/_barchart.scss b/src/styles/components/_barchart.scss
index 209e00d3b..16fdf31cd 100644
--- a/src/styles/components/_barchart.scss
+++ b/src/styles/components/_barchart.scss
@@ -127,7 +127,7 @@
}
}
}
-.bar-UNCOMING {
+.bar-UPCOMING {
fill: $grey-dark;
opacity: 0.6;
&.selected {
--
GitLab