diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-25 21:08:55 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-25 21:08:55 +0300 |
commit | 1e3f5ab634699e9d50779f05d2ae8dfc8a3ab9b3 (patch) | |
tree | c96727e136f4dc4fdbc1190895439d41e0b07fc5 /app/assets/javascripts/ml | |
parent | ba8e92f7c9938d7dba333d2396cdd14bfa0de726 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ml')
-rw-r--r-- | app/assets/javascripts/ml/experiment_tracking/components/delete_button.vue | 72 |
1 files changed, 39 insertions, 33 deletions
diff --git a/app/assets/javascripts/ml/experiment_tracking/components/delete_button.vue b/app/assets/javascripts/ml/experiment_tracking/components/delete_button.vue index 4c0f99cf62c..c10b0cb52b9 100644 --- a/app/assets/javascripts/ml/experiment_tracking/components/delete_button.vue +++ b/app/assets/javascripts/ml/experiment_tracking/components/delete_button.vue @@ -1,9 +1,9 @@ <script> import { GlModal, - GlDropdown, + GlDisclosureDropdown, GlTooltipDirective, - GlDropdownItem, + GlDisclosureDropdownItem, GlModalDirective, } from '@gitlab/ui'; import { __ } from '~/locale'; @@ -12,8 +12,8 @@ import csrf from '~/lib/utils/csrf'; export default { components: { GlModal, - GlDropdown, - GlDropdownItem, + GlDisclosureDropdown, + GlDisclosureDropdownItem, }, directives: { GlTooltip: GlTooltipDirective, @@ -63,36 +63,42 @@ export default { </script> <template> - <gl-dropdown - right - category="tertiary" - :aria-label="__('More actions')" - icon="ellipsis_v" - no-caret - > - <gl-dropdown-item - v-gl-modal-directive="modal.id" - :aria-label="actionPrimaryText" - variant="danger" + <div> + <gl-disclosure-dropdown + placement="right" + category="tertiary" + :aria-label="__('More actions')" + icon="ellipsis_v" + no-caret > - {{ actionPrimaryText }} + <gl-disclosure-dropdown-item + v-gl-modal-directive="modal.id" + :aria-label="actionPrimaryText" + variant="danger" + > + <template #list-item> + <span class="gl-text-red-500"> + {{ actionPrimaryText }} + </span> + </template> + </gl-disclosure-dropdown-item> + </gl-disclosure-dropdown> - <form ref="deleteForm" method="post" :action="deletePath"> - <input type="hidden" name="_method" value="delete" /> - <input type="hidden" name="authenticity_token" :value="$options.csrf.token" /> - </form> + <form ref="deleteForm" method="post" :action="deletePath"> + <input type="hidden" name="_method" value="delete" /> + <input type="hidden" name="authenticity_token" :value="$options.csrf.token" /> + </form> - <gl-modal - :modal-id="modal.id" - :title="modalTitle" - :action-primary="modal.actionPrimary" - :action-cancel="modal.actionCancel" - @primary="confirmDelete" - > - <p> - {{ deleteConfirmationText }} - </p> - </gl-modal> - </gl-dropdown-item> - </gl-dropdown> + <gl-modal + :modal-id="modal.id" + :title="modalTitle" + :action-primary="modal.actionPrimary" + :action-cancel="modal.actionCancel" + @primary="confirmDelete" + > + <p> + {{ deleteConfirmationText }} + </p> + </gl-modal> + </div> </template> |