From 4feb8f922ee4057307bcfa1d0960b7a4ea93b6a0 Mon Sep 17 00:00:00 2001 From: Neal Chambers Date: Thu, 31 Aug 2023 09:29:43 +0900 Subject: [PATCH] Fix Rails/HelperInstanceVariable in injection_helper.rb --- .rubocop_todo.yml | 1 - app/helpers/admin/injection_helper.rb | 90 +++++++++---------- app/views/admin/customers/index.html.haml | 2 +- .../admin/enterprise_fees/_data.html.haml | 2 +- .../enterprise_relationships/_data.html.haml | 4 +- .../admin/enterprise_roles/_data.html.haml | 6 +- .../enterprises/_change_type_form.html.haml | 2 +- .../admin/enterprises/_form_data.html.haml | 10 +-- app/views/admin/order_cycles/edit.html.haml | 2 +- .../admin/order_cycles/incoming.html.haml | 2 +- app/views/admin/order_cycles/new.html.haml | 2 +- .../admin/order_cycles/outgoing.html.haml | 2 +- .../admin/variant_overrides/_data.html.haml | 12 +-- app/views/spree/admin/orders/edit.html.haml | 4 +- app/views/spree/admin/orders/new.html.haml | 4 +- .../admin/payment_methods/_form.html.haml | 2 +- .../admin/products/index/_data.html.haml | 8 +- .../admin/shipping_methods/_form.html.haml | 2 +- 18 files changed, 78 insertions(+), 79 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 823ec3a944..cdf5ed14e4 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -451,7 +451,6 @@ Rails/HasManyOrHasOneDependent: # Include: app/helpers/**/*.rb Rails/HelperInstanceVariable: Exclude: - - 'app/helpers/admin/injection_helper.rb' - 'app/helpers/application_helper.rb' - 'app/helpers/injection_helper.rb' - 'app/helpers/order_cycles_helper.rb' diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb index 20482e0a4e..8211adb1a0 100644 --- a/app/helpers/admin/injection_helper.rb +++ b/app/helpers/admin/injection_helper.rb @@ -2,71 +2,71 @@ module Admin module InjectionHelper - def admin_inject_enterprise + def admin_inject_enterprise(enterprise) admin_inject_json_ams "admin.enterprises", "enterprise", - @enterprise, + enterprise, Api::Admin::EnterpriseSerializer end - def admin_inject_enterprises + def admin_inject_enterprises(my_enterprises, all_enterprises) admin_inject_json_ams_array("ofn.admin", "my_enterprises", - @my_enterprises, + my_enterprises, Api::Admin::BasicEnterpriseSerializer) + admin_inject_json_ams_array("ofn.admin", "all_enterprises", - @all_enterprises, + all_enterprises, Api::Admin::BasicEnterpriseSerializer) end - def admin_inject_enterprise_relationships + def admin_inject_enterprise_relationships(enterprise_relationships) admin_inject_json_ams_array "ofn.admin", "enterprise_relationships", - @enterprise_relationships, + enterprise_relationships, Api::Admin::EnterpriseRelationshipSerializer end - def admin_inject_enterprise_roles + def admin_inject_enterprise_roles(enterprise_roles) admin_inject_json_ams_array "ofn.admin", "enterpriseRoles", - @enterprise_roles, + enterprise_roles, Api::Admin::EnterpriseRoleSerializer end - def admin_inject_payment_methods + def admin_inject_payment_methods(payment_methods) admin_inject_json_ams_array "admin.paymentMethods", "paymentMethods", - @payment_methods, + payment_methods, Api::Admin::IdNameSerializer end - def admin_inject_payment_method + def admin_inject_payment_method(payment_method) admin_inject_json_ams "admin.paymentMethods", "paymentMethod", - @payment_method, + payment_method, Api::Admin::PaymentMethodSerializer end - def admin_inject_shipping_methods + def admin_inject_shipping_methods(shipping_methods) admin_inject_json_ams_array "admin.shippingMethods", "shippingMethods", - @shipping_methods, + shipping_methods, Api::Admin::IdNameSerializer end - def admin_inject_shipping_method + def admin_inject_shipping_method(shipping_method) admin_inject_json_ams "admin.shippingMethods", "shippingMethod", - @shipping_method, + shipping_method, Api::Admin::ShippingMethodSerializer end - def admin_inject_shops(opts = {}) + def admin_inject_shops(shops, opts = {}) opts.reverse_merge!(module: 'admin.customers') admin_inject_json_ams_array opts[:module], "shops", - @shops, + shops, Api::Admin::IdNameSerializer end @@ -78,26 +78,26 @@ module Admin Api::CountrySerializer end - def admin_inject_hubs(opts = {}) + def admin_inject_hubs(hubs, opts = {}) opts.reverse_merge!(module: 'ofn.admin') admin_inject_json_ams_array opts[:module], "hubs", - @hubs, + hubs, Api::Admin::IdNameSerializer end - def admin_inject_producers(opts = {}) + def admin_inject_producers(producers, opts = {}) opts.reverse_merge!(module: 'ofn.admin') admin_inject_json_ams_array opts[:module], "producers", - @producers, + producers, Api::Admin::IdNameSerializer end - def admin_inject_inventory_items(opts = { module: 'ofn.admin' }) + def admin_inject_inventory_items(inventory_items, opts = { module: 'ofn.admin' }) admin_inject_json_ams_array opts[:module], "inventoryItems", - @inventory_items, + inventory_items, Api::Admin::InventoryItemSerializer end @@ -117,69 +117,69 @@ module Admin Api::CurrencyConfigSerializer end - def admin_inject_enterprise_permissions + def admin_inject_enterprise_permissions(enterprise) permissions = - { can_manage_shipping_methods: can?(:manage_shipping_methods, @enterprise), - can_manage_payment_methods: can?(:manage_payment_methods, @enterprise), - can_manage_enterprise_fees: can?(:manage_enterprise_fees, @enterprise) } + { can_manage_shipping_methods: can?(:manage_shipping_methods, enterprise), + can_manage_payment_methods: can?(:manage_payment_methods, enterprise), + can_manage_enterprise_fees: can?(:manage_enterprise_fees, enterprise) } admin_inject_json "admin.enterprises", "enterprisePermissions", permissions end - def admin_inject_hub_permissions + def admin_inject_hub_permissions(hub_permissions) render partial: "admin/json/injection_ams", locals: { ngModule: "admin.variantOverrides", name: "hubPermissions", - json: @hub_permissions.to_json } + json: hub_permissions.to_json } end - def admin_inject_tax_categories(opts = { module: 'ofn.admin' }) + def admin_inject_tax_categories(tax_categories, opts = { module: 'ofn.admin' }) admin_inject_json_ams_array opts[:module], "tax_categories", - @tax_categories, + tax_categories, Api::Admin::TaxCategorySerializer end - def admin_inject_taxons + def admin_inject_taxons(taxons) admin_inject_json_ams_array "admin.taxons", "taxons", - @taxons, + taxons, Api::Admin::TaxonSerializer end - def admin_inject_users + def admin_inject_users(users) admin_inject_json_ams_array "ofn.admin", "users", - @users, + users, Api::Admin::UserSerializer end - def admin_inject_variant_overrides + def admin_inject_variant_overrides(variant_overrides) admin_inject_json_ams_array "admin.variantOverrides", "variantOverrides", - @variant_overrides, + variant_overrides, Api::Admin::VariantOverrideSerializer end - def admin_inject_order_cycle_instance + def admin_inject_order_cycle_instance(order_cycle) render partial: "admin/json/injection_ams", locals: { ngModule: 'admin.orderCycles', name: 'ocInstance', - json: "{coordinator_id: '#{@order_cycle.coordinator.id}'}" } + json: "{coordinator_id: '#{order_cycle.coordinator.id}'}" } end - def admin_inject_order_cycles + def admin_inject_order_cycles(order_cycles) admin_inject_json_ams_array "admin.orders", "orderCycles", - @order_cycles, + order_cycles, Api::Admin::BasicOrderCycleSerializer, current_user: spree_current_user end - def admin_inject_spree_api_key + def admin_inject_spree_api_key(spree_api_key) render partial: "admin/json/injection_ams", locals: { ngModule: 'admin.indexUtils', name: 'SpreeApiKey', - json: "'#{@spree_api_key}'" } + json: "'#{spree_api_key}'" } end def admin_inject_available_units diff --git a/app/views/admin/customers/index.html.haml b/app/views/admin/customers/index.html.haml index e0e2aaf02c..a463b2e0ed 100644 --- a/app/views/admin/customers/index.html.haml +++ b/app/views/admin/customers/index.html.haml @@ -11,7 +11,7 @@ = t('admin.customers.index.new_customer') = admin_inject_column_preferences(module: 'admin.customers') -= admin_inject_shops(module: 'admin.customers') += admin_inject_shops(@shops, module: 'admin.customers') = admin_inject_available_countries(module: 'admin.customers') %div{ ng: { controller: 'customersCtrl' } } diff --git a/app/views/admin/enterprise_fees/_data.html.haml b/app/views/admin/enterprise_fees/_data.html.haml index 0b12530bff..4f350a0a2d 100644 --- a/app/views/admin/enterprise_fees/_data.html.haml +++ b/app/views/admin/enterprise_fees/_data.html.haml @@ -1,3 +1,3 @@ = admin_inject_json_ams_array "admin.enterpriseFees", "enterprises", @enterprises, Api::Admin::IdNameSerializer -= admin_inject_tax_categories(module: "admin.enterpriseFees") += admin_inject_tax_categories(@tax_categories, module: "admin.enterpriseFees") = admin_inject_json_ams_array "admin.enterpriseFees", "calculators", @calculators, Api::Admin::CalculatorSerializer diff --git a/app/views/admin/enterprise_relationships/_data.html.haml b/app/views/admin/enterprise_relationships/_data.html.haml index b6f7215afc..824c7b9fc5 100644 --- a/app/views/admin/enterprise_relationships/_data.html.haml +++ b/app/views/admin/enterprise_relationships/_data.html.haml @@ -1,2 +1,2 @@ -= admin_inject_enterprise_relationships -= admin_inject_enterprises += admin_inject_enterprise_relationships(@enterprise_relationships) += admin_inject_enterprises(@my_enterprises, @all_enterprises) diff --git a/app/views/admin/enterprise_roles/_data.html.haml b/app/views/admin/enterprise_roles/_data.html.haml index 5063503803..d24fb584a7 100644 --- a/app/views/admin/enterprise_roles/_data.html.haml +++ b/app/views/admin/enterprise_roles/_data.html.haml @@ -1,4 +1,4 @@ -= admin_inject_enterprise_roles -= admin_inject_users -= admin_inject_enterprises += admin_inject_enterprise_roles(@enterprise_roles) += admin_inject_users(@users) += admin_inject_enterprises(@my_enterprises, @all_enterprises) diff --git a/app/views/admin/enterprises/_change_type_form.html.haml b/app/views/admin/enterprises/_change_type_form.html.haml index e63ba60ea4..5a71a1bb45 100644 --- a/app/views/admin/enterprises/_change_type_form.html.haml +++ b/app/views/admin/enterprises/_change_type_form.html.haml @@ -1,4 +1,4 @@ -= admin_inject_enterprise += admin_inject_enterprise(@enterprise) = form_for @enterprise, url: main_app.register_admin_enterprise_path(@enterprise), html: { name: "change_type", id: "change_type", novalidate: true, "ng-app" => "admin.enterprises", "ng-controller"=> 'changeTypeFormCtrl' } do |change_type_form| diff --git a/app/views/admin/enterprises/_form_data.html.haml b/app/views/admin/enterprises/_form_data.html.haml index 14f83b79bf..4cd2350d8f 100644 --- a/app/views/admin/enterprises/_form_data.html.haml +++ b/app/views/admin/enterprises/_form_data.html.haml @@ -1,6 +1,6 @@ -= admin_inject_enterprise -= admin_inject_taxons -= admin_inject_payment_methods -= admin_inject_shipping_methods -= admin_inject_enterprise_permissions += admin_inject_enterprise(@enterprise) += admin_inject_taxons(@taxons) += admin_inject_payment_methods(@payment_methods) += admin_inject_shipping_methods(@shipping_methods) += admin_inject_enterprise_permissions(@enterprise) = admin_inject_available_countries(module: 'admin.enterprises') diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml index 3dcc757370..3a67c072bd 100644 --- a/app/views/admin/order_cycles/edit.html.haml +++ b/app/views/admin/order_cycles/edit.html.haml @@ -15,7 +15,7 @@ = t :edit_order_cycle - ng_controller = @order_cycle.simple? ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl' -= admin_inject_order_cycle_instance += admin_inject_order_cycle_instance(@order_cycle) = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f| %save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" } diff --git a/app/views/admin/order_cycles/incoming.html.haml b/app/views/admin/order_cycles/incoming.html.haml index 254119bf24..c9f40b9322 100644 --- a/app/views/admin/order_cycles/incoming.html.haml +++ b/app/views/admin/order_cycles/incoming.html.haml @@ -3,7 +3,7 @@ - content_for :page_title do = t :edit_order_cycle -= admin_inject_order_cycle_instance += admin_inject_order_cycle_instance(@order_cycle) = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminOrderCycleIncomingCtrl', name: 'order_cycle_form'} do |f| = render 'wizard_progress' diff --git a/app/views/admin/order_cycles/new.html.haml b/app/views/admin/order_cycles/new.html.haml index e40ee808ef..6c35515d2f 100644 --- a/app/views/admin/order_cycles/new.html.haml +++ b/app/views/admin/order_cycles/new.html.haml @@ -2,7 +2,7 @@ =t('new_order_cycle') - ng_controller = @order_cycle.simple? ? 'AdminSimpleCreateOrderCycleCtrl' : 'AdminCreateOrderCycleCtrl' -= admin_inject_order_cycle_instance += admin_inject_order_cycle_instance(@order_cycle) = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f| diff --git a/app/views/admin/order_cycles/outgoing.html.haml b/app/views/admin/order_cycles/outgoing.html.haml index e7756a713d..d5b148f1cc 100644 --- a/app/views/admin/order_cycles/outgoing.html.haml +++ b/app/views/admin/order_cycles/outgoing.html.haml @@ -3,7 +3,7 @@ - content_for :page_title do = t :edit_order_cycle -= admin_inject_order_cycle_instance += admin_inject_order_cycle_instance(@order_cycle) = form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => 'AdminOrderCycleOutgoingCtrl', name: 'order_cycle_form'} do |f| = render 'wizard_progress' diff --git a/app/views/admin/variant_overrides/_data.html.haml b/app/views/admin/variant_overrides/_data.html.haml index 7b0e35f6ce..c707e0ed8f 100644 --- a/app/views/admin/variant_overrides/_data.html.haml +++ b/app/views/admin/variant_overrides/_data.html.haml @@ -1,7 +1,7 @@ -= admin_inject_spree_api_key -= admin_inject_hubs(module: 'admin.variantOverrides') -= admin_inject_hub_permissions -= admin_inject_producers(module: 'admin.variantOverrides') += admin_inject_spree_api_key(@spree_api_key) += admin_inject_hubs(@hubs, module: 'admin.variantOverrides') += admin_inject_hub_permissions(@hub_permissions) += admin_inject_producers(@producers, module: 'admin.variantOverrides') = admin_inject_column_preferences(module: 'admin.variantOverrides') -= admin_inject_variant_overrides -= admin_inject_inventory_items(module: 'admin.variantOverrides') += admin_inject_variant_overrides(@variant_overrides) += admin_inject_inventory_items(@inventory_items, module: 'admin.variantOverrides') diff --git a/app/views/spree/admin/orders/edit.html.haml b/app/views/spree/admin/orders/edit.html.haml index 6e290d3502..c74f2e6bcb 100644 --- a/app/views/spree/admin/orders/edit.html.haml +++ b/app/views/spree/admin/orders/edit.html.haml @@ -18,8 +18,8 @@ %div = render partial: "spree/shared/error_messages", locals: { target: @order } - = admin_inject_shops(module: 'admin.orders') - = admin_inject_order_cycles + = admin_inject_shops(@shops, module: 'admin.orders') + = admin_inject_order_cycles(@order_cycles) %div{"ng-controller" => "orderCtrl", "ofn-distributor-id" => @order.distributor_id, "ofn-order-cycle-id" => @order.order_cycle_id} = render :partial => 'add_product' if can?(:update, @order) diff --git a/app/views/spree/admin/orders/new.html.haml b/app/views/spree/admin/orders/new.html.haml index b43d50fc9e..080c0e7878 100644 --- a/app/views/spree/admin/orders/new.html.haml +++ b/app/views/spree/admin/orders/new.html.haml @@ -4,8 +4,8 @@ - content_for :page_actions do %li= button_link_to t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left' -= admin_inject_shops(module: 'admin.orders') -= admin_inject_order_cycles += admin_inject_shops(@shops, module: 'admin.orders') += admin_inject_order_cycles(@order_cycles) = render 'spree/admin/shared/order_tabs', current: 'Order Details' diff --git a/app/views/spree/admin/payment_methods/_form.html.haml b/app/views/spree/admin/payment_methods/_form.html.haml index a205c96f3c..6b942e919a 100644 --- a/app/views/spree/admin/payment_methods/_form.html.haml +++ b/app/views/spree/admin/payment_methods/_form.html.haml @@ -1,4 +1,4 @@ -= admin_inject_payment_method += admin_inject_payment_method(@payment_method) = admin_inject_json_ams_array "admin.paymentMethods", "shops", @hubs, Api::Admin::BasicEnterpriseSerializer .alpha.eleven.columns{ "ng-app" => "admin.paymentMethods", "ng-controller" => "paymentMethodCtrl" } .row diff --git a/app/views/spree/admin/products/index/_data.html.haml b/app/views/spree/admin/products/index/_data.html.haml index a17f725b11..13a6dc780e 100644 --- a/app/views/spree/admin/products/index/_data.html.haml +++ b/app/views/spree/admin/products/index/_data.html.haml @@ -1,5 +1,5 @@ -= admin_inject_producers -= admin_inject_taxons -= admin_inject_tax_categories -= admin_inject_spree_api_key += admin_inject_producers(@producers) += admin_inject_taxons(@taxons) += admin_inject_tax_categories(@tax_categories) += admin_inject_spree_api_key(@spree_api_key) = admin_inject_column_preferences diff --git a/app/views/spree/admin/shipping_methods/_form.html.haml b/app/views/spree/admin/shipping_methods/_form.html.haml index 5ca959f927..bd05ffceb4 100644 --- a/app/views/spree/admin/shipping_methods/_form.html.haml +++ b/app/views/spree/admin/shipping_methods/_form.html.haml @@ -1,4 +1,4 @@ -= admin_inject_shipping_method += admin_inject_shipping_method(@shipping_method) .alpha.eleven.columns{ "ng-app" => "admin.shippingMethods", "ng-controller" => "shippingMethodCtrl" } .row