From d1224ea0228e2a52a94a1e9914e607f649c95aa0 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Tue, 28 Nov 2023 15:55:30 +0500 Subject: [PATCH] #11068, resolve conflicts --- .../vertical_ellipsis_menu/component.scss | 3 ++- app/views/admin/products_v3/_table.html.haml | 8 +++++++ .../components/_product_actions.html.haml | 23 ------------------- 3 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 app/views/admin/products_v3/components/_product_actions.html.haml diff --git a/app/components/vertical_ellipsis_menu/component.scss b/app/components/vertical_ellipsis_menu/component.scss index 03b5cb39d8..7730b384ce 100644 --- a/app/components/vertical_ellipsis_menu/component.scss +++ b/app/components/vertical_ellipsis_menu/component.scss @@ -30,7 +30,8 @@ display: block; } - & > a { + & > a, + p { display: block; padding: 5px 10px; cursor: pointer; diff --git a/app/views/admin/products_v3/_table.html.haml b/app/views/admin/products_v3/_table.html.haml index 0462529857..40938e3ac4 100644 --- a/app/views/admin/products_v3/_table.html.haml +++ b/app/views/admin/products_v3/_table.html.haml @@ -70,6 +70,10 @@ = render(VerticalEllipsisMenu::Component.new) do = link_to t('admin.products_page.actions.edit'), edit_admin_product_path(product) = link_to t('admin.products_page.actions.clone'), clone_admin_product_path(product) + %p{"data-controller": "modal-link", "data-action": "click->modal-link#open", + "data-modal-link-target-value": "delete_product", "class": "delete" + } + = t('admin.products_page.actions.delete') - product.variants.each_with_index do |variant, variant_index| = form.fields_for("products][#{product_index}][variants_attributes][", variant, variant_index:) do |variant_form| @@ -108,3 +112,7 @@ %td.align-right = render(VerticalEllipsisMenu::Component.new) do = link_to t('admin.products_page.actions.edit'), edit_admin_product_variant_path(product, variant) + %p{"data-controller": "modal-link", "data-action": "click->modal-link#open", + "data-modal-link-target-value": "delete_variant", "class": "delete" + } + = t('admin.products_page.actions.delete') diff --git a/app/views/admin/products_v3/components/_product_actions.html.haml b/app/views/admin/products_v3/components/_product_actions.html.haml deleted file mode 100644 index 12bd9bfc24..0000000000 --- a/app/views/admin/products_v3/components/_product_actions.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -.vertical-ellipsis-menu{ "data-controller": "vertical-ellipsis-menu" } - %i.fa.fa-ellipsis-v{ "data-action": "click->vertical-ellipsis-menu#toggle" } - .vertical-ellipsis-menu-content{ "data-vertical-ellipsis-menu-target": "content" } - - if defined?(variant) - = link_to t('admin.products_page.actions.edit'), edit_admin_product_variant_path(product, variant), class: "vertical-ellipsis-menu-content-item" - - if product.variants.size > 1 - %span{ - "data-controller": "modal-link", - "data-action": "click->modal-link#open", - "data-modal-link-target-value": "delete_variant", - "class": "vertical-ellipsis-menu-content-item" - } - = t('admin.products_page.actions.delete') - - else - = link_to t('admin.products_page.actions.edit'), edit_admin_product_path(product), class: "vertical-ellipsis-menu-content-item" - = link_to t('admin.products_page.actions.clone'), clone_admin_product_path(product), class: "vertical-ellipsis-menu-content-item" - %span{ - "data-controller": "modal-link", - "data-action": "click->modal-link#open", - "data-modal-link-target-value": "delete_product", - "class": "vertical-ellipsis-menu-content-item" - } - = t('admin.products_page.actions.delete')