From 4237a83028a6922027e6802a5b4eebcbc316709d Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Fri, 20 Nov 2015 11:33:46 +1100
Subject: [PATCH] Moving components required for variant overrides into
 appropriate modules

---
 app/assets/javascripts/admin/all.js                |  1 +
 .../index_utils/services/data_fetcher.js.coffee    |  4 ++--
 .../admin/index_utils/services/indexer.js.coffee   |  2 +-
 .../index_utils/services/paged_fetcher.js.coffee   |  4 ++--
 .../index_utils/services/spree_api_auth.js.coffee  |  2 +-
 .../index_utils/services/status_message.js.coffee  |  2 +-
 .../variant_overrides_controller.js.coffee         |  2 +-
 .../directives/track_variant_override.js.coffee    |  2 +-
 .../filters/hub_permissions_filter.js.coffee       |  2 +-
 .../services/dirty_variant_overrides.js.coffee     |  2 +-
 .../services/variant_overrides.js.coffee           |  4 ++--
 .../variant_overrides/variant_overrides.js.coffee  |  1 +
 app/helpers/admin/injection_helper.rb              | 14 +++++++-------
 app/views/admin/variant_overrides/_data.html.haml  |  4 ++--
 app/views/admin/variant_overrides/index.html.haml  |  2 +-
 .../variant_overrides_controller_spec.js.coffee    |  4 ++--
 .../dirty_variant_overrides_spec.js.coffee         |  2 +-
 .../unit/admin/services/indexer_spec.js.coffee     |  2 +-
 .../services/variant_overrides_spec.js.coffee      |  2 +-
 19 files changed, 30 insertions(+), 28 deletions(-)
 create mode 100644 app/assets/javascripts/admin/variant_overrides/variant_overrides.js.coffee

diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index c0fa530626..7d3e94194d 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -39,6 +39,7 @@
 //= require ./taxons/taxons
 //= require ./utils/utils
 //= require ./users/users
+//= require ./variant_overrides/variant_overrides
 //= require textAngular.min.js
 //= require textAngular-sanitize.min.js
 //= require ../shared/bindonce.min.js
diff --git a/app/assets/javascripts/admin/index_utils/services/data_fetcher.js.coffee b/app/assets/javascripts/admin/index_utils/services/data_fetcher.js.coffee
index 735e4cc6bb..bf5580a3b2 100644
--- a/app/assets/javascripts/admin/index_utils/services/data_fetcher.js.coffee
+++ b/app/assets/javascripts/admin/index_utils/services/data_fetcher.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").factory "dataFetcher", [
+angular.module("admin.indexUtils").factory "dataFetcher", [
   "$http", "$q"
   ($http, $q) ->
     return (dataLocation) ->
@@ -9,4 +9,4 @@ angular.module("ofn.admin").factory "dataFetcher", [
         deferred.reject()
 
       deferred.promise
-]
\ No newline at end of file
+]
diff --git a/app/assets/javascripts/admin/index_utils/services/indexer.js.coffee b/app/assets/javascripts/admin/index_utils/services/indexer.js.coffee
index f9a9688a2f..295df46be3 100644
--- a/app/assets/javascripts/admin/index_utils/services/indexer.js.coffee
+++ b/app/assets/javascripts/admin/index_utils/services/indexer.js.coffee
@@ -4,7 +4,7 @@
 # Indexer.index producers
 # -> {1: {id: 1, name: 'one'}, 2: {id: 2, name: 'two'}}
 
-angular.module("ofn.admin").factory 'Indexer', ->
+angular.module("admin.indexUtils").factory 'Indexer', ->
   new class Indexer
     index: (data, key='id') ->
       index = {}
diff --git a/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee b/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee
index 9281ed6a42..d65887bb2c 100644
--- a/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee
+++ b/app/assets/javascripts/admin/index_utils/services/paged_fetcher.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").factory "PagedFetcher", (dataFetcher) ->
+angular.module("admin.indexUtils").factory "PagedFetcher", (dataFetcher) ->
   new class PagedFetcher
     # Given a URL like http://example.com/foo?page=::page::&per_page=20
     # And the response includes an attribute pages with the number of pages to fetch
@@ -13,4 +13,4 @@ angular.module("ofn.admin").factory "PagedFetcher", (dataFetcher) ->
               processData data
 
     urlForPage: (url, page) ->
-      url.replace("::page::", page)
\ No newline at end of file
+      url.replace("::page::", page)
diff --git a/app/assets/javascripts/admin/index_utils/services/spree_api_auth.js.coffee b/app/assets/javascripts/admin/index_utils/services/spree_api_auth.js.coffee
index e606882bc5..3ed4dd9bf7 100644
--- a/app/assets/javascripts/admin/index_utils/services/spree_api_auth.js.coffee
+++ b/app/assets/javascripts/admin/index_utils/services/spree_api_auth.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").factory "SpreeApiAuth", ($q, $http, SpreeApiKey) ->
+angular.module("admin.indexUtils").factory "SpreeApiAuth", ($q, $http, SpreeApiKey) ->
   new class SpreeApiAuth
     authorise: ->
       deferred = $q.defer()
diff --git a/app/assets/javascripts/admin/index_utils/services/status_message.js.coffee b/app/assets/javascripts/admin/index_utils/services/status_message.js.coffee
index aaa55cf339..9cc9547e39 100644
--- a/app/assets/javascripts/admin/index_utils/services/status_message.js.coffee
+++ b/app/assets/javascripts/admin/index_utils/services/status_message.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").factory "StatusMessage", ($timeout) ->
+angular.module("admin.indexUtils").factory "StatusMessage", ($timeout) ->
   new class StatusMessage
     types:
       progress: {timeout: false, style: {color: '#ff9906'}}
diff --git a/app/assets/javascripts/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee b/app/assets/javascripts/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee
index bcc633805f..73ddfc8b2b 100644
--- a/app/assets/javascripts/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee
+++ b/app/assets/javascripts/admin/variant_overrides/controllers/variant_overrides_controller.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").controller "AdminVariantOverridesCtrl", ($scope, $timeout, Indexer, SpreeApiAuth, PagedFetcher, StatusMessage, hubs, producers, hubPermissions, VariantOverrides, DirtyVariantOverrides) ->
+angular.module("admin.variantOverrides").controller "AdminVariantOverridesCtrl", ($scope, $timeout, Indexer, SpreeApiAuth, PagedFetcher, StatusMessage, hubs, producers, hubPermissions, VariantOverrides, DirtyVariantOverrides) ->
   $scope.hubs = hubs
   $scope.hub = null
   $scope.products = []
diff --git a/app/assets/javascripts/admin/variant_overrides/directives/track_variant_override.js.coffee b/app/assets/javascripts/admin/variant_overrides/directives/track_variant_override.js.coffee
index bb8117a757..944fdf4a94 100644
--- a/app/assets/javascripts/admin/variant_overrides/directives/track_variant_override.js.coffee
+++ b/app/assets/javascripts/admin/variant_overrides/directives/track_variant_override.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").directive "ofnTrackVariantOverride", (DirtyVariantOverrides) ->
+angular.module("admin.variantOverrides").directive "ofnTrackVariantOverride", (DirtyVariantOverrides) ->
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
     ngModel.$parsers.push (viewValue) ->
diff --git a/app/assets/javascripts/admin/variant_overrides/filters/hub_permissions_filter.js.coffee b/app/assets/javascripts/admin/variant_overrides/filters/hub_permissions_filter.js.coffee
index 5db7a6d40e..39b5e77839 100644
--- a/app/assets/javascripts/admin/variant_overrides/filters/hub_permissions_filter.js.coffee
+++ b/app/assets/javascripts/admin/variant_overrides/filters/hub_permissions_filter.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").filter "hubPermissions", ($filter) ->
+angular.module("admin.variantOverrides").filter "hubPermissions", ($filter) ->
   return (products, hubPermissions, hub_id) ->
     return [] if !hub_id
     return $filter('filter')(products, ((product) -> hubPermissions[hub_id].indexOf(product.producer_id) > -1), true)
diff --git a/app/assets/javascripts/admin/variant_overrides/services/dirty_variant_overrides.js.coffee b/app/assets/javascripts/admin/variant_overrides/services/dirty_variant_overrides.js.coffee
index 82e7772982..053c6cbfa1 100644
--- a/app/assets/javascripts/admin/variant_overrides/services/dirty_variant_overrides.js.coffee
+++ b/app/assets/javascripts/admin/variant_overrides/services/dirty_variant_overrides.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").factory "DirtyVariantOverrides", ($http) ->
+angular.module("admin.variantOverrides").factory "DirtyVariantOverrides", ($http) ->
   new class DirtyVariantOverrides
     dirtyVariantOverrides: {}
 
diff --git a/app/assets/javascripts/admin/variant_overrides/services/variant_overrides.js.coffee b/app/assets/javascripts/admin/variant_overrides/services/variant_overrides.js.coffee
index 28d65eab03..c8ea397343 100644
--- a/app/assets/javascripts/admin/variant_overrides/services/variant_overrides.js.coffee
+++ b/app/assets/javascripts/admin/variant_overrides/services/variant_overrides.js.coffee
@@ -1,4 +1,4 @@
-angular.module("ofn.admin").factory "VariantOverrides", (variantOverrides, Indexer) ->
+angular.module("admin.variantOverrides").factory "VariantOverrides", (variantOverrides) ->
   new class VariantOverrides
     variantOverrides: {}
 
@@ -20,4 +20,4 @@ angular.module("ofn.admin").factory "VariantOverrides", (variantOverrides, Index
 
     updateIds: (updatedVos) ->
       for vo in updatedVos
-        @variantOverrides[vo.hub_id][vo.variant_id].id = vo.id
\ No newline at end of file
+        @variantOverrides[vo.hub_id][vo.variant_id].id = vo.id
diff --git a/app/assets/javascripts/admin/variant_overrides/variant_overrides.js.coffee b/app/assets/javascripts/admin/variant_overrides/variant_overrides.js.coffee
new file mode 100644
index 0000000000..7a6f1ab2fa
--- /dev/null
+++ b/app/assets/javascripts/admin/variant_overrides/variant_overrides.js.coffee
@@ -0,0 +1 @@
+angular.module("admin.variantOverrides", ["admin.indexUtils"])
diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb
index 6036447d9b..343e15ef29 100644
--- a/app/helpers/admin/injection_helper.rb
+++ b/app/helpers/admin/injection_helper.rb
@@ -31,12 +31,12 @@ module Admin
       admin_inject_json_ams_array ngModule, "shops", @shops, Api::Admin::IdNameSerializer
     end
 
-    def admin_inject_hubs
-      admin_inject_json_ams_array "ofn.admin", "hubs", @hubs, Api::Admin::IdNameSerializer
+    def admin_inject_hubs(opts={module: 'ofn.admin'})
+      admin_inject_json_ams_array opts[:module], "hubs", @hubs, Api::Admin::IdNameSerializer
     end
 
-    def admin_inject_producers
-      admin_inject_json_ams_array "ofn.admin", "producers", @producers, Api::Admin::IdNameSerializer
+    def admin_inject_producers(opts={module: 'ofn.admin'})
+      admin_inject_json_ams_array opts[:module], "producers", @producers, Api::Admin::IdNameSerializer
     end
 
     def admin_inject_enterprise_permissions
@@ -49,7 +49,7 @@ module Admin
     end
 
     def admin_inject_hub_permissions
-      render partial: "admin/json/injection_ams", locals: {ngModule: "ofn.admin", name: "hubPermissions", json: @hub_permissions.to_json}
+      render partial: "admin/json/injection_ams", locals: {ngModule: "admin.variantOverrides", name: "hubPermissions", json: @hub_permissions.to_json}
     end
 
     def admin_inject_products
@@ -69,7 +69,7 @@ module Admin
     end
 
     def admin_inject_variant_overrides
-      admin_inject_json_ams_array "ofn.admin", "variantOverrides", @variant_overrides, Api::Admin::VariantOverrideSerializer
+      admin_inject_json_ams_array "admin.variantOverrides", "variantOverrides", @variant_overrides, Api::Admin::VariantOverrideSerializer
     end
 
     def admin_inject_order_cycle_instance
@@ -85,7 +85,7 @@ module Admin
     end
 
     def admin_inject_spree_api_key
-      render partial: "admin/json/injection_ams", locals: {ngModule: 'ofn.admin', name: 'SpreeApiKey', json: "'#{@spree_api_key.to_s}'"}
+      render partial: "admin/json/injection_ams", locals: {ngModule: 'admin.indexUtils', name: 'SpreeApiKey', json: "'#{@spree_api_key.to_s}'"}
     end
 
     def admin_inject_json_ams(ngModule, name, data, serializer, opts = {})
diff --git a/app/views/admin/variant_overrides/_data.html.haml b/app/views/admin/variant_overrides/_data.html.haml
index 3b5f7f125c..64a7619ea7 100644
--- a/app/views/admin/variant_overrides/_data.html.haml
+++ b/app/views/admin/variant_overrides/_data.html.haml
@@ -1,5 +1,5 @@
 = admin_inject_spree_api_key
-= admin_inject_hubs
+= admin_inject_hubs module: 'admin.variantOverrides'
 = admin_inject_hub_permissions
-= admin_inject_producers
+= admin_inject_producers module: 'admin.variantOverrides'
 = admin_inject_variant_overrides
diff --git a/app/views/admin/variant_overrides/index.html.haml b/app/views/admin/variant_overrides/index.html.haml
index 8d7fc4e0b1..38563d00a2 100644
--- a/app/views/admin/variant_overrides/index.html.haml
+++ b/app/views/admin/variant_overrides/index.html.haml
@@ -1,7 +1,7 @@
 = render 'admin/variant_overrides/header'
 = render 'admin/variant_overrides/data'
 
-%div{ ng: { app: 'ofn.admin', controller: 'AdminVariantOverridesCtrl', init: 'initialise()' } }
+%div{ ng: { app: 'admin.variantOverrides', controller: 'AdminVariantOverridesCtrl', init: 'initialise()' } }
   = render 'admin/variant_overrides/hub_choice'
 
   %div{ng: {show: 'hub'}}
diff --git a/spec/javascripts/unit/admin/controllers/variant_overrides_controller_spec.js.coffee b/spec/javascripts/unit/admin/controllers/variant_overrides_controller_spec.js.coffee
index bdb62e8d37..d553392de3 100644
--- a/spec/javascripts/unit/admin/controllers/variant_overrides_controller_spec.js.coffee
+++ b/spec/javascripts/unit/admin/controllers/variant_overrides_controller_spec.js.coffee
@@ -9,7 +9,7 @@ describe "VariantOverridesCtrl", ->
   variantOverrides = {}
 
   beforeEach ->
-    module 'ofn.admin'
+    module 'admin.variantOverrides'
     module ($provide) ->
       $provide.value 'SpreeApiKey', 'API_KEY'
       $provide.value 'variantOverrides', variantOverrides
@@ -54,4 +54,4 @@ describe "VariantOverridesCtrl", ->
         expect(scope.updateError(data, 400)).toEqual "I had some trouble saving: Hub can't be blank, Variant can't be blank"
 
       it "returns a generic message otherwise", ->
-        expect(scope.updateError({}, 500)).toEqual "Oh no! I was unable to save your changes."
\ No newline at end of file
+        expect(scope.updateError({}, 500)).toEqual "Oh no! I was unable to save your changes."
diff --git a/spec/javascripts/unit/admin/services/dirty_variant_overrides_spec.js.coffee b/spec/javascripts/unit/admin/services/dirty_variant_overrides_spec.js.coffee
index 653560a989..553bba5713 100644
--- a/spec/javascripts/unit/admin/services/dirty_variant_overrides_spec.js.coffee
+++ b/spec/javascripts/unit/admin/services/dirty_variant_overrides_spec.js.coffee
@@ -7,7 +7,7 @@ describe "maintaining a list of dirty variant overrides", ->
     count_on_hand: 4
 
   beforeEach ->
-    module "ofn.admin"
+    module "admin.variantOverrides"
 
   beforeEach inject (_DirtyVariantOverrides_) ->
     DirtyVariantOverrides = _DirtyVariantOverrides_
diff --git a/spec/javascripts/unit/admin/services/indexer_spec.js.coffee b/spec/javascripts/unit/admin/services/indexer_spec.js.coffee
index f17f8bd83c..22f263e02b 100644
--- a/spec/javascripts/unit/admin/services/indexer_spec.js.coffee
+++ b/spec/javascripts/unit/admin/services/indexer_spec.js.coffee
@@ -2,7 +2,7 @@ describe "indexer", ->
   Indexer = null
 
   beforeEach ->
-    module "ofn.admin"
+    module "admin.indexUtils"
 
   beforeEach inject (_Indexer_) ->
     Indexer = _Indexer_
diff --git a/spec/javascripts/unit/admin/services/variant_overrides_spec.js.coffee b/spec/javascripts/unit/admin/services/variant_overrides_spec.js.coffee
index 532bb1d65c..b379dc5915 100644
--- a/spec/javascripts/unit/admin/services/variant_overrides_spec.js.coffee
+++ b/spec/javascripts/unit/admin/services/variant_overrides_spec.js.coffee
@@ -7,7 +7,7 @@ describe "VariantOverrides service", ->
   ]
 
   beforeEach ->
-    module "ofn.admin"
+    module "admin.variantOverrides"
     module ($provide) ->
       $provide.value "variantOverrides", variantOverrides
       null