diff --git a/app/components/vertical_ellipsis_menu/component.rb b/app/components/vertical_ellipsis_menu/component.rb deleted file mode 100644 index 696f0a0ad0..0000000000 --- a/app/components/vertical_ellipsis_menu/component.rb +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -module VerticalEllipsisMenu - class Component < ViewComponent::Base - end -end diff --git a/app/components/vertical_ellipsis_menu_component.rb b/app/components/vertical_ellipsis_menu_component.rb new file mode 100644 index 0000000000..4915eaafb5 --- /dev/null +++ b/app/components/vertical_ellipsis_menu_component.rb @@ -0,0 +1,4 @@ +# frozen_string_literal: true + +class VerticalEllipsisMenuComponent < ViewComponent::Base +end diff --git a/app/components/vertical_ellipsis_menu/component.html.haml b/app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_component.html.haml similarity index 73% rename from app/components/vertical_ellipsis_menu/component.html.haml rename to app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_component.html.haml index 5557289769..ea67c8ef00 100644 --- a/app/components/vertical_ellipsis_menu/component.html.haml +++ b/app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_component.html.haml @@ -1,4 +1,4 @@ -.vertical-ellipsis-menu{ "data-controller": "vertical-ellipsis-menu--component" } - %i.fa.fa-ellipsis-v{ "data-action": "click->vertical-ellipsis-menu--component#toggle" } - .vertical-ellipsis-menu-content{ "data-vertical-ellipsis-menu--component-target": "content" } +.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" } = content diff --git a/app/components/vertical_ellipsis_menu/component.scss b/app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_component.scss similarity index 100% rename from app/components/vertical_ellipsis_menu/component.scss rename to app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_component.scss diff --git a/app/components/vertical_ellipsis_menu/component_controller.js b/app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_controller.js similarity index 100% rename from app/components/vertical_ellipsis_menu/component_controller.js rename to app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_controller.js diff --git a/app/views/admin/products_v3/_product_row.html.haml b/app/views/admin/products_v3/_product_row.html.haml index 980b9980d8..0b47dd3dfe 100644 --- a/app/views/admin/products_v3/_product_row.html.haml +++ b/app/views/admin/products_v3/_product_row.html.haml @@ -24,7 +24,7 @@ %td.col-inherits_properties.align-left .content= product.inherits_properties ? 'YES' : 'NO' #TODO: consider using https://github.com/RST-J/human_attribute_values, else use I18n.t (also below) %td.align-right - = render(VerticalEllipsisMenu::Component.new) do + = render(VerticalEllipsisMenuComponent.new) do = link_to t('admin.products_page.actions.edit'), edit_admin_product_path(product), 'data-turbo': false = link_to t('admin.products_page.actions.clone'), admin_clone_product_path(product), 'data-turbo-method': :post %a{ "data-controller": "modal-link", "data-action": "click->modal-link#setModalDataSetOnConfirm click->modal-link#open", diff --git a/app/views/admin/products_v3/_variant_row.html.haml b/app/views/admin/products_v3/_variant_row.html.haml index 8d6ad68cda..d5aa876e46 100644 --- a/app/views/admin/products_v3/_variant_row.html.haml +++ b/app/views/admin/products_v3/_variant_row.html.haml @@ -84,7 +84,7 @@ %td.col-inherits_properties.align-left -# empty %td.align-right - = render(VerticalEllipsisMenu::Component.new) do + = render(VerticalEllipsisMenuComponent.new) do - if variant.persisted? = link_to t('admin.products_page.actions.edit'), edit_admin_product_variant_path(variant.product, variant) - if variant.product.variants.size > 1 diff --git a/app/webpacker/css/admin_v3/all.scss b/app/webpacker/css/admin_v3/all.scss index 3e3cc403bd..a9840b62f1 100644 --- a/app/webpacker/css/admin_v3/all.scss +++ b/app/webpacker/css/admin_v3/all.scss @@ -127,7 +127,7 @@ @import "components/tom_select"; // admin_v3 @import "app/components/modal_component/modal_component"; -@import "app/components/vertical_ellipsis_menu/component"; // admin_v3 and only V3 +@import "app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_component"; // admin_v3 and only V3 @import "app/components/tag_list_input_component/tag_list_input_component"; @import "app/webpacker/css/admin/trix.scss"; diff --git a/spec/javascripts/stimulus/vertical_ellipsis_menu_controller_test.js b/spec/javascripts/stimulus/vertical_ellipsis_menu_controller_test.js index 7e9d830c6b..1e8c7d1fbb 100644 --- a/spec/javascripts/stimulus/vertical_ellipsis_menu_controller_test.js +++ b/spec/javascripts/stimulus/vertical_ellipsis_menu_controller_test.js @@ -3,7 +3,7 @@ */ import { Application } from "stimulus"; -import vertical_ellipsis_menu_controller from "../../../app/components/vertical_ellipsis_menu/component_controller"; +import vertical_ellipsis_menu_controller from "../../../app/components/vertical_ellipsis_menu_component/vertical_ellipsis_menu_controller"; describe("VerticalEllipsisMenuController test", () => { beforeAll(() => { @@ -30,7 +30,6 @@ describe("VerticalEllipsisMenuController test", () => { expect(content.classList.contains("show")).toBe(true); }); - it("remove show class from content when clicking button", () => { button.click(); expect(content.classList.contains("show")).toBe(true); @@ -38,7 +37,6 @@ describe("VerticalEllipsisMenuController test", () => { expect(content.classList.contains("show")).toBe(false); }); - it("remove show class from content when clicking outside", () => { button.click(); expect(content.classList.contains("show")).toBe(true);