Option in Periods Group that allows users to create their own custom periods template #1335
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| import React, { useState, useEffect } from 'react'; | ||
| import Modal from 'react-modal'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import InputString from './InputString'; | ||
|
|
||
| interface InputModalProps { | ||
| isOpen: boolean; | ||
| title: string; | ||
| onClose: () => void; | ||
| onConfirm: (value: string) => void; | ||
| confirmButtonColor?: string; | ||
| confirmButtonLabel?: string; | ||
| closeButtonLabel?: string; | ||
| inputPlaceholder?: string; | ||
| defaultValue?: string; | ||
| maxLength?: number; | ||
| type?: 'text' | 'email' | 'number'; | ||
| pattern?: string; | ||
| autocompleteChoices?: ({ label: string; value: string } | string)[]; | ||
| } | ||
|
|
||
| const InputModal: React.FC<InputModalProps> = ({ | ||
|
Collaborator
There was a problem hiding this comment. Pourquoi un nouveau composant InputModal. Que manquait-il aux autres modal? ça prendrait une explication de pourquoi ce type est nécessaire
Contributor
Author
There was a problem hiding this comment. Lorsqu'on clique sur le bouton Sauvegarder comme modèle, notre idée est de permettre à l’utilisateur de nommer le modèle. Alors, je avais pensé qu’on pourrait créer une fenêtre modale qui combine les fonctionnalités de
|
||
| isOpen, | ||
| title, | ||
| onClose, | ||
| onConfirm, | ||
| confirmButtonColor = 'blue', | ||
| confirmButtonLabel, | ||
| closeButtonLabel, | ||
| defaultValue = '', | ||
| maxLength = 255, | ||
| type = 'text', | ||
| pattern, | ||
| autocompleteChoices = [] | ||
| }) => { | ||
| const { t } = useTranslation('main'); | ||
|
|
||
| const [inputValue, setInputValue] = useState(defaultValue); | ||
| const [isValid, setIsValid] = useState(true); | ||
|
|
||
| useEffect(() => { | ||
| setInputValue(defaultValue as string); | ||
| setIsValid(true); | ||
| }, [isOpen, defaultValue]); | ||
|
|
||
| const handleInputChange = (inputData: { value: any; valid: boolean }) => { | ||
| setInputValue(inputData.value); | ||
| setIsValid(inputData.valid); | ||
| }; | ||
|
|
||
| const handleConfirm = () => { | ||
| if (isValid) { | ||
| onConfirm(inputValue); | ||
| onClose(); | ||
| } | ||
| }; | ||
|
|
||
| const handleCancel = () => { | ||
| onClose(); | ||
| }; | ||
|
|
||
| if (!process.env.IS_TESTING) { | ||
| Modal.setAppElement('#app'); | ||
| } | ||
|
|
||
| return ( | ||
| <Modal | ||
| isOpen={isOpen} | ||
| onRequestClose={handleCancel} | ||
| className="react-modal" | ||
| overlayClassName="react-modal-overlay" | ||
| contentLabel={title} | ||
| > | ||
| <div> | ||
| <div className="center">{title}</div> | ||
|
|
||
| <div className="input-modal-content"> | ||
| <InputString | ||
| id="modal-input" | ||
| onValueUpdated={handleInputChange} | ||
| value={inputValue} | ||
| maxLength={maxLength} | ||
| type={type} | ||
| pattern={pattern} | ||
| autocompleteChoices={autocompleteChoices} | ||
| /> | ||
| {!isValid && <div className="apptr__input-error">{t('PleaseEnterValidValue')}</div>} | ||
| </div> | ||
|
|
||
| <div className={'tr__form-buttons-container _center'}> | ||
| <div className="center"> | ||
| <button | ||
| className={`button ${confirmButtonColor || 'blue'}`} | ||
| onClick={handleConfirm} | ||
| disabled={!isValid} | ||
| > | ||
| {confirmButtonLabel || t('Confirm')} | ||
| </button> | ||
| </div> | ||
| <div className="center"> | ||
| <button className="button grey" onClick={handleCancel}> | ||
| {closeButtonLabel || t('Cancel')} | ||
| </button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </Modal> | ||
| ); | ||
| }; | ||
|
|
||
| export default InputModal; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Est-il nécessaire de faire ce changement dans cette classe de base? Plutôt que dans la classe qui l'utilise? On va généralement privilégier d'attendre d'avoir au moins 2 ou 3 utilisations d'un feature avant de l'emmener dans les classes génériques (sinon, ça devient comme un API et il faut tester/supporter, etc)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
En fait, au départ, j'avais écrit ces fonctions dans le fichier
TransitScheduleEdit.tsxpour changer l'état duInputModalqu'on a créé. Mais en fouillant, j'avais trouvé qu'on avait déjà deux fonctions qui se ressemblait beaucoupopenDeleteConfirmModaletopenBackConfirmModal(idem à pour les fonctions de close). Alors, comme j'avais aussi besoin d'ovrir et de fermer la fenêtre InputModal, je me suis dit que je peux réutiliser ces fonctions de open et de close, avec une petite modification pour qu'elles soient plus génériques.Je peux remettre les fonctions initiales dans TransitScheduleEdit sans problème!