Move variables to cartEvents.js to avoid circular dependency

CruGlobal · Dec 19, 2024 · 545412e · 545412e
1 parent 4408c96
commit 545412e
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 12 deletions.
diff --git a/src/app/cart/cart.component.js b/src/app/cart/cart.component.js
@@ -10,7 +10,7 @@ import productModalService from 'common/services/productModal.service'
 import desigSrcDirective from 'common/directives/desigSrc.directive'
 
 import displayRateTotals from 'common/components/displayRateTotals/displayRateTotals.component'
-import { cartUpdatedEvent } from 'common/components/nav/navCart/navCart.component'
+import { cartUpdatedEvent } from 'common/lib/cartEvents'
 
 import analyticsFactory from 'app/analytics/analytics.factory'
 

diff --git a/src/app/cart/cart.component.spec.js b/src/app/cart/cart.component.spec.js
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs/Observable'
 import 'rxjs/add/observable/of'
 import 'rxjs/add/observable/throw'
 
-import { cartUpdatedEvent } from 'common/components/nav/navCart/navCart.component'
+import { cartUpdatedEvent } from 'common/lib/cartEvents'
 
 describe('cart', () => {
   beforeEach(angular.mock.module(module.name))

diff --git a/src/app/productConfig/productConfigForm/productConfigForm.component.js b/src/app/productConfig/productConfigForm/productConfigForm.component.js
@@ -27,7 +27,7 @@ import {
 } from 'common/services/giftHelpers/giftDates.service'
 import desigSrcDirective from 'common/directives/desigSrc.directive'
 import showErrors from 'common/filters/showErrors.filter'
-import { giftAddedEvent, cartUpdatedEvent } from 'common/components/nav/navCart/navCart.component'
+import { giftAddedEvent, cartUpdatedEvent } from 'common/lib/cartEvents'
 import { giveGiftParams } from '../giveGiftParams'
 import loading from 'common/components/loading/loading.component'
 import analyticsFactory from 'app/analytics/analytics.factory'

diff --git a/src/app/productConfig/productConfigForm/productConfigForm.component.spec.js b/src/app/productConfig/productConfigForm/productConfigForm.component.spec.js
@@ -7,7 +7,7 @@ import 'rxjs/add/observable/of'
 import 'rxjs/add/observable/throw'
 
 import module, { brandedCoverFeeCheckedEvent } from './productConfigForm.component'
-import { giftAddedEvent, cartUpdatedEvent } from 'common/components/nav/navCart/navCart.component'
+import { giftAddedEvent, cartUpdatedEvent } from 'common/lib/cartEvents'
 import { giveGiftParams } from '../giveGiftParams'
 import { brandedCheckoutAmountUpdatedEvent } from '../../../common/components/paymentMethods/coverFees/coverFees.component'
 

diff --git a/src/app/profile/yourGiving/giveOneTimeGift/giveOneTimeGift.modal.component.js b/src/app/profile/yourGiving/giveOneTimeGift/giveOneTimeGift.modal.component.js
@@ -5,7 +5,7 @@ import concat from 'lodash/concat'
 import step1SelectRecentRecipients from './step1/selectRecentRecipients.component'
 import step1SearchRecipients from './step1/searchRecipients.component'
 import step2EnterAmounts from './step2/enterAmounts.component'
-import { giftAddedEvent } from 'common/components/nav/navCart/navCart.component'
+import { giftAddedEvent } from 'common/lib/cartEvents'
 
 import RecurringGiftModel from 'common/models/recurringGift.model'
 

diff --git a/src/app/profile/yourGiving/giveOneTimeGift/giveOneTimeGift.modal.component.spec.js b/src/app/profile/yourGiving/giveOneTimeGift/giveOneTimeGift.modal.component.spec.js
@@ -6,7 +6,7 @@ import 'rxjs/add/observable/from'
 import 'rxjs/add/observable/throw'
 
 import RecurringGiftModel from 'common/models/recurringGift.model'
-import { giftAddedEvent } from 'common/components/nav/navCart/navCart.component'
+import { giftAddedEvent } from 'common/lib/cartEvents'
 
 import module from './giveOneTimeGift.modal.component'
 

diff --git a/src/common/components/nav/navCart/navCart.component.js b/src/common/components/nav/navCart/navCart.component.js
@@ -7,9 +7,7 @@ import orderService from 'common/services/api/order.service'
 import analyticsFactory from 'app/analytics/analytics.factory'
 
 import template from './navCart.tpl.html'
-
-export const giftAddedEvent = 'giftAddedToCart'
-export const cartUpdatedEvent = 'cartUpdatedEvent'
+import { giftAddedEvent, cartUpdatedEvent } from 'common/lib/cartEvents'
 
 const componentName = 'navCart'
 

diff --git a/src/common/components/nav/navCart/navCart.component.spec.js b/src/common/components/nav/navCart/navCart.component.spec.js
@@ -4,7 +4,8 @@ import { Observable } from 'rxjs/Observable'
 import { Subject } from 'rxjs/Subject'
 import 'rxjs/add/observable/of'
 import 'rxjs/add/observable/throw'
-import module, { giftAddedEvent, cartUpdatedEvent } from './navCart.component'
+import module from './navCart.component'
+import { giftAddedEvent, cartUpdatedEvent } from 'common/lib/cartEvents'
 
 describe('navCart', () => {
   beforeEach(angular.mock.module(module.name))

diff --git a/src/common/components/nav/navCartIcon.component.js b/src/common/components/nav/navCartIcon.component.js
@@ -1,6 +1,7 @@
 import angular from 'angular'
 
-import navCart, { giftAddedEvent, cartUpdatedEvent } from 'common/components/nav/navCart/navCart.component'
+import navCart from 'common/components/nav/navCart/navCart.component'
+import { giftAddedEvent, cartUpdatedEvent } from 'common/lib/cartEvents'
 import uibDropdown from 'angular-ui-bootstrap/src/dropdown'
 import analyticsFactory from 'app/analytics/analytics.factory'
 

diff --git a/src/common/components/nav/navCartIcon.component.spec.js b/src/common/components/nav/navCartIcon.component.spec.js
@@ -2,7 +2,7 @@ import angular from 'angular'
 import 'angular-mocks'
 import module from './navCartIcon.component'
 
-import { giftAddedEvent, cartUpdatedEvent } from 'common/components/nav/navCart/navCart.component'
+import { giftAddedEvent, cartUpdatedEvent } from 'common/lib/cartEvents'
 
 describe('nav cart icon', function () {
   beforeEach(angular.mock.module(module.name))

diff --git a/src/common/lib/cartEvents.js b/src/common/lib/cartEvents.js
@@ -0,0 +1,2 @@
+export const giftAddedEvent = 'giftAddedToCart'
+export const cartUpdatedEvent = 'cartUpdatedEvent'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export const giftAddedEvent = 'giftAddedToCart'
		export const cartUpdatedEvent = 'cartUpdatedEvent'