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

[MRXN23-604] fixes target/spf values after editing one of them #1662

Merged
merged 2 commits into from
Mar 12, 2024
Merged

[MRXN23-604] fixes target/spf values after editing one of them #1662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27ca4f3
fixes target/spf values after editing one of them
agnlez Mar 11, 2024
5631f79
adds validation for target and spf fields
agnlez Mar 12, 2024
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
16 changes: 11 additions & 5 deletions app/layout/project/sidebar/scenario/grid-setup/features/target-spf/all-targets/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,16 @@ const AllTargetsSelector = ({
type="number"
min={0}
max={100}
step={0.01}
defaultValue={values.target}
value={values.target}
// disabled={!editable}
onChange={({ target: { value: inputValue } }) => {
const numericValue = Number(inputValue);
if (numericValue < 0 || numericValue > 100) return;

setValues((prevValues) => ({
...prevValues,
target: Number(inputValue),
target: numericValue,
}));
}}
onKeyDownCapture={(event) => {
Expand Down Expand Up @@ -75,12 +78,15 @@ const AllTargetsSelector = ({
mode="dashed"
type="number"
defaultValue={values.spf}
// value={inputFPFValue}
// disabled={!editable}
step={0.01}
min={0}
onChange={({ target: { value: inputValue } }) => {
const numericValue = Number(inputValue);
if (numericValue <= 0) return;

setValues((prevValues) => ({
...prevValues,
spf: Number(inputValue),
spf: numericValue,
}));
}}
onKeyDownCapture={(event) => {
Expand Down
2 changes: 1 addition & 1 deletion ...layout/project/sidebar/scenario/grid-setup/features/target-spf/bulk-action-menu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const SplitFeaturesBulkActionMenu = ({
selectedFeatureIds,
onDone,
}: {
features: (Feature & { name: string })[];
features: (Feature & { name: string; marxanSettings: { prop?: number; fpf?: number } })[];
selectedFeatureIds: Feature['id'][];
onDone: () => void;
}): JSX.Element => {
Expand Down
20 changes: 12 additions & 8 deletions ...ct/sidebar/scenario/grid-setup/features/target-spf/bulk-action-menu/modals/edit/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@ export type FormValues = {
spf: number;
};

const INPUT_CLASSES =
'h-10 w-full rounded-md border border-gray-400 px-3 text-gray-900 focus:border-none focus:outline-none focus:ring-1 focus:ring-blue-600';

const EditModal = ({
selectedFeatures,
handleModal,
onDone,
}: {
selectedFeatures: (Feature & { name: string })[];
selectedFeatures: (Feature & { name: string; marxanSettings: { prop?: number; fpf?: number } })[];
handleModal: (modalKey: 'split' | 'edit' | 'delete', isVisible: boolean) => void;
onDone?: () => void;
}): JSX.Element => {
Expand Down Expand Up @@ -178,8 +181,9 @@ const EditModal = ({
return (
<FormRFF<FormValues>
initialValues={{
target: 50,
spf: 1,
target:
(selectedFeatures?.length === 1 && selectedFeatures?.[0]?.marxanSettings?.prop) || 50,
spf: (selectedFeatures?.length === 1 && selectedFeatures?.[0]?.marxanSettings?.fpf) || 1,
}}
ref={formRef}
onSubmit={onEditSubmit}
Expand All @@ -205,10 +209,11 @@ const EditModal = ({
<input
{...fprops.input}
type="number"
className="h-10 w-full rounded-md border border-gray-400 px-3 text-gray-900 focus:border-none focus:outline-none focus:ring-1 focus:ring-blue-600"
className={INPUT_CLASSES}
defaultValue={fprops.input.value}
min={0}
max={100}
step={0.01}
/>
</Field>
)}
Expand All @@ -227,11 +232,10 @@ const EditModal = ({
<input
{...fprops.input}
type="number"
className="h-10 w-full rounded-md border border-gray-400 px-3 text-gray-900 focus:border-none focus:outline-none focus:ring-1 focus:ring-blue-600"
className={INPUT_CLASSES}
defaultValue={fprops.input.value}
min={0}
max={1}
step="0.01"
min={1}
step={0.01}
/>
</Field>
)}
Expand Down
17 changes: 16 additions & 1 deletion app/layout/project/sidebar/scenario/grid-setup/features/target-spf/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChangeEvent, ComponentProps, useCallback, useMemo, useState } from 'react';
import { ChangeEvent, ComponentProps, useCallback, useEffect, useMemo, useState } from 'react';

import { useQueryClient } from 'react-query';

Expand Down Expand Up @@ -418,6 +418,21 @@ const TargetAndSPFFeatures = (): JSX.Element => {
const displayBulkActions = selectedFeatureIds.length > 0;
const displaySaveButton = selectedFeaturesQuery.data?.length > 0;

useEffect(() => {
setFeatureValues((prevValues) => ({
...prevValues,
...selectedFeaturesQuery.data?.reduce((acc, { id, marxanSettings }) => {
return {
...acc,
[id]: {
target: marxanSettings?.prop * 100,
spf: marxanSettings?.fpf,
},
};
}, {}),
}));
}, [selectedFeaturesQuery.data]);

return (
<>
<Section className="relative flex flex-col space-y-4 overflow-hidden">
Expand Down
25 changes: 19 additions & 6 deletions ...ebar/scenario/grid-setup/features/target-spf/targets-spf-table/row-item/details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { useCanEditScenario } from 'hooks/permissions';

import Input from 'components/forms/input';

const INPUT_CLASES = 'w-[55px] rounded-md border-solid border-gray-600 px-0 py-1 text-center';

export const RowDetails = ({ item, onChange }): JSX.Element => {
const { query } = useRouter();
const { pid, sid } = query as { pid: string; sid: string };
Expand All @@ -28,41 +30,52 @@ export const RowDetails = ({ item, onChange }): JSX.Element => {
<div className="flex items-center space-x-2">
<span>Target</span>
<Input
className="w-[55px] rounded-md border-solid border-gray-600 py-1 text-center"
className={INPUT_CLASES}
theme="dark"
mode="dashed"
type="number"
min={0}
max={100}
step={0.01}
defaultValue={values.target}
value={values.target}
disabled={!editable}
onChange={({ target: { value: inputValue } }) => {
const numericValue = Number(inputValue);
if (numericValue < 0 || numericValue > 100) return;

setValues((prevValues) => ({
...prevValues,
target: Number(inputValue),
target: numericValue,
}));

onChange(id, { target: Number(inputValue) });
onChange(id, { target: numericValue });
}}
/>
<span className="text-xs">%</span>
</div>
<div className="flex items-center space-x-2">
<span>SPF</span>
<Input
className="w-[55px] rounded border border-solid py-1 "
className={INPUT_CLASES}
theme="dark"
mode="dashed"
type="number"
step={0.01}
min={0}
defaultValue={values.spf}
value={values.spf}
disabled={!editable}
onChange={({ target: { value: inputValue } }) => {
const numericValue = Number(inputValue);
if (numericValue <= 0) return;

setValues((prevValues) => ({
...prevValues,
spf: Number(inputValue),
spf: numericValue,
}));

onChange(id, { spf: Number(inputValue) });
onChange(id, { spf: numericValue });
}}
/>
</div>
Expand Down
Loading