fix: erros for Create guilds

This commit is contained in:
2026-02-01 15:01:58 +03:30
parent cf11b64d8e
commit 74ba1dddb6
9 changed files with 105 additions and 144 deletions

View File

@@ -130,21 +130,23 @@ export const CreateGuilds = ({ guild, updateTable }) => {
hasInquiry
);
});
dispatch(updateGuildByNationalIdNewService(guildsDataArray)).then(
(result) => {
if (result.payload.error) {
handleSubmitError(openNotif, result.payload.error);
} else {
handleSubmitSuccess(
dispatch,
openNotif,
updateTable,
values,
result.payload?.data
);
}
}
);
console.log(guildsDataArray);
// dispatch(updateGuildByNationalIdNewService(guildsDataArray)).then(
// (result) => {
// if (result.payload.error) {
// handleSubmitError(openNotif, result.payload.error);
// } else {
// handleSubmitSuccess(
// dispatch,
// openNotif,
// updateTable,
// values,
// result.payload?.data
// );
// }
// }
// );
},
});
@@ -183,6 +185,7 @@ export const CreateGuilds = ({ guild, updateTable }) => {
return {
steward: initialValues.steward || false,
guild: initialValues.guild || false,
license_number: initialValues.license_number ?? "",
};
});
formik.setFieldValue("guilds", guildsForFormik, false).then(() => {
@@ -266,20 +269,11 @@ export const CreateGuilds = ({ guild, updateTable }) => {
});
setGuildsFormValues(initialGuildValues);
// Update Formik's guilds array for validation
const guildsForFormik = guildsData.map((guildItem) => ({
steward:
typeof guildItem?.steward === "boolean"
? guildItem.steward
: typeof guildItem?.isSteward === "boolean"
? guildItem.isSteward
: false,
guild:
typeof guildItem?.guild === "boolean"
? guildItem.guild
: typeof guildItem?.isGuild === "boolean"
? guildItem.isGuild
: false,
// Update Formik's guilds array for validation (include validated fields)
const guildsForFormik = initialGuildValues.map((g) => ({
steward: g.steward ?? false,
guild: g.guild ?? false,
license_number: g.license_number ?? "",
}));
formik.setFieldValue("guilds", guildsForFormik, true).then(() => {
formik.validateField("guilds");
@@ -563,8 +557,12 @@ export const CreateGuilds = ({ guild, updateTable }) => {
return newValues;
});
// Sync with Formik's guilds array for steward and guild fields
if (fieldName === "steward" || fieldName === "guild") {
// Sync validated guild fields to Formik's guilds array (schema: license_number, steward, guild)
if (
fieldName === "steward" ||
fieldName === "guild" ||
fieldName === "license_number"
) {
const currentGuilds = formik.values.guilds || [];
const updatedGuilds = [...currentGuilds];
if (!updatedGuilds[index]) {
@@ -683,6 +681,7 @@ export const CreateGuilds = ({ guild, updateTable }) => {
onGuildValuesChange={handleGuildValuesChange}
expanded={expandedAccordion === index}
onChange={handleAccordionChange(index)}
mainFormik={formik}
/>
</Box>
))}