From a1a5abf8cec7bdb3da67ff450d8ccab44684520e Mon Sep 17 00:00:00 2001
From: Guilhem CARRON <gcarron@grandlyon.com>
Date: Wed, 15 Dec 2021 08:43:46 +0000
Subject: [PATCH] fix(partnersInfo): Remove message from partnersInfo
---
src/components/PartnersInfo/PartnersInfo.tsx | 116 +++++++-----------
src/components/PartnersInfo/partnersInfo.scss | 13 +-
src/models/partnersInfo.model.ts | 1 -
src/services/partnersInfo.service.ts | 1 -
4 files changed, 53 insertions(+), 78 deletions(-)
diff --git a/src/components/PartnersInfo/PartnersInfo.tsx b/src/components/PartnersInfo/PartnersInfo.tsx
index 1656dc2e..0988b3d7 100644
--- a/src/components/PartnersInfo/PartnersInfo.tsx
+++ b/src/components/PartnersInfo/PartnersInfo.tsx
@@ -1,6 +1,4 @@
import React, { useCallback, useContext, useEffect, useState } from 'react'
-import { convertStringToEditorState } from '../../utils/editorStateManagment'
-import CustomEditor from '../Editing/CustomEditor'
import { IPartnersInfo } from '../../models/partnersInfo.model'
import 'react-draft-wysiwyg/dist/react-draft-wysiwyg.css'
import './partnersInfo.scss'
@@ -13,7 +11,6 @@ const PartnersInfo: React.FC = () => {
const [refreshData, setRefreshData] = useState(false)
const [isLoading, setIsLoading] = useState<boolean>(false)
const [partnersInfo, setPartnersInfo] = useState<IPartnersInfo>({
- message: '',
grdf_failure: false,
enedis_failure: false,
egl_failure: false,
@@ -21,13 +18,6 @@ const PartnersInfo: React.FC = () => {
})
const { user }: Partial<UserContextProps> = useContext(UserContext)
- const handleEditorChange = (value: string): void => {
- setPartnersInfo((prevPartnersInfo) => ({
- ...prevPartnersInfo,
- message: value,
- }))
- }
-
const handleCheckboxChange = (value: boolean, type: CheckboxType): void => {
switch (type) {
case CheckboxType.GRDF:
@@ -65,7 +55,6 @@ const PartnersInfo: React.FC = () => {
const resetFields = useCallback(() => {
setPartnersInfo({
- message: '',
grdf_failure: false,
enedis_failure: false,
egl_failure: false,
@@ -85,7 +74,6 @@ const PartnersInfo: React.FC = () => {
await partnersInfoService.getPartnersInfo()
if (partnersInfoResp) {
setPartnersInfo({
- message: partnersInfoResp.message,
grdf_failure: partnersInfoResp.grdf_failure,
enedis_failure: partnersInfoResp.enedis_failure,
egl_failure: partnersInfoResp.egl_failure,
@@ -119,6 +107,7 @@ const PartnersInfo: React.FC = () => {
<div className="partnersInfo">
<h2>État des services des partenaires</h2>
<div>
+ <p className="title">Affichage de la pop-up dans Ecolyo</p>
<div className="switch_div">
Pop-up active
<input
@@ -134,65 +123,52 @@ const PartnersInfo: React.FC = () => {
/>
<label htmlFor="switch_notification"></label>
</div>
-
- <p className="title">Message de la pop-up</p>
- <CustomEditor
- baseState={convertStringToEditorState(partnersInfo.message)}
- handleChange={handleEditorChange}
- editorType="info"
- />
- <p className="title">État des services</p>
-
- <div>
- <div className="switch_div">
- Panne GRDF
- <input
- type="checkbox"
- id="switch_grdf"
- onChange={(event) => {
- handleCheckboxChange(
- event.currentTarget.checked,
- CheckboxType.GRDF
- )
- }}
- checked={partnersInfo.grdf_failure}
- />
- <label htmlFor="switch_grdf"></label>
- </div>
-
- <div className="switch_div">
- Panne Enedis
- <input
- type="checkbox"
- id="switch_enedis"
- onChange={(event) => {
- handleCheckboxChange(
- event.currentTarget.checked,
- CheckboxType.ENEDIS
- )
- }}
- checked={partnersInfo.enedis_failure}
- />
- <label htmlFor="switch_enedis"></label>
- </div>
-
- <div className="switch_div">
- Panne EGL
- <input
- type="checkbox"
- id="switch_egl"
- onChange={(event) => {
- handleCheckboxChange(
- event.currentTarget.checked,
- CheckboxType.EGL
- )
- }}
- checked={partnersInfo.egl_failure}
- />
- <label htmlFor="switch_egl"></label>
- </div>
+ <p className="title">Services concernés</p>
+ <div className="switch_div">
+ Panne Enedis
+ <input
+ type="checkbox"
+ id="switch_enedis"
+ onChange={(event) => {
+ handleCheckboxChange(
+ event.currentTarget.checked,
+ CheckboxType.ENEDIS
+ )
+ }}
+ checked={partnersInfo.enedis_failure}
+ />
+ <label htmlFor="switch_enedis"></label>
+ </div>
+ <div className="switch_div">
+ Panne EGL
+ <input
+ type="checkbox"
+ id="switch_egl"
+ onChange={(event) => {
+ handleCheckboxChange(
+ event.currentTarget.checked,
+ CheckboxType.EGL
+ )
+ }}
+ checked={partnersInfo.egl_failure}
+ />
+ <label htmlFor="switch_egl"></label>
+ </div>
+ <div className="switch_div">
+ Panne GRDF
+ <input
+ type="checkbox"
+ id="switch_grdf"
+ onChange={(event) => {
+ handleCheckboxChange(
+ event.currentTarget.checked,
+ CheckboxType.GRDF
+ )
+ }}
+ checked={partnersInfo.grdf_failure}
+ />
+ <label htmlFor="switch_grdf"></label>
</div>
-
<div className="buttons">
<button className="btnCancel" onClick={handleCancel}>
Annuler
diff --git a/src/components/PartnersInfo/partnersInfo.scss b/src/components/PartnersInfo/partnersInfo.scss
index c6cdb63f..27de6e11 100644
--- a/src/components/PartnersInfo/partnersInfo.scss
+++ b/src/components/PartnersInfo/partnersInfo.scss
@@ -10,6 +10,7 @@
.switch_div {
display: inline-block;
padding: 1rem 1rem;
+ min-width: 135px;
}
input[type='checkbox'] {
@@ -21,8 +22,8 @@
label {
display: block;
- width: 80px;
- height: 30px;
+ width: 50px;
+ height: 20px;
background-color: grey;
border-radius: 15px;
position: relative;
@@ -33,13 +34,13 @@
label::after {
content: '';
- width: 24px;
- height: 24px;
+ width: 17px;
+ height: 17px;
background-color: #e8f5f7;
position: absolute;
border-radius: 13px;
- top: 3px;
- left: 3px;
+ top: 2px;
+ left: 2px;
transition: 0.5s;
}
diff --git a/src/models/partnersInfo.model.ts b/src/models/partnersInfo.model.ts
index 91080b12..3d073d3e 100644
--- a/src/models/partnersInfo.model.ts
+++ b/src/models/partnersInfo.model.ts
@@ -1,5 +1,4 @@
export interface IPartnersInfo {
- message: string
grdf_failure: boolean
enedis_failure: boolean
egl_failure: boolean
diff --git a/src/services/partnersInfo.service.ts b/src/services/partnersInfo.service.ts
index 75245731..0b930759 100644
--- a/src/services/partnersInfo.service.ts
+++ b/src/services/partnersInfo.service.ts
@@ -15,7 +15,6 @@ export class PartnersInfoService {
await axios.put(
`/api/admin/partnersInfo`,
{
- message: partnersInfo.message,
grdf_failure: partnersInfo.grdf_failure,
enedis_failure: partnersInfo.enedis_failure,
egl_failure: partnersInfo.egl_failure,
--
GitLab