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

fix(web): handling initial values of multiple field #1345

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(web): handling initial values of multiple field #1345

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
16 changes: 16 additions & 0 deletions web/src/components/molecules/Content/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
import { type Dayjs } from "dayjs";

import { User } from "@reearth-cms/components/molecules/AccountSettings/types";
import { Request } from "@reearth-cms/components/molecules/Request/types";
import { FieldType } from "@reearth-cms/components/molecules/Schema/types";

export type ItemStatus = "DRAFT" | "PUBLIC" | "REVIEW" | "PUBLIC_REVIEW" | "PUBLIC_DRAFT";

export type FormValue =
| string
| string[]
| number
| number[]
| boolean
| boolean[]
| Dayjs
| ("" | Dayjs)[]
| null
| undefined;

export type FormGroupValue = Record<string, FormValue>;

export type ItemValue = string | string[] | number | number[] | boolean | boolean[];

export type ItemField = {
Expand Down
8 changes: 4 additions & 4 deletions web/src/components/molecules/Schema/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ export type CorrespondingField = {
};

export type TypeProperty = {
defaultValue?: string | boolean | string[] | boolean[];
defaultValue?: string | string[] | boolean | boolean[] | null;
maxLength?: number;
assetDefaultValue?: string;
selectDefaultValue?: string | string[];
integerDefaultValue?: number;
assetDefaultValue?: string | string[] | null;
selectDefaultValue?: string | string[] | null;
integerDefaultValue?: number | number[] | null;
min?: number;
max?: number;
numberMin?: number;
Expand Down
35 changes: 23 additions & 12 deletions web/src/components/organisms/Project/Content/ContentDetails/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { useLocation, useNavigate, useParams } from "react-router-dom";
import Notification from "@reearth-cms/components/atoms/Notification";
import { User } from "@reearth-cms/components/molecules/AccountSettings/types";
import {
FormValue,
FormGroupValue,
FormItem,
Item,
ItemStatus,
Expand Down Expand Up @@ -366,18 +368,27 @@ export default () => {
);

const valueGet = useCallback((field: Field) => {
let result: FormValue;
switch (field.type) {
case "Select":
return field.typeProperty?.selectDefaultValue;
result = field.typeProperty?.selectDefaultValue;
break;
case "Integer":
return field.typeProperty?.integerDefaultValue;
result = field.typeProperty?.integerDefaultValue;
break;
case "Asset":
return field.typeProperty?.assetDefaultValue;
result = field.typeProperty?.assetDefaultValue;
break;
case "Date":
return dateConvert(field.typeProperty?.defaultValue);
result = dateConvert(field.typeProperty?.defaultValue);
break;
default:
return field.typeProperty?.defaultValue;
result = field.typeProperty?.defaultValue;
}
if (field.multiple && !result) {
result = [];
}
return result;
}, []);

const updateValueConvert = useCallback(({ type, value }: ItemField) => {
Expand All @@ -394,18 +405,18 @@ export default () => {
}
}, []);

// eslint-disable-next-line @typescript-eslint/no-explicit-any
const [initialFormValues, setInitialFormValues] = useState<Record<string, any>>({});
const [initialFormValues, setInitialFormValues] = useState<
Record<string, FormValue | FormGroupValue>
>({});

useEffect(() => {
if (itemLoading) return;
const handleInitialValuesSet = async () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const initialValues: Record<string, any> = {};
const initialValues: Record<string, FormValue | FormGroupValue> = {};
const groupInitialValuesUpdate = (group: Group, itemGroupId: string) => {
group?.schema?.fields?.forEach(field => {
initialValues[field.id] = {
...initialValues[field.id],
...(initialValues[field.id] as FormGroupValue),
...{ [itemGroupId]: valueGet(field) },
};
});
Expand All @@ -415,7 +426,7 @@ export default () => {
currentItem?.fields?.forEach(field => {
if (field.itemGroupId) {
initialValues[field.schemaFieldId] = {
...initialValues[field.schemaFieldId],
...(initialValues[field.schemaFieldId] as FormGroupValue),
...{ [field.itemGroupId]: updateValueConvert(field) },
};
} else {
Expand Down Expand Up @@ -549,7 +560,7 @@ export default () => {
const handleCheckItemReference = useCallback(
async (itemId: string, correspondingFieldId: string, groupId?: string) => {
const initialValue = groupId
? initialFormValues[groupId][correspondingFieldId]
? (initialFormValues[groupId] as FormGroupValue)[correspondingFieldId]
: initialFormValues[correspondingFieldId];
if (initialValue === itemId) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/organisms/Project/Content/ContentDetails/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import dayjs from "dayjs";

import { ItemValue } from "@reearth-cms/components/molecules/Content/types";

export function dateConvert(value?: ItemValue) {
export function dateConvert(value?: ItemValue | null) {
if (Array.isArray(value)) {
return (value as string[]).map(valueItem => (valueItem ? dayjs(valueItem) : ""));
} else {
Expand Down
Loading