Skip to content

Commit d7b859c

Browse files
KaseyPowersrobmcguinness
KaseyPowers
authored and
robmcguinness
committed
refactor(api-core): pass config object to core classes
BREAKING CHANGE: Options to core classes are being passed in as config object instead of parameters.
1 parent a48a072 commit d7b859c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+758
-187
lines changed

‎packages/api-angular/src/api.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ function factory($http, $q, avApiOptions) {
99
throw new Error('[options] cannot be null or undefined');
1010
}
1111
options = angular.merge({}, avApiOptions, options);
12-
super($http, $q, options);
12+
13+
super({
14+
http: $http,
15+
promise: $q,
16+
merge: angular.merge,
17+
config: options,
18+
});
1319
}
1420
}
1521
return AvApi;

‎packages/api-angular/src/logs.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@ import angular from 'angular';
22
import { AvLogMessages } from '@availity/api-core';
33

44
export default ($http, $q, avApiOptions) =>
5-
new AvLogMessages($http, $q, angular.copy(avApiOptions));
5+
new AvLogMessages({
6+
http: $http,
7+
promise: $q,
8+
merge: angular.merge,
9+
config: angular.copy(avApiOptions),
10+
});

‎packages/api-angular/src/navigation.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ import angular from 'angular';
33
import { AvNavigation } from '@availity/api-core';
44

55
export default ($http, $q, avApiOptions) =>
6-
new AvNavigation($http, $q, angular.copy(avApiOptions));
6+
new AvNavigation({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
config: angular.copy(avApiOptions),
11+
});

‎packages/api-angular/src/notification.js

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@ import angular from 'angular';
22

33
import { AvNotification } from '@availity/api-core';
44

5-
function factory($http, $q, avApiOptions) {
6-
class AvNotificationApi extends AvNotification {
7-
constructor() {
8-
const theseOptions = angular.copy(avApiOptions);
9-
super($http, $q, theseOptions);
10-
}
11-
}
12-
return new AvNotificationApi();
13-
}
14-
export default factory;
5+
export default ($http, $q, avApiOptions) =>
6+
new AvNotification({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
config: angular.copy(avApiOptions),
11+
});

‎packages/api-angular/src/organizations.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@ import angular from 'angular';
33
import { AvOrganizations } from '@availity/api-core';
44

55
export default ($http, $q, avUsersApi, avApiOptions) =>
6-
new AvOrganizations($http, $q, avUsersApi, angular.copy(avApiOptions));
6+
new AvOrganizations({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
avUsers: avUsersApi,
11+
config: angular.copy(avApiOptions),
12+
});

‎packages/api-angular/src/pdfs.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ import angular from 'angular';
33
import { AvPdf } from '@availity/api-core';
44

55
export default ($http, $q, avApiOptions) =>
6-
new AvPdf($http, $q, angular.copy(avApiOptions));
6+
new AvPdf({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
config: angular.copy(avApiOptions),
11+
});

‎packages/api-angular/src/permissions.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ import angular from 'angular';
33
import { AvPermissions } from '@availity/api-core';
44

55
export default ($http, $q, avApiOptions) =>
6-
new AvPermissions($http, $q, angular.copy(avApiOptions));
6+
new AvPermissions({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
config: angular.copy(avApiOptions),
11+
});

‎packages/api-angular/src/providers.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ import angular from 'angular';
33
import { AvProviders } from '@availity/api-core';
44

55
export default ($http, $q, avApiOptions) =>
6-
new AvProviders($http, $q, angular.copy(avApiOptions));
6+
new AvProviders({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
config: angular.copy(avApiOptions),
11+
});

‎packages/api-angular/src/proxy.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ function factory($http, $q, avApiOptions) {
66
class AvProxyApi extends AvProxy {
77
constructor(options) {
88
options = angular.merge({}, avApiOptions, options);
9-
super($http, $q, options);
9+
super({
10+
http: $http,
11+
promise: $q,
12+
merge: angular.merge,
13+
config: options,
14+
});
1015
}
1116
}
1217
return AvProxyApi;

‎packages/api-angular/src/regions.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,10 @@ import angular from 'angular';
33
import { AvRegions } from '@availity/api-core';
44

55
export default ($http, $q, avUsersApi, avApiOptions) =>
6-
new AvRegions($http, $q, avUsersApi, angular.copy(avApiOptions));
6+
new AvRegions({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
avUsers: avUsersApi,
11+
config: angular.copy(avApiOptions),
12+
});

‎packages/api-angular/src/spaces.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,10 @@ import angular from 'angular';
22

33
import { AvSpaces } from '@availity/api-core';
44

5-
function factory($http, $q, avApiOptions) {
6-
class AvSpacesApi extends AvSpaces {
7-
constructor() {
8-
const options = angular.copy(avApiOptions);
9-
super($http, $q, options);
10-
}
11-
}
12-
return new AvSpacesApi();
13-
}
14-
15-
export default factory;
5+
export default ($http, $q, avApiOptions) =>
6+
new AvSpaces({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
config: angular.copy(avApiOptions),
11+
});

‎packages/api-angular/src/user.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ import angular from 'angular';
33
import { AvUsers } from '@availity/api-core';
44

55
export default ($http, $q, avApiOptions) =>
6-
new AvUsers($http, $q, angular.copy(avApiOptions));
6+
new AvUsers({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
config: angular.copy(avApiOptions),
11+
});

‎packages/api-angular/src/userPermissions.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ import angular from 'angular';
33
import { AvUserPermissions } from '@availity/api-core';
44

55
export default ($http, $q, avApiOptions) =>
6-
new AvUserPermissions($http, $q, angular.copy(avApiOptions));
6+
new AvUserPermissions({
7+
http: $http,
8+
promise: $q,
9+
merge: angular.merge,
10+
config: angular.copy(avApiOptions),
11+
});

‎packages/api-axios/src/api.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
import axios from 'axios';
2-
2+
import utils from 'axios/lib/utils';
33
import Api from '@availity/api-core';
44

5+
const { merge } = utils;
6+
57
export default class AvApi extends Api {
68
constructor(options) {
7-
super(axios, Promise, options);
9+
super({
10+
http: axios,
11+
promise: Promise,
12+
merge,
13+
config: options,
14+
});
815
}
916
}

‎packages/api-axios/src/logs.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import axios from 'axios';
2-
2+
import utils from 'axios/lib/utils';
33
import { AvLogMessages } from '@availity/api-core';
44

5-
export default new AvLogMessages(axios, Promise);
5+
const { merge } = utils;
6+
7+
export default new AvLogMessages({
8+
http: axios,
9+
promise: Promise,
10+
merge,
11+
});

‎packages/api-axios/src/navigation.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
import axios from 'axios';
2+
import utils from 'axios/lib/utils';
23
import { AvNavigation } from '@availity/api-core';
34

4-
export default new AvNavigation(axios, Promise);
5+
const { merge } = utils;
6+
export default new AvNavigation({
7+
http: axios,
8+
promise: Promise,
9+
merge,
10+
});

‎packages/api-axios/src/notification.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import axios from 'axios';
2-
2+
import utils from 'axios/lib/utils';
33
import { AvNotification } from '@availity/api-core';
44

5+
const { merge } = utils;
56
class AvNotificationApi extends AvNotification {
67
constructor(options) {
7-
super(axios, Promise, options);
8+
super({
9+
http: axios,
10+
promise: Promise,
11+
merge,
12+
config: options,
13+
});
814
}
915
}
1016

‎packages/api-axios/src/organizations.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import axios from 'axios';
2-
2+
import utils from 'axios/lib/utils';
33
import { AvOrganizations } from '@availity/api-core';
44
import avUserApi from './user';
55

6-
export default new AvOrganizations(axios, Promise, avUserApi);
6+
const { merge } = utils;
7+
export default new AvOrganizations({
8+
http: axios,
9+
promise: Promise,
10+
merge,
11+
avUsers: avUserApi,
12+
});

‎packages/api-axios/src/pdf.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
import axios from 'axios';
2+
import utils from 'axios/lib/utils';
23
import { AvPdf } from '@availity/api-core';
34

4-
export default new AvPdf(axios, Promise);
5+
const { merge } = utils;
6+
export default new AvPdf({
7+
http: axios,
8+
promise: Promise,
9+
merge,
10+
});

‎packages/api-axios/src/permissions.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
import axios from 'axios';
2+
import utils from 'axios/lib/utils';
23
import { AvPermissions } from '@availity/api-core';
34

4-
export default new AvPermissions(axios, Promise);
5+
const { merge } = utils;
6+
export default new AvPermissions({
7+
http: axios,
8+
promise: Promise,
9+
merge,
10+
});

‎packages/api-axios/src/providers.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import axios from 'axios';
2-
2+
import utils from 'axios/lib/utils';
33
import { AvProviders } from '@availity/api-core';
44

5-
export default new AvProviders(axios, Promise);
5+
const { merge } = utils;
6+
export default new AvProviders({
7+
http: axios,
8+
promise: Promise,
9+
merge,
10+
});

‎packages/api-axios/src/proxy.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
import axios from 'axios';
2-
2+
import utils from 'axios/lib/utils';
33
import { AvProxy } from '@availity/api-core';
44

5+
const { merge } = utils;
56
export default class AvProxyApi extends AvProxy {
67
constructor(options) {
7-
super(axios, Promise, options);
8+
super({
9+
http: axios,
10+
promise: Promise,
11+
merge,
12+
config: options,
13+
});
814
}
915
}

‎packages/api-axios/src/regions.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
import axios from 'axios';
2+
import utils from 'axios/lib/utils';
23
import { AvRegions } from '@availity/api-core';
34
import userApi from './user';
45

5-
export default new AvRegions(axios, Promise, userApi);
6+
const { merge } = utils;
7+
export default new AvRegions({
8+
http: axios,
9+
promise: Promise,
10+
merge,
11+
avUsers: userApi,
12+
});

‎packages/api-axios/src/spaces.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
import axios from 'axios';
2+
import utils from 'axios/lib/utils';
23
import { AvSpaces } from '@availity/api-core';
34

4-
export default new AvSpaces(axios, Promise);
5+
const { merge } = utils;
6+
export default new AvSpaces({
7+
http: axios,
8+
promise: Promise,
9+
merge,
10+
});

‎packages/api-axios/src/user.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
import axios from 'axios';
2+
import utils from 'axios/lib/utils';
23
import { AvUsers } from '@availity/api-core';
34

4-
export default new AvUsers(axios, Promise);
5+
const { merge } = utils;
6+
export default new AvUsers({
7+
http: axios,
8+
promise: Promise,
9+
merge,
10+
});

‎packages/api-axios/src/userPermissions.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
import axios from 'axios';
2+
import utils from 'axios/lib/utils';
23
import { AvUserPermissions } from '@availity/api-core';
34

4-
export default new AvUserPermissions(axios, Promise);
5+
const { merge } = utils;
6+
export default new AvUserPermissions({
7+
http: axios,
8+
promise: Promise,
9+
merge,
10+
});

0 commit comments

Comments
 (0)