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

JNG-5836 No confirmation dialog before parameter opener button #447

Merged
merged 2 commits into from
Aug 5, 2024
Merged

JNG-5836 No confirmation dialog before parameter opener button #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09b4eac
no confirmation dialog before parameter opener button
gaborflorian Aug 5, 2024
af25cd0
Merge branch 'develop' into feature/JNG-5836_no_confirmation_before_p…
gaborflorian Aug 5, 2024
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
4 changes: 3 additions & 1 deletion judo-ui-react/src/main/resources/actor/src/containers/dialog.tsx.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,9 @@ export default function {{ containerComponentName container }}Dialog({{# unless
}
{{/ if }}
onClick={ async () => {
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{# unless (isParameterOpenerButton button) }}
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{/ unless }}
{{# if button.actionDefinition.isDeleteAction }}
actions.{{ simpleActionDefinitionName actionDefinition }}!();
{{ else }}
Expand Down
4 changes: 3 additions & 1 deletion judo-ui-react/src/main/resources/actor/src/containers/page.tsx.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ export default function {{ containerComponentName container }}Page ({{# unless (
disabled={ {{{ containerButtonGroupButtonDisabledConditions button container }}} }
{{/ if }}
onClick={ async () => {
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{# unless (isParameterOpenerButton button) }}
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{/ unless }}
{{# if button.actionDefinition.isDeleteAction }}
actions.{{ simpleActionDefinitionName actionDefinition }}!();
{{ else }}
Expand Down
4 changes: 3 additions & 1 deletion judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/button.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
loadingPosition="start"
{{/ if }}
onClick={ async () => {
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=child dataParam='data' }}
{{# unless (isParameterOpenerButton child) }}
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=child dataParam='data' }}
{{/ unless }}
if (actions.{{ simpleActionDefinitionName child.actionDefinition }}) {
await actions.{{ simpleActionDefinitionName child.actionDefinition }}!();
}
Expand Down
8 changes: 6 additions & 2 deletions judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/buttongroup.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
loadingPosition="start"
{{/ if }}
onClick={ actions.{{ simpleActionDefinitionName button.actionDefinition }} ? async () => {
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{# unless (isParameterOpenerButton button) }}
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{/ unless}}
await actions.{{ simpleActionDefinitionName button.actionDefinition }}!();
} : undefined }
{{# if (containerButtonHasDisabledConditions button container) }}
Expand All @@ -46,7 +48,9 @@
id: '{{ getXMIID button }}',
label: t('{{ getTranslationKeyForVisualElement button }}', { defaultValue: '{{ button.label }}' }) as string,
onClick: actions.{{ simpleActionDefinitionName button.actionDefinition }} ? async () => {
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{# unless (isParameterOpenerButton button) }}
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{/ unless}}
await actions.{{ simpleActionDefinitionName button.actionDefinition }}!();
} : undefined,
{{# if button.icon }}
Expand Down
4 changes: 3 additions & 1 deletion judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/flex.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
title={ t('{{ getTranslationKeyForVisualElement button }}', { defaultValue: '{{ button.label }}' }) as string }
color="primary"
onClick={ async () => {
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{# unless (isParameterOpenerButton button) }}
{{> actor/src/fragments/container/action-call-confirm-check.fragment.hbs button=button dataParam='data' }}
{{/ unless }}
await actions.{{ simpleActionDefinitionName button.actionDefinition }}!();
} }
>
Expand Down
Loading