Skip to content

Lihlumise/shesha forms #4602

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

Merged
IvanIlyichev merged 3 commits into from
Mar 16, 2026
Merged

Lihlumise/shesha forms #4602

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35faf6b
fix: footerButtons takes precedence over legacy showModalFooter in Dy…
Lihlu Mar 16, 2026
879f85c
fix: update form configs
Lihlu Mar 16, 2026
5beb8fe
fix: remove globalState from form configuration
Lihlu Mar 16, 2026
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
Binary file added shesha-core/src/Shesha.Application/ConfigMigrations/package20260316_1404.shaconfig
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions shesha-core/src/Shesha.Application/Shesha.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
<None Remove="ConfigMigrations\package20260310_1617.shaconfig" />
<None Remove="ConfigMigrations\package20260311_1518.shaconfig" />
<None Remove="ConfigMigrations\package20260312_1234.shaconfig" />
<None Remove="ConfigMigrations\package20260316_1404.shaconfig" />
<None Remove="Excel\template.xlsx" />
<None Remove="ConfigMigrations\package20230324_1835.shaconfig" />
<None Remove="ConfigMigrations\package20230411_1238.shaconfig" />
Expand All @@ -145,6 +146,7 @@
<EmbeddedResource Include="ConfigMigrations\package20260310_1617.shaconfig" />
<EmbeddedResource Include="ConfigMigrations\package20260311_1518.shaconfig" />
<EmbeddedResource Include="ConfigMigrations\package20260312_1234.shaconfig" />
<EmbeddedResource Include="ConfigMigrations\package20260316_1404.shaconfig" />
<EmbeddedResource Include="Excel\template.xlsx" />
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion shesha-reactjs/src/components/dynamicModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ export const DynamicModalWithForm: FC<IDynamicModalWithFormProps> = (props) => {
const [isSubmitted, setIsSubmitted] = useState<boolean>(false);

// `showModalFooter` for now is for backward compatibility
const showDefaultSubmitButtons = showModalFooter || footerButtons === 'default';
// If `footerButtons` is explicitly set, it takes precedence over the legacy `showModalFooter` flag
const showDefaultSubmitButtons = footerButtons ? footerButtons === 'default' : (showModalFooter ?? false);

const closeModal = (): void => {
removeModal(id);
Expand Down
Loading