Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manage LG2 for Geography #529

Merged
merged 2 commits into from
Jan 15, 2024
Merged

Manage LG2 for Geography #529

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
037d348
feat: add lg2 field for territory
EmmanuelDemey Sep 28, 2023
48a123a
fix: solve issue when updating lg2 for a new geographie
EmmanuelDemey Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions packages/operations/src/sims/sims-geography-field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ import React, { useState, useCallback } from 'react';
import { CancelButton, SaveButton, ActionToolbar, ErrorBloc } from '@inseefr/wilco';
import ReactSelect from 'react-select';

import D from '../i18n/build-dictionary';
import D, {D1, D2} from '../i18n/build-dictionary';
import {
SimsGeographyI18NLabel,
SimsGeographySelector,
} from 'bauhaus-operations';
import { useGeographies } from './hooks';
import { Stores } from 'bauhaus-utilities';
import { Stores, Row } from 'bauhaus-utilities';

const SimsGeographyField = ({ onCancel, onSave, territory = {}}) => {
const [name, setName] = useState(territory.labelLg1 ?? '');
const [nameLg2, setNameLg2] = useState(territory.labelLg2 ?? '');
const [selectedOption, setSelectedOption] = useState(null);
const [serverSideError, setServerSideError] = useState("");
const [
Expand Down Expand Up @@ -57,17 +58,17 @@ const SimsGeographyField = ({ onCancel, onSave, territory = {}}) => {
const formatted = {
...territory,
labelLg1: name,
labelLg2: nameLg2,
unions: includes.map(i => ({ uri: i.value })),
difference: excludes.map(i => ({ uri: i.value }))
}

const method = formatted.id ?
Stores.Geographies.api.putTerritory(formatted.id, formatted) :
Stores.Geographies.api.postTerritory(formatted);
method.then((uri) => {
onSave(territory.uri ?? uri);
}).catch(err => setServerSideError(D.errors[JSON.parse(err).code]))
}, [territory, name, includes, excludes, onSave]);
}, [territory, name, nameLg2, includes, excludes, onSave]);

return (
<div className="w-100 container">
Expand All @@ -76,18 +77,28 @@ const SimsGeographyField = ({ onCancel, onSave, territory = {}}) => {
<SaveButton action={save} col={3} />
</ActionToolbar>
<ErrorBloc error={serverSideError} />
<div className="row">
<div className={`form-group col-md-12`}>
<label className={`form-label w-100`}>
{D.simsGeographyZoneName}
<Row>
<div className="form-group col-md-6">
<label className="form-label w-100">
{D1.simsGeographyZoneName}
<input
value={name}
className="form-control"
onChange={(e) => setName(e.target.value)}
/>
</label>
</div>
</div>
<div className="form-group col-md-6">
<label className="form-label w-100">
{D2.simsGeographyZoneName}
<input
value={nameLg2}
className="form-control"
onChange={(e) => setNameLg2(e.target.value)}
/>
</label>
</div>
</Row>
<div className="bauhaus-sims-geography-field">
<div className="form-group">
<ReactSelect
Expand Down
Loading