diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx index 4b97b821..adb5b696 100644 --- a/src/pages/Dashboard/AddEvent/AddEvent.jsx +++ b/src/pages/Dashboard/AddEvent/AddEvent.jsx @@ -1924,10 +1924,7 @@ function AddEvent() { case eventFormRequiredFieldNames.LOCATION: publishValidateFields.push('location-form-wrapper'); break; - case eventFormRequiredFieldNames.VIRTUAL_LOCATION: - initialAddedFields = initialAddedFields?.concat(locationType?.fieldNames); - publishValidateFields.push('location-form-wrapper'); - break; + case eventFormRequiredFieldNames.IMAGE: publishValidateFields.push('draggerWrap'); break; diff --git a/src/pages/Dashboard/Settings/MandatoryFields/MandatoryFields.jsx b/src/pages/Dashboard/Settings/MandatoryFields/MandatoryFields.jsx index 26d6c385..58f66f85 100644 --- a/src/pages/Dashboard/Settings/MandatoryFields/MandatoryFields.jsx +++ b/src/pages/Dashboard/Settings/MandatoryFields/MandatoryFields.jsx @@ -38,6 +38,7 @@ function MandatoryFields({ setDirtyStatus, tabKey }) { formLabel: t('dashboard.settings.mandatoryFields.event'), taxonomyClass: entitiesClass.event, // prefilledFields: ['name', 'startDateTime', 'startDate', 'endDateTime', 'endDate', 'locationId'], + hiddenFields: ['VIRTUAL_LOCATION'], }, { formName: 'Place', @@ -78,19 +79,23 @@ function MandatoryFields({ setDirtyStatus, tabKey }) { standardAdminOnlyFields = field?.formFieldProperties?.adminOnlyFields?.standardFields?.map((f) => f?.fieldName) ?? []; - let modifiedField = field?.formFields?.map((f) => { - return { - ...f, - preFilled: minimumRequiredFields.includes(f?.name), - isRequiredField: standardAdminOnlyFields?.includes(f?.name) - ? false - : requiredFields.includes(f?.name) || minimumRequiredFields.includes(f?.name), - isAdminOnlyField: standardAdminOnlyFields?.includes(f?.name) || false, - rule: field?.formFieldProperties?.mandatoryFields?.standardFields?.find( - (standardField) => f?.name === standardField?.fieldName, - )?.rule, - }; - }); + let modifiedField = field?.formFields + ?.map((f) => { + if (preFilled?.hiddenFields?.includes(f?.name)) return null; + else + return { + ...f, + preFilled: minimumRequiredFields.includes(f?.name), + isRequiredField: standardAdminOnlyFields?.includes(f?.name) + ? false + : requiredFields.includes(f?.name) || minimumRequiredFields.includes(f?.name), + isAdminOnlyField: standardAdminOnlyFields?.includes(f?.name) || false, + rule: field?.formFieldProperties?.mandatoryFields?.standardFields?.find( + (standardField) => f?.name === standardField?.fieldName, + )?.rule, + }; + }) + ?.filter((f) => f); modifiedField = modifiedField?.concat( allTaxonomyData?.data ?.filter((f) => f?.taxonomyClass === preFilled?.taxonomyClass && f?.isDynamicField)