openfoodfoundation#11068, resolve conflicts

chahmedejaz · Nov 28, 2023 · f139127 · f139127
1 parent 8364029
commit f139127
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_component.scss b/app/components/vertical_ellipsis_menu_component/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
@@ -70,6 +70,10 @@
               = render(VerticalEllipsisMenuComponent.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 do |variant|
             = form.fields_for("products][][variants_attributes][", variant, index: nil) do |variant_form|
@@ -99,3 +103,7 @@
                 %td.align-right
                   = render(VerticalEllipsisMenuComponent.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