Commit b5d99e504fea132d5b1180e0de92b681f22175f1

Authored by deaflynx
1 parent eacb7dcb

Minor naming change in default edge rule chains

@@ -1461,7 +1461,7 @@ @@ -1461,7 +1461,7 @@
1461 }, 1461 },
1462 "enabled": { 1462 "enabled": {
1463 "version": "1.0.2", 1463 "version": "1.0.2",
1464 - "resolved": "http://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz", 1464 + "resolved": "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz",
1465 "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=", 1465 "integrity": "sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=",
1466 "requires": { 1466 "requires": {
1467 "env-variable": "0.0.x" 1467 "env-variable": "0.0.x"
@@ -1740,7 +1740,7 @@ @@ -1740,7 +1740,7 @@
1740 }, 1740 },
1741 "fecha": { 1741 "fecha": {
1742 "version": "2.3.3", 1742 "version": "2.3.3",
1743 - "resolved": "http://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz", 1743 + "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
1744 "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==" 1744 "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
1745 }, 1745 },
1746 "file-stream-rotator": { 1746 "file-stream-rotator": {
@@ -2390,7 +2390,7 @@ @@ -2390,7 +2390,7 @@
2390 }, 2390 },
2391 "get-stream": { 2391 "get-stream": {
2392 "version": "3.0.0", 2392 "version": "3.0.0",
2393 - "resolved": "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", 2393 + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
2394 "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", 2394 "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
2395 "dev": true 2395 "dev": true
2396 }, 2396 },
@@ -2547,7 +2547,7 @@ @@ -2547,7 +2547,7 @@
2547 }, 2547 },
2548 "got": { 2548 "got": {
2549 "version": "6.7.1", 2549 "version": "6.7.1",
2550 - "resolved": "http://registry.npmjs.org/got/-/got-6.7.1.tgz", 2550 + "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
2551 "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", 2551 "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
2552 "dev": true, 2552 "dev": true,
2553 "requires": { 2553 "requires": {
@@ -2879,7 +2879,7 @@ @@ -2879,7 +2879,7 @@
2879 }, 2879 },
2880 "is-obj": { 2880 "is-obj": {
2881 "version": "1.0.1", 2881 "version": "1.0.1",
2882 - "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", 2882 + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
2883 "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", 2883 "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
2884 "dev": true 2884 "dev": true
2885 }, 2885 },
@@ -3241,7 +3241,7 @@ @@ -3241,7 +3241,7 @@
3241 }, 3241 },
3242 "minimist": { 3242 "minimist": {
3243 "version": "1.2.0", 3243 "version": "1.2.0",
3244 - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", 3244 + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
3245 "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" 3245 "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
3246 }, 3246 },
3247 "mixin-deep": { 3247 "mixin-deep": {
@@ -3540,7 +3540,7 @@ @@ -3540,7 +3540,7 @@
3540 }, 3540 },
3541 "path-is-absolute": { 3541 "path-is-absolute": {
3542 "version": "1.0.1", 3542 "version": "1.0.1",
3543 - "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", 3543 + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
3544 "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", 3544 "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
3545 "dev": true 3545 "dev": true
3546 }, 3546 },
@@ -3979,7 +3979,7 @@ @@ -3979,7 +3979,7 @@
3979 }, 3979 },
3980 "safe-regex": { 3980 "safe-regex": {
3981 "version": "1.1.0", 3981 "version": "1.1.0",
3982 - "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", 3982 + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
3983 "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", 3983 "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
3984 "dev": true, 3984 "dev": true,
3985 "requires": { 3985 "requires": {
@@ -4289,7 +4289,7 @@ @@ -4289,7 +4289,7 @@
4289 }, 4289 },
4290 "strip-eof": { 4290 "strip-eof": {
4291 "version": "1.0.0", 4291 "version": "1.0.0",
4292 - "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", 4292 + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
4293 "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", 4293 "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
4294 "dev": true 4294 "dev": true
4295 }, 4295 },
@@ -5238,8 +5238,7 @@ @@ -5238,8 +5238,7 @@
5238 "ansi-regex": { 5238 "ansi-regex": {
5239 "version": "2.1.1", 5239 "version": "2.1.1",
5240 "bundled": true, 5240 "bundled": true,
5241 - "dev": true,  
5242 - "optional": true 5241 + "dev": true
5243 }, 5242 },
5244 "aproba": { 5243 "aproba": {
5245 "version": "1.2.0", 5244 "version": "1.2.0",
@@ -5650,8 +5649,7 @@ @@ -5650,8 +5649,7 @@
5650 "safe-buffer": { 5649 "safe-buffer": {
5651 "version": "5.1.2", 5650 "version": "5.1.2",
5652 "bundled": true, 5651 "bundled": true,
5653 - "dev": true,  
5654 - "optional": true 5652 + "dev": true
5655 }, 5653 },
5656 "safer-buffer": { 5654 "safer-buffer": {
5657 "version": "2.1.2", 5655 "version": "2.1.2",
@@ -5706,7 +5704,6 @@ @@ -5706,7 +5704,6 @@
5706 "version": "3.0.1", 5704 "version": "3.0.1",
5707 "bundled": true, 5705 "bundled": true,
5708 "dev": true, 5706 "dev": true,
5709 - "optional": true,  
5710 "requires": { 5707 "requires": {
5711 "ansi-regex": "^2.0.0" 5708 "ansi-regex": "^2.0.0"
5712 } 5709 }
@@ -5750,14 +5747,12 @@ @@ -5750,14 +5747,12 @@
5750 "wrappy": { 5747 "wrappy": {
5751 "version": "1.0.2", 5748 "version": "1.0.2",
5752 "bundled": true, 5749 "bundled": true,
5753 - "dev": true,  
5754 - "optional": true 5750 + "dev": true
5755 }, 5751 },
5756 "yallist": { 5752 "yallist": {
5757 "version": "3.1.1", 5753 "version": "3.1.1",
5758 "bundled": true, 5754 "bundled": true,
5759 - "dev": true,  
5760 - "optional": true 5755 + "dev": true
5761 } 5756 }
5762 } 5757 }
5763 }, 5758 },
@@ -335,7 +335,7 @@ export default function RuleChainsController(ruleChainService, userService, edge @@ -335,7 +335,7 @@ export default function RuleChainsController(ruleChainService, userService, edge
335 vm.grid = grid; 335 vm.grid = grid;
336 } 336 }
337 337
338 - function getDefaultEdges(ruleChains) { 338 + function mapRuleChainsWithDefaultEdges(ruleChains) {
339 var deferred = $q.defer(); 339 var deferred = $q.defer();
340 ruleChainService.getDefaultEdgeRuleChains(null).then( 340 ruleChainService.getDefaultEdgeRuleChains(null).then(
341 function success(response) { 341 function success(response) {
@@ -365,7 +365,7 @@ export default function RuleChainsController(ruleChainService, userService, edge @@ -365,7 +365,7 @@ export default function RuleChainsController(ruleChainService, userService, edge
365 var deferred = $q.defer(); 365 var deferred = $q.defer();
366 ruleChainService.getRuleChains(pageLink, null, type).then( 366 ruleChainService.getRuleChains(pageLink, null, type).then(
367 function success(ruleChains) { 367 function success(ruleChains) {
368 - getDefaultEdges(ruleChains).then( 368 + mapRuleChainsWithDefaultEdges(ruleChains).then(
369 function success(response) { 369 function success(response) {
370 deferred.resolve(response); 370 deferred.resolve(response);
371 }, function fail() { 371 }, function fail() {