Maps Update: Cards and Modals for Maps Components #1314
+1,636
−2,822
There are no files selected for viewing
This file contains 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 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,82 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| import * as React from 'react'; | ||
| import { useState } from 'react'; | ||
| import { FormattedMessage } from 'react-intl'; | ||
| import { Button, Modal, ModalHeader, ModalBody, ModalFooter, Form, FormGroup, Label, Input } from 'reactstrap'; | ||
| import { Link } from 'react-router-dom'; | ||
|
|
||
| interface CreateMapModalProps { | ||
| show: boolean; | ||
| handleClose: () => void; | ||
| createNewMap: () => void; | ||
| } | ||
|
|
||
| /** | ||
| * Defines the create map modal form | ||
| * @param root0 | ||
huss marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * @param root0.show | ||
| * @param root0.handleClose | ||
| * @param root0.createNewMap | ||
| * @returns Map create element | ||
| */ | ||
| function CreateMapModalComponent({ show, handleClose, createNewMap }: CreateMapModalProps) { | ||
|
There was a problem hiding this comment. Other create modals do not pass props. Are these essential or does a change need to happen (maybe outside this PR)? There was a problem hiding this comment. This will be future work, I have left a TODO note. |
||
| // TODO: Get rid of props, migrate to RTK, finish modal | ||
| // Once modal is finished, it will be used in MapsDetailComponent | ||
| const [nameInput, setNameInput] = useState(''); | ||
| const [noteInput, setNoteInput] = useState(''); | ||
|
|
||
| const handleCreate = () => { | ||
| // TODO: Implement create functionality | ||
| createNewMap(); | ||
| handleClose(); | ||
| }; | ||
|
|
||
| return ( | ||
| <Modal isOpen={show} toggle={handleClose}> | ||
| <ModalHeader toggle={handleClose}> | ||
| <FormattedMessage id="create.map" /> | ||
| </ModalHeader> | ||
| <ModalBody> | ||
| <Form> | ||
| <FormGroup> | ||
| <Label for="mapName"><FormattedMessage id="map.name" /></Label> | ||
| <Input | ||
| id="mapName" | ||
| value={nameInput} | ||
| onChange={e => setNameInput(e.target.value)} | ||
| /> | ||
| </FormGroup> | ||
| <FormGroup> | ||
| <Label for="mapNote"><FormattedMessage id="note" /></Label> | ||
| <Input | ||
| id="mapNote" | ||
| type="textarea" | ||
| value={noteInput} | ||
| onChange={e => setNoteInput(e.target.value)} | ||
| /> | ||
| </FormGroup> | ||
| </Form> | ||
| <div> | ||
| <Link to='/calibration' onClick={() => createNewMap()}> | ||
| <Button color='primary'> | ||
| <FormattedMessage id='map.upload.file' /> | ||
| </Button> | ||
| </Link> | ||
| </div> | ||
| </ModalBody> | ||
| <ModalFooter> | ||
| <Button color="secondary" onClick={handleClose}> | ||
| <FormattedMessage id="cancel" /> | ||
| </Button> | ||
| <Button color="primary" onClick={handleCreate}> | ||
| <FormattedMessage id="create" /> | ||
| </Button> | ||
| </ModalFooter> | ||
| </Modal> | ||
| ); | ||
| } | ||
|
|
||
| export default CreateMapModalComponent; | ||
This file contains 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,160 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| import * as React from 'react'; | ||
| import { useState } from 'react'; | ||
| import { FormattedMessage, useIntl } from 'react-intl'; | ||
| import { Button, Modal, ModalHeader, ModalBody, ModalFooter, Form, FormGroup, Label, Input } from 'reactstrap'; | ||
| import { CalibrationModeTypes, MapMetadata } from '../../types/redux/map'; | ||
| import { editMapDetails, submitEditedMap, removeMap, setCalibration } from '../../redux/actions/map'; | ||
| import { showErrorNotification } from '../../utils/notifications'; | ||
| import { useAppDispatch } from '../../redux/reduxHooks'; | ||
| import { AppDispatch } from 'store'; | ||
ChrisMart21 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| interface EditMapModalProps { | ||
| map: MapMetadata; | ||
| } | ||
|
|
||
| // TODO: Migrate to RTK | ||
| const EditMapModalComponent: React.FC<EditMapModalProps> = ({ map }) => { | ||
| const [showModal, setShowModal] = useState(false); | ||
| const handleShow = () => setShowModal(true); | ||
| const handleClose = () => setShowModal(false); | ||
| const dispatch: AppDispatch = useAppDispatch(); | ||
|
There was a problem hiding this comment. Note for future to move to newer way. Similar to another comment. |
||
| const [nameInput, setNameInput] = useState(map.name); | ||
|
There was a problem hiding this comment. I'm unclear on why the note could be empty if this is editing an existing note. Can the note be null or something? |
||
| const [noteInput, setNoteInput] = useState(map.note || ''); | ||
| const [circleInput, setCircleInput] = useState(map.circleSize.toString()); | ||
| const [displayable, setDisplayable] = useState(map.displayable); | ||
|
|
||
| const intl = useIntl(); | ||
|
|
||
| const handleSave = () => { | ||
| const updatedMap = { | ||
| ...map, | ||
| name: nameInput, | ||
| note: noteInput, | ||
| circleSize: parseFloat(circleInput), | ||
| displayable: displayable | ||
| }; | ||
| dispatch(editMapDetails(updatedMap)); | ||
| dispatch(submitEditedMap(updatedMap.id)); | ||
| handleClose(); | ||
| }; | ||
|
|
||
| const handleDelete = () => { | ||
|
There was a problem hiding this comment. This is not being done as is the case, for example, with unit. It should be the same. |
||
| const consent = window.confirm(intl.formatMessage({ id: 'map.confirm.remove' }, { name: map.name })); | ||
| if (consent) { | ||
| dispatch(removeMap(map.id)); | ||
| handleClose(); | ||
| } | ||
| }; | ||
|
|
||
|
There was a problem hiding this comment. Maybe for future TODO and in issue. Most modals use centralized functions for changes and not one for each item. This means you don't dispatch changes until save. |
||
| const handleCalibrationSetting = (mode: CalibrationModeTypes) => { | ||
| dispatch(setCalibration(mode, map.id)); | ||
| handleClose(); | ||
| }; | ||
|
|
||
| const toggleCircleEdit = () => { | ||
|
There was a problem hiding this comment. This sort of check is now done with input checks on the form in other modals. |
||
| const regtest = /^\d+(\.\d+)?$/; | ||
| if (regtest.test(circleInput) && parseFloat(circleInput) <= 2.0) { | ||
| setCircleInput(circleInput); | ||
| } else { | ||
| showErrorNotification(intl.formatMessage({ id: 'invalid.number' })); | ||
| } | ||
| }; | ||
|
|
||
| return ( | ||
| <> | ||
| <div className="edit-btn"> | ||
| <Button color='secondary' onClick={handleShow}> | ||
| <FormattedMessage id="edit.map" /> | ||
| </Button> | ||
| </div> | ||
| <Modal isOpen={showModal} toggle={handleClose}> | ||
| <ModalHeader toggle={handleClose}> | ||
| <FormattedMessage id="edit.map" /> | ||
| </ModalHeader> | ||
| <ModalBody> | ||
| <Form> | ||
| <FormGroup> | ||
| <Label for="mapName"><FormattedMessage id="map.name" /></Label> | ||
| <Input | ||
| id="mapName" | ||
| value={nameInput} | ||
| onChange={e => setNameInput(e.target.value)} | ||
| /> | ||
| </FormGroup> | ||
| <FormGroup> | ||
| <Label for='map.displayable'><FormattedMessage id='map.displayable' /></Label> | ||
| <Input | ||
| id="mapDisplayable" | ||
| type="select" | ||
| value={displayable.toString()} | ||
| onChange={e => setDisplayable(e.target.value === 'true')} | ||
| > | ||
| <option value="true">{intl.formatMessage({ id: 'map.is.displayable' })}</option> | ||
| <option value="false">{intl.formatMessage({ id: 'map.is.not.displayable' })}</option> | ||
| </Input> | ||
| </FormGroup> | ||
| <FormGroup> | ||
| <Label for="mapCircleSize"><FormattedMessage id="map.circle.size" /></Label> | ||
| <Input | ||
| id="mapCircleSize" | ||
| type='number' | ||
| value={circleInput} | ||
| onChange={e => setCircleInput(e.target.value)} | ||
| invalid={parseFloat(circleInput) < 0} | ||
| onBlur={toggleCircleEdit} | ||
| /> | ||
| </FormGroup> | ||
| <FormGroup> | ||
| <Label for="mapNote"><FormattedMessage id="note" /></Label> | ||
| <Input | ||
| id="mapNote" | ||
| type="textarea" | ||
| value={noteInput} | ||
| onChange={e => setNoteInput(e.target.value.slice(0, 30))} | ||
| /> | ||
| </FormGroup> | ||
| </Form> | ||
| <div> | ||
| <Label><FormattedMessage id="map.filename" /></Label> | ||
| <Input | ||
| id='mapFilename' | ||
| name='mapFilename' | ||
| type='text' | ||
| defaultValue={map.filename} | ||
| disabled> | ||
| </Input> | ||
| <Button color='primary' onClick={() => handleCalibrationSetting(CalibrationModeTypes.initiate)}> | ||
| <FormattedMessage id='map.upload.new.file' /> | ||
juanjoseguva marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </Button> | ||
| </div> | ||
| <div> | ||
| <Label><FormattedMessage id="map.calibration" /></Label> | ||
| <p> | ||
| <FormattedMessage id={map.origin && map.opposite ? 'map.is.calibrated' : 'map.is.not.calibrated'} /> | ||
| </p> | ||
| <Button color='primary' onClick={() => handleCalibrationSetting(CalibrationModeTypes.calibrate)}> | ||
| <FormattedMessage id='map.calibrate' /> | ||
| </Button> | ||
| </div> | ||
| </ModalBody> | ||
| <ModalFooter> | ||
| <Button color="danger" onClick={handleDelete}> | ||
| <FormattedMessage id="delete.map" /> | ||
| </Button> | ||
| <Button color="secondary" onClick={handleClose}> | ||
| <FormattedMessage id="cancel" /> | ||
| </Button> | ||
| <Button color="primary" onClick={handleSave}> | ||
| <FormattedMessage id="save.all" /> | ||
| </Button> | ||
| </ModalFooter> | ||
| </Modal> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default EditMapModalComponent; | ||
This file contains 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.
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.
I'm unclear as what this file is used for. When I click create map it goes to the old page. I cannot find it used anywhere. Is it for the future, unneeded or am I missing something? If it is future then a clear TODO/comment is needed.
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.
This is work for the future, as there was not enough time to finish it given our time constraints. I have left TODOs throughout the necessary pieces of code.