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

Jump to bottom

fix: using use form to make the code a bit cleaner #19

Merged
merged 1 commit into from
Dec 11, 2023
Merged

fix: using use form to make the code a bit cleaner #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion apps/web/components/map/panels/toolbox/Toolbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ const ToolboxPanel = () => {
setDefaultRoute={setDefaultRoute}
/>
}
disablePadding
/>
);
};

export default ToolboxPanel;
export default ToolboxPanel;
58 changes: 37 additions & 21 deletions apps/web/components/map/panels/toolbox/tools/InputLayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,27 @@ import { useProjectLayers } from "@/lib/api/projects";
import { useParams } from "next/navigation";

import type { SelectChangeEvent } from "@mui/material";
import type { UseFormGetValues, UseFormRegister } from "react-hook-form";
import type { PostJoin, PostAggregate } from "@/lib/validations/tools";

interface PickLayerProps {
register: UseFormRegister<PostJoin> | UseFormRegister<PostAggregate>;
getValues: UseFormGetValues<PostJoin> | UseFormGetValues<PostAggregate>;
multiple?: boolean;
inputValues: string | string[];
setInputValues: (value: string | string[]) => void;
layerTypes: string[];
// inputValues: string | string[];
// setInputValues: (value: string | string[]) => void;
// layerTypes: string[];
}

const InputLayer = (props: PickLayerProps) => {
const { multiple = false, inputValues, setInputValues, layerTypes } = props;
const {
register,
// getValues,
multiple = false,
// inputValues,
// setInputValues,
// layerTypes
} = props;

const theme = useTheme();
const { t } = useTranslation("maps");
Expand All @@ -34,16 +45,17 @@ const InputLayer = (props: PickLayerProps) => {
typeof projectId === "string" ? projectId : "",
);

const handleSingleChange = (event: SelectChangeEvent) => {
setInputValues(event.target.value as string);
const handleSingleChange = (_: SelectChangeEvent) => {
// setInputValues(event.target.value as string);
};

const handleMultipleChange = (event: SelectChangeEvent, inputNr: number) => {
const multipleValues =
typeof inputValues !== "string" ? [...inputValues] : ["", ""];
multipleValues[inputNr] = event.target.value as string;
const handleMultipleChange = (_: SelectChangeEvent, inputNr: number) => {
console.log(inputNr);
// const multipleValues =
// typeof inputValues !== "string" ? [...inputValues] : ["", ""];
// multipleValues[inputNr] = event.target.value as string;

setInputValues(multipleValues);
// setInputValues(multipleValues);
};

return (
Expand All @@ -68,7 +80,8 @@ const InputLayer = (props: PickLayerProps) => {
</InputLabel>
<Select
label={t("panels.tools.select_layer")}
value={inputValues[0]}
// value={inputValues[0]}
{...register("")}
onChange={(event: SelectChangeEvent) =>
handleMultipleChange(event, 0)
}
Expand Down Expand Up @@ -140,16 +153,19 @@ const InputLayer = (props: PickLayerProps) => {
</InputLabel>
<Select
label={t("panels.tools.select_layer")}
value={inputValues}
// value={inputValues}
{...register("")}
onChange={handleSingleChange}
>
{projectLayers ? projectLayers.map((layer) =>
layerTypes.includes(layer.feature_layer_geometry_type) ? (
<MenuItem value={layer.layer_id} key={v4()}>
{layer.name}
</MenuItem>
) : null,
) : null}
{projectLayers
? projectLayers.map((layer) =>
layerTypes.includes(layer.feature_layer_geometry_type) ? (
<MenuItem value={layer.layer_id} key={v4()}>
{layer.name}
</MenuItem>
) : null,
)
: null}
</Select>
</FormControl>
</Box>
Expand All @@ -158,4 +174,4 @@ const InputLayer = (props: PickLayerProps) => {
);
};

export default InputLayer;
export default InputLayer;
37 changes: 22 additions & 15 deletions apps/web/components/map/panels/toolbox/tools/SaveResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,33 @@ import { v4 } from "uuid";
import { useTranslation } from "@/i18n/client";
import { useGetUniqueLayerName } from "@/hooks/map/ToolsHooks";

import type { SelectChangeEvent } from "@mui/material";
// import type { SelectChangeEvent } from "@mui/material";
import type { UseFormRegister } from "react-hook-form";
import type { PostAggregate, PostJoin } from "@/lib/validations/tools";
import type { PostIsochrone } from "@/lib/validations/isochrone";

interface SaveResultProps {
outputName: string | undefined;
setOutputName: (value: string) => void;
folderSaveId: string | undefined;
setFolderSaveID: (value: string) => void;
register: UseFormRegister<PostJoin> | UseFormRegister<PostAggregate> | UseFormRegister<PostIsochrone>;
watch: PostJoin | PostAggregate | PostIsochrone;
// outputName: string | undefined;
// setOutputName: (value: string) => void;
// folderSaveId: string | undefined;
// setFolderSaveID: (value: string) => void;
}

const SaveResult = (props: SaveResultProps) => {
const { outputName, setOutputName, folderSaveId, setFolderSaveID } = props;
const {
register,
watch,
} = props;


const theme = useTheme();
const { t } = useTranslation("maps");

const { folders } = useFolders();

const { uniqueName } = useGetUniqueLayerName(outputName ? outputName : "");
const { uniqueName } = useGetUniqueLayerName(watch.result_target.layer_name ? watch.result_target.layer_name : "");

return (
<Box display="flex" flexDirection="column" gap={theme.spacing(2)}>
Expand Down Expand Up @@ -93,9 +102,10 @@ const SaveResult = (props: SaveResultProps) => {
value={uniqueName ? uniqueName : ""}
label="Name"
size="small"
onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
setOutputName(event.target.value as string)
}
{...register("result_target.layer_name")}
// onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
// setOutputName(event.target.value as string)
// }
/>
</Box>
<Typography variant="body1" sx={{ color: "black" }}>
Expand All @@ -108,10 +118,7 @@ const SaveResult = (props: SaveResultProps) => {
</InputLabel>
<Select
label={t("panels.tools.select_option")}
value={folderSaveId}
onChange={(event: SelectChangeEvent) =>
setFolderSaveID(event.target.value as string)
}
{...register("result_target.folder_id")}
>
{folders
? folders.map((folder) => (
Expand All @@ -127,4 +134,4 @@ const SaveResult = (props: SaveResultProps) => {
);
};

export default SaveResult;
export default SaveResult;
Loading
Loading