fix(api-axios): replace axios merge with deep-assign

TheSharpieOne · TheSharpieOne · commit a7183b10e000 · 2018-08-06T12:21:15.000-04:00
axios merge does not do deep merges and does not work with arrays (at any level)
This fixes pollng as the pollingIntervals array was previouslly being transformed into a object and now it will remain an array.
diff --git a/packages/api-axios/package.json b/packages/api-axios/package.json
@@ -5,6 +5,9 @@
   "main": "src/index.js",
   "author": "Kasey Powers <kasey.powers@availity.com>",
   "license": "MIT",
+  "dependencies": {
+    "deep-assign": "^2.0.0"
+  },
   "peerDependencies": {
     "@availity/api-core": "^2.0.1",
     "axios": "^0.16.0 || ^0.17.0"
diff --git a/packages/api-axios/src/api.js b/packages/api-axios/src/api.js
@@ -1,9 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import Api from '@availity/api-core';
 
-const { merge } = utils;
-
 export default class AvApi extends Api {
   constructor(options) {
     super({
diff --git a/packages/api-axios/src/files.js b/packages/api-axios/src/files.js
@@ -1,9 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvFiles } from '@availity/api-core';
 
-const { merge } = utils;
-
 export default new AvFiles({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/logs.js b/packages/api-axios/src/logs.js
@@ -1,9 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvLogMessages } from '@availity/api-core';
 
-const { merge } = utils;
-
 export default new AvLogMessages({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/ms.js b/packages/api-axios/src/ms.js
@@ -1,9 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvMicroservice } from '@availity/api-core';
 
-const { merge } = utils;
-
 export default class AvMicroserviceApi extends AvMicroservice {
   constructor(options) {
     super({
diff --git a/packages/api-axios/src/navigation.js b/packages/api-axios/src/navigation.js
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvNavigation } from '@availity/api-core';
 
-const { merge } = utils;
 export default new AvNavigation({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/notification.js b/packages/api-axios/src/notification.js
@@ -1,9 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvNotification } from '@availity/api-core';
 
-const { merge } = utils;
-
 class AvNotificationApi extends AvNotification {
   constructor(options) {
     super({
diff --git a/packages/api-axios/src/organizations.js b/packages/api-axios/src/organizations.js
@@ -1,9 +1,8 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvOrganizations } from '@availity/api-core';
 import avUserApi from './user';
 
-const { merge } = utils;
 export default new AvOrganizations({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/pdf.js b/packages/api-axios/src/pdf.js
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvPdf } from '@availity/api-core';
 
-const { merge } = utils;
 export default new AvPdf({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/permissions.js b/packages/api-axios/src/permissions.js
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvPermissions } from '@availity/api-core';
 
-const { merge } = utils;
 export default new AvPermissions({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/providers.js b/packages/api-axios/src/providers.js
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvProviders } from '@availity/api-core';
 
-const { merge } = utils;
 export default new AvProviders({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/proxy.js b/packages/api-axios/src/proxy.js
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvProxy } from '@availity/api-core';
 
-const { merge } = utils;
 export default class AvProxyApi extends AvProxy {
   constructor(options) {
     super({
diff --git a/packages/api-axios/src/regions.js b/packages/api-axios/src/regions.js
@@ -1,9 +1,8 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvRegions } from '@availity/api-core';
 import userApi from './user';
 
-const { merge } = utils;
 export default new AvRegions({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/settings.js b/packages/api-axios/src/settings.js
@@ -1,9 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvSettings } from '@availity/api-core';
 
-const { merge } = utils;
-
 export default new AvSettings({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/spaces.js b/packages/api-axios/src/spaces.js
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvSpaces } from '@availity/api-core';
 
-const { merge } = utils;
 export default new AvSpaces({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/user.js b/packages/api-axios/src/user.js
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvUsers } from '@availity/api-core';
 
-const { merge } = utils;
 export default new AvUsers({
   http: axios,
   promise: Promise,
diff --git a/packages/api-axios/src/userPermissions.js b/packages/api-axios/src/userPermissions.js
@@ -1,8 +1,7 @@
 import axios from 'axios';
-import utils from 'axios/lib/utils';
+import merge from 'deep-assign';
 import { AvUserPermissions } from '@availity/api-core';
 
-const { merge } = utils;
 export default new AvUserPermissions({
   http: axios,
   promise: Promise,
