Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Ecolyo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
LLLE_Project
Ecolyo
Commits
cf6e4f43
Commit
cf6e4f43
authored
Apr 23, 2024
by
Bastien DUMONT
Browse files
Options
Downloads
Patches
Plain Diff
remove prop showRelaunch
parent
b831bdbe
No related branches found
No related tags found
1 merge request
!1165
chore: remove error modal flashing
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx
+5
-10
5 additions, 10 deletions
src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx
src/components/Consumption/ConsumptionView.tsx
+1
-1
1 addition, 1 deletion
src/components/Consumption/ConsumptionView.tsx
with
6 additions
and
11 deletions
src/components/Connection/GRDFConnect/GrdfWaitConsent.tsx
+
5
−
10
View file @
cf6e4f43
...
@@ -9,11 +9,7 @@ import { updateFluidConnection } from 'store/global/global.slice'
...
@@ -9,11 +9,7 @@ import { updateFluidConnection } from 'store/global/global.slice'
import
{
useAppDispatch
,
useAppSelector
}
from
'
store/hooks
'
import
{
useAppDispatch
,
useAppSelector
}
from
'
store/hooks
'
import
'
./GrdfWaitConsent.scss
'
import
'
./GrdfWaitConsent.scss
'
export
const
GrdfWaitConsent
=
({
export
const
GrdfWaitConsent
=
()
=>
{
showRelaunch
,
}:
{
showRelaunch
:
boolean
})
=>
{
const
{
t
}
=
useI18n
()
const
{
t
}
=
useI18n
()
const
dispatch
=
useAppDispatch
()
const
dispatch
=
useAppDispatch
()
const
{
fluidStatus
}
=
useAppSelector
(
state
=>
state
.
ecolyo
.
global
)
const
{
fluidStatus
}
=
useAppSelector
(
state
=>
state
.
ecolyo
.
global
)
...
@@ -62,11 +58,10 @@ export const GrdfWaitConsent = ({
...
@@ -62,11 +58,10 @@ export const GrdfWaitConsent = ({
<
br
/>
<
br
/>
<
span
>
{
t
(
'
auth.grdfgrandlyon.waiting.comeback
'
)
}
</
span
>
<
span
>
{
t
(
'
auth.grdfgrandlyon.waiting.comeback
'
)
}
</
span
>
</
div
>
</
div
>
{
showRelaunch
&&
(
<
Button
className
=
"btnPrimary"
onClick
=
{
updateKonnector
}
>
<
Button
className
=
"btnPrimary"
onClick
=
{
updateKonnector
}
>
{
t
(
'
auth.grdfgrandlyon.waiting.button_done
'
)
}
{
t
(
'
auth.grdfgrandlyon.waiting.button_done
'
)
}
</
Button
>
</
Button
>
)
}
</
div
>
</
div
>
)
)
}
}
This diff is collapsed.
Click to expand it.
src/components/Consumption/ConsumptionView.tsx
+
1
−
1
View file @
cf6e4f43
...
@@ -230,7 +230,7 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
...
@@ -230,7 +230,7 @@ const ConsumptionView = ({ fluidType }: { fluidType: FluidType }) => {
<
FluidButtons
activeFluid
=
{
fluidType
}
key
=
{
updateKey
}
/>
<
FluidButtons
activeFluid
=
{
fluidType
}
key
=
{
updateKey
}
/>
{
isWaitingForConsent
?
(
{
isWaitingForConsent
?
(
<
GrdfWaitConsent
showRelaunch
=
{
true
}
/>
<
GrdfWaitConsent
/>
)
:
(
)
:
(
<>
<>
{
showOfflineData
&&
(
{
showOfflineData
&&
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment