简柏林 / thingskit · Commits

Commit fd5367b51f2dd20ee2902ae07c84e4b1aea276cd

Authored by Volodymyr Babak
1 parent 63e29c24

Code review changes

Inline Side-by-side
Showing 14 changed files with 146 additions and 186 deletions
... ... @@ -294,7 +294,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
294 294 }
295 295 try {
296 296 createRelation(tenantId, new EntityRelation(edgeId, assetId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
297   - } catch (ExecutionException | InterruptedException e) {
  297 + } catch (Exception e) {
298 298 log.warn("[{}] Failed to create asset relation. Edge Id: [{}]", assetId, edgeId);
299 299 throw new RuntimeException(e);
300 300 }
... ... @@ -313,7 +313,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
313 313
314 314 try {
315 315 deleteRelation(tenantId, new EntityRelation(edgeId, assetId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
316   - } catch (ExecutionException | InterruptedException e) {
  316 + } catch (Exception e) {
317 317 log.warn("[{}] Failed to delete asset relation. Edge Id: [{}]", assetId, edgeId);
318 318 throw new RuntimeException(e);
319 319 }
... ...
... ... @@ -123,7 +123,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
123 123 if (dashboard.addAssignedCustomer(customer)) {
124 124 try {
125 125 createRelation(tenantId, new EntityRelation(customerId, dashboardId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.DASHBOARD));
126   - } catch (ExecutionException | InterruptedException e) {
  126 + } catch (Exception e) {
127 127 log.warn("[{}] Failed to create dashboard relation. Customer Id: [{}]", dashboardId, customerId);
128 128 throw new RuntimeException(e);
129 129 }
... ... @@ -143,7 +143,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
143 143 if (dashboard.removeAssignedCustomer(customer)) {
144 144 try {
145 145 deleteRelation(tenantId, new EntityRelation(customerId, dashboardId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.DASHBOARD));
146   - } catch (ExecutionException | InterruptedException e) {
  146 + } catch (Exception e) {
147 147 log.warn("[{}] Failed to delete dashboard relation. Customer Id: [{}]", dashboardId, customerId);
148 148 throw new RuntimeException(e);
149 149 }
... ... @@ -237,7 +237,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
237 237 }
238 238 try {
239 239 createRelation(tenantId, new EntityRelation(edgeId, dashboardId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
240   - } catch (ExecutionException | InterruptedException e) {
  240 + } catch (Exception e) {
241 241 log.warn("[{}] Failed to create dashboard relation. Edge Id: [{}]", dashboardId, edgeId);
242 242 throw new RuntimeException(e);
243 243 }
... ... @@ -253,7 +253,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
253 253 }
254 254 try {
255 255 deleteRelation(tenantId, new EntityRelation(edgeId, dashboardId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
256   - } catch (ExecutionException | InterruptedException e) {
  256 + } catch (Exception e) {
257 257 log.warn("[{}] Failed to delete dashboard relation. Edge Id: [{}]", dashboardId, edgeId);
258 258 throw new RuntimeException(e);
259 259 }
... ...
... ... @@ -346,7 +346,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
346 346 }
347 347 try {
348 348 createRelation(tenantId, new EntityRelation(edgeId, deviceId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
349   - } catch (ExecutionException | InterruptedException e) {
  349 + } catch (Exception e) {
350 350 log.warn("[{}] Failed to create device relation. Edge Id: [{}]", deviceId, edgeId);
351 351 throw new RuntimeException(e);
352 352 }
... ... @@ -365,7 +365,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
365 365
366 366 try {
367 367 deleteRelation(tenantId, new EntityRelation(edgeId, deviceId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
368   - } catch (ExecutionException | InterruptedException e) {
  368 + } catch (Exception e) {
369 369 log.warn("[{}] Failed to delete device relation. Edge Id: [{}]", deviceId, edgeId);
370 370 throw new RuntimeException(e);
371 371 }
... ...
... ... @@ -314,7 +314,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
314 314
315 315 try {
316 316 createRelation(tenantId, new EntityRelation(edgeId, entityViewId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
317   - } catch (ExecutionException | InterruptedException e) {
  317 + } catch (Exception e) {
318 318 log.warn("[{}] Failed to create entityView relation. Edge Id: [{}]", entityViewId, edgeId);
319 319 throw new RuntimeException(e);
320 320 }
... ... @@ -330,7 +330,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
330 330 }
331 331 try {
332 332 deleteRelation(tenantId, new EntityRelation(edgeId, entityViewId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
333   - } catch (ExecutionException | InterruptedException e) {
  333 + } catch (Exception e) {
334 334 log.warn("[{}] Failed to delete entityView relation. Edge Id: [{}]", entityViewId, edgeId);
335 335 throw new RuntimeException(e);
336 336 }
... ...
... ... @@ -86,7 +86,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
86 86 try {
87 87 createRelation(ruleChain.getTenantId(), new EntityRelation(savedRuleChain.getTenantId(), savedRuleChain.getId(),
88 88 EntityRelation.CONTAINS_TYPE, RelationTypeGroup.RULE_CHAIN));
89   - } catch (ExecutionException | InterruptedException e) {
  89 + } catch (Exception e) {
90 90 log.warn("[{}] Failed to create tenant to root rule chain relation. from: [{}], to: [{}]",
91 91 savedRuleChain.getTenantId(), savedRuleChain.getId());
92 92 throw new RuntimeException(e);
... ... @@ -166,7 +166,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
166 166 try {
167 167 createRelation(tenantId, new EntityRelation(ruleChainMetaData.getRuleChainId(), savedNode.getId(),
168 168 EntityRelation.CONTAINS_TYPE, RelationTypeGroup.RULE_CHAIN));
169   - } catch (ExecutionException | InterruptedException e) {
  169 + } catch (Exception e) {
170 170 log.warn("[{}] Failed to create rule chain to rule node relation. from: [{}], to: [{}]",
171 171 ruleChainMetaData.getRuleChainId(), savedNode.getId());
172 172 throw new RuntimeException(e);
... ... @@ -194,7 +194,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
194 194 String type = nodeConnection.getType();
195 195 try {
196 196 createRelation(tenantId, new EntityRelation(from, to, type, RelationTypeGroup.RULE_NODE));
197   - } catch (ExecutionException | InterruptedException e) {
  197 + } catch (Exception e) {
198 198 log.warn("[{}] Failed to create rule node relation. from: [{}], to: [{}]", from, to);
199 199 throw new RuntimeException(e);
200 200 }
... ... @@ -207,7 +207,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
207 207 String type = nodeToRuleChainConnection.getType();
208 208 try {
209 209 createRelation(tenantId, new EntityRelation(from, to, type, RelationTypeGroup.RULE_NODE, nodeToRuleChainConnection.getAdditionalInfo()));
210   - } catch (ExecutionException | InterruptedException e) {
  210 + } catch (Exception e) {
211 211 log.warn("[{}] Failed to create rule node to rule chain relation. from: [{}], to: [{}]", from, to);
212 212 throw new RuntimeException(e);
213 213 }
... ... @@ -409,7 +409,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
409 409 }
410 410 try {
411 411 createRelation(tenantId, new EntityRelation(edgeId, ruleChainId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
412   - } catch (ExecutionException | InterruptedException e) {
  412 + } catch (Exception e) {
413 413 log.warn("[{}] Failed to create ruleChain relation. Edge Id: [{}]", ruleChainId, edgeId);
414 414 throw new RuntimeException(e);
415 415 }
... ... @@ -428,7 +428,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
428 428 }
429 429 try {
430 430 deleteRelation(tenantId, new EntityRelation(edgeId, ruleChainId, EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE));
431   - } catch (ExecutionException | InterruptedException e) {
  431 + } catch (Exception e) {
432 432 log.warn("[{}] Failed to delete rule chain relation. Edge Id: [{}]", ruleChainId, edgeId);
433 433 throw new RuntimeException(e);
434 434 }
... ... @@ -474,7 +474,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
474 474 ruleChain.setRoot(true);
475 475 ruleChainDao.save(tenantId, ruleChain);
476 476 return true;
477   - } catch (ExecutionException | InterruptedException e) {
  477 + } catch (Exception e) {
478 478 log.warn("Failed to set default root edge rule chain, ruleChainId: [{}]", ruleChainId, e);
479 479 throw new RuntimeException(e);
480 480 }
... ... @@ -488,7 +488,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
488 488 createRelation(tenantId, new EntityRelation(tenantId, ruleChainId,
489 489 EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE_DEFAULT_RULE_CHAIN));
490 490 return true;
491   - } catch (ExecutionException | InterruptedException e) {
  491 + } catch (Exception e) {
492 492 log.warn("Failed to add default edge rule chain, ruleChainId: [{}]", ruleChainId, e);
493 493 throw new RuntimeException(e);
494 494 }
... ... @@ -500,7 +500,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
500 500 deleteRelation(tenantId, new EntityRelation(tenantId, ruleChainId,
501 501 EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE_DEFAULT_RULE_CHAIN));
502 502 return true;
503   - } catch (ExecutionException | InterruptedException e) {
  503 + } catch (Exception e) {
504 504 log.warn("Failed to remove default edge rule chain, ruleChainId: [{}]", ruleChainId, e);
505 505 throw new RuntimeException(e);
506 506 }
... ...
... ... @@ -1095,12 +1095,12 @@
1095 1095 "@flowjs/ng-flow": {
1096 1096 "version": "2.7.8",
1097 1097 "resolved": "https://registry.npmjs.org/@flowjs/ng-flow/-/ng-flow-2.7.8.tgz",
1098   - "integrity": "sha1-HZ+dH4Ks2lNgMowxW6z9YNv9mBk="
  1098 + "integrity": "sha512-zO6jNvz41oMOJj9+1N+vLT0ytitbCtuGABJQRzQDOPXyRMmlSXfJ7om5oYOztyUFrr4jDpE4QFPt+r2/RFceCg=="
1099 1099 },
1100 1100 "@mrmlnc/readdir-enhanced": {
1101 1101 "version": "2.2.1",
1102 1102 "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
1103   - "integrity": "sha1-UkryQNGjYFJ7cwR17PoTRKpUDd4=",
  1103 + "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
1104 1104 "dev": true,
1105 1105 "requires": {
1106 1106 "call-me-maybe": "^1.0.1",
... ... @@ -1424,7 +1424,7 @@
1424 1424 "abbrev": {
1425 1425 "version": "1.1.1",
1426 1426 "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
1427   - "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
  1427 + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
1428 1428 },
1429 1429 "accepts": {
1430 1430 "version": "1.3.7",
... ... @@ -1534,7 +1534,7 @@
1534 1534 "angular-carousel": {
1535 1535 "version": "1.1.0",
1536 1536 "resolved": "https://registry.npmjs.org/angular-carousel/-/angular-carousel-1.1.0.tgz",
1537   - "integrity": "sha1-PmlA5ovRio85L8Qx2XGSrDSIMdE="
  1537 + "integrity": "sha512-UiLMgT7Ueqk4xpliF1gWt4dYKXezdJA1jyZPNsUWkOGO/dwLuKi284h3BgWl4CnaH7kEBw8L2gsBOyqbYaumNQ=="
1538 1538 },
1539 1539 "angular-cookies": {
1540 1540 "version": "1.5.8",
... ... @@ -1555,7 +1555,7 @@
1555 1555 }
1556 1556 },
1557 1557 "angular-fullscreen": {
1558   - "version": "git://github.com/fabiobiondi/angular-fullscreen.git#8217174565761d3566807bc60a73b5ca015b8cb6",
  1558 + "version": "git://github.com/fabiobiondi/angular-fullscreen.git#119b7fbac911d154fd56ace38ebe3432475e8a20",
1559 1559 "from": "git://github.com/fabiobiondi/angular-fullscreen.git#master"
1560 1560 },
1561 1561 "angular-gridster": {
... ... @@ -1629,7 +1629,7 @@
1629 1629 "angular-translate": {
1630 1630 "version": "2.18.1",
1631 1631 "resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.18.1.tgz",
1632   - "integrity": "sha1-sp7Q0vm6xEB156rTKEFmxZ4VB5E=",
  1632 + "integrity": "sha512-Mw0kFBqsv5j8ItL9IhRZunIlVmIRW6iFsiTmRs9wGr2QTt8z4rehYlWyHos8qnXc/kyOYJiW50iH50CSNHGB9A==",
1633 1633 "requires": {
1634 1634 "angular": ">=1.2.26 <=1.7"
1635 1635 }
... ... @@ -1637,7 +1637,7 @@
1637 1637 "angular-translate-handler-log": {
1638 1638 "version": "2.18.1",
1639 1639 "resolved": "https://registry.npmjs.org/angular-translate-handler-log/-/angular-translate-handler-log-2.18.1.tgz",
1640   - "integrity": "sha1-icu1mCeALYb4EVJ1+/iNbYiWsNQ=",
  1640 + "integrity": "sha512-TyKzCW4GubNazwCgLpCVXd2212CWdZOckf+aL5+gLuThPhVpOvlg18RSmz8MNPto3kwCcCw3LzShlZ6RX/MQRA==",
1641 1641 "requires": {
1642 1642 "angular-translate": "~2.18.1"
1643 1643 }
... ... @@ -1645,7 +1645,7 @@
1645 1645 "angular-translate-interpolation-messageformat": {
1646 1646 "version": "2.18.1",
1647 1647 "resolved": "https://registry.npmjs.org/angular-translate-interpolation-messageformat/-/angular-translate-interpolation-messageformat-2.18.1.tgz",
1648   - "integrity": "sha1-FsUq4MYcJA8PJBZKBSGUPPi6QI4=",
  1648 + "integrity": "sha512-SlmyxLB/UUy7FWoGx5QJHrhq8fUu/xzCR0h/ngexOtXZopQjs1vm+TrFZ69d4c/LI7C91sfP4mq4ES29o1xCxA==",
1649 1649 "requires": {
1650 1650 "angular-translate": "~2.18.1",
1651 1651 "messageformat": "~1.0.2"
... ... @@ -1654,7 +1654,7 @@
1654 1654 "angular-translate-loader-static-files": {
1655 1655 "version": "2.18.1",
1656 1656 "resolved": "https://registry.npmjs.org/angular-translate-loader-static-files/-/angular-translate-loader-static-files-2.18.1.tgz",
1657   - "integrity": "sha1-rQw8iDsYsIm9uNsCu9Nm2QP4V8w=",
  1657 + "integrity": "sha512-5MuyzAROfc493kjLjKlLGLBzXiRmZIFbcWZGutDRxW5SRXSpwrH0u0hh0ENNnUyUQbe2vUspHNPIuZqlq8qIhw==",
1658 1658 "requires": {
1659 1659 "angular-translate": "~2.18.1"
1660 1660 }
... ... @@ -1662,7 +1662,7 @@
1662 1662 "angular-translate-storage-cookie": {
1663 1663 "version": "2.18.1",
1664 1664 "resolved": "https://registry.npmjs.org/angular-translate-storage-cookie/-/angular-translate-storage-cookie-2.18.1.tgz",
1665   - "integrity": "sha1-j8vaspb6gkkOALQorxp0ahf0QVY=",
  1665 + "integrity": "sha512-wiMaF/0OGN/3ilaYunfsqdLNpfGZEJK0fj4zT8yjD3XPq7Q9kM88xZ4XJiWKgodZShBljGCRzqgQbKMF7d1MLw==",
1666 1666 "requires": {
1667 1667 "angular-cookies": ">=1.2.26 <1.8",
1668 1668 "angular-translate": "~2.18.1"
... ... @@ -1671,7 +1671,7 @@
1671 1671 "angular-translate-storage-local": {
1672 1672 "version": "2.18.1",
1673 1673 "resolved": "https://registry.npmjs.org/angular-translate-storage-local/-/angular-translate-storage-local-2.18.1.tgz",
1674   - "integrity": "sha1-lHQP5NgBq3gpopofBeHDkFTIcwM=",
  1674 + "integrity": "sha512-zPxcbIJ8tdWXtWNKLtaswynKid0w5le6WPMwiLWhgKPnyzOp/y5WLBW+JEfnZnkGE24yOGhJ6jVPgRNzelLgzg==",
1675 1675 "requires": {
1676 1676 "angular-translate": "~2.18.1",
1677 1677 "angular-translate-storage-cookie": "~2.18.1"
... ... @@ -1750,7 +1750,7 @@
1750 1750 "aproba": {
1751 1751 "version": "1.2.0",
1752 1752 "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
1753   - "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=",
  1753 + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
1754 1754 "dev": true
1755 1755 },
1756 1756 "are-we-there-yet": {
... ... @@ -1766,7 +1766,7 @@
1766 1766 "argparse": {
1767 1767 "version": "1.0.10",
1768 1768 "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
1769   - "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
  1769 + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
1770 1770 "dev": true,
1771 1771 "requires": {
1772 1772 "sprintf-js": "~1.0.2"
... ... @@ -1781,7 +1781,7 @@
1781 1781 "arr-flatten": {
1782 1782 "version": "1.1.0",
1783 1783 "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
1784   - "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
  1784 + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
1785 1785 "dev": true
1786 1786 },
1787 1787 "arr-union": {
... ... @@ -1893,7 +1893,7 @@
1893 1893 },
1894 1894 "util": {
1895 1895 "version": "0.10.3",
1896   - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz",
  1896 + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
1897 1897 "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
1898 1898 "dev": true,
1899 1899 "requires": {
... ... @@ -1958,7 +1958,7 @@
1958 1958 "atob": {
1959 1959 "version": "2.1.2",
1960 1960 "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
1961   - "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=",
  1961 + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
1962 1962 "dev": true
1963 1963 },
1964 1964 "attr-accept": {
... ... @@ -2174,7 +2174,7 @@
2174 2174 "base": {
2175 2175 "version": "0.11.2",
2176 2176 "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
2177   - "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
  2177 + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
2178 2178 "dev": true,
2179 2179 "requires": {
2180 2180 "cache-base": "^1.0.1",
... ... @@ -2198,7 +2198,7 @@
2198 2198 "is-accessor-descriptor": {
2199 2199 "version": "1.0.0",
2200 2200 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
2201   - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
  2201 + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
2202 2202 "dev": true,
2203 2203 "requires": {
2204 2204 "kind-of": "^6.0.0"
... ... @@ -2207,7 +2207,7 @@
2207 2207 "is-data-descriptor": {
2208 2208 "version": "1.0.0",
2209 2209 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
2210   - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
  2210 + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
2211 2211 "dev": true,
2212 2212 "requires": {
2213 2213 "kind-of": "^6.0.0"
... ... @@ -2216,7 +2216,7 @@
2216 2216 "is-descriptor": {
2217 2217 "version": "1.0.2",
2218 2218 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
2219   - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
  2219 + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
2220 2220 "dev": true,
2221 2221 "requires": {
2222 2222 "is-accessor-descriptor": "^1.0.0",
... ... @@ -2362,7 +2362,7 @@
2362 2362 "brace-expansion": {
2363 2363 "version": "1.1.11",
2364 2364 "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
2365   - "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
  2365 + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
2366 2366 "requires": {
2367 2367 "balanced-match": "^1.0.0",
2368 2368 "concat-map": "0.0.1"
... ... @@ -2586,7 +2586,7 @@
2586 2586 "cache-base": {
2587 2587 "version": "1.0.1",
2588 2588 "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
2589   - "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
  2589 + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
2590 2590 "dev": true,
2591 2591 "requires": {
2592 2592 "collection-visit": "^1.0.0",
... ... @@ -2617,7 +2617,7 @@
2617 2617 "dependencies": {
2618 2618 "callsites": {
2619 2619 "version": "2.0.0",
2620   - "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
  2620 + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
2621 2621 "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
2622 2622 "dev": true
2623 2623 }
... ... @@ -2794,7 +2794,7 @@
2794 2794 "class-utils": {
2795 2795 "version": "0.3.6",
2796 2796 "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
2797   - "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
  2797 + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
2798 2798 "dev": true,
2799 2799 "requires": {
2800 2800 "arr-union": "^3.1.0",
... ... @@ -3121,7 +3121,7 @@
3121 3121 "concat-stream": {
3122 3122 "version": "1.6.2",
3123 3123 "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
3124   - "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=",
  3124 + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
3125 3125 "dev": true,
3126 3126 "requires": {
3127 3127 "buffer-from": "^1.0.0",
... ... @@ -3181,7 +3181,7 @@
3181 3181 "content-type": {
3182 3182 "version": "1.0.4",
3183 3183 "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
3184   - "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
  3184 + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
3185 3185 "dev": true
3186 3186 },
3187 3187 "convert-source-map": {
... ... @@ -3208,7 +3208,7 @@
3208 3208 "copy-concurrently": {
3209 3209 "version": "1.0.5",
3210 3210 "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
3211   - "integrity": "sha1-kilzmMrjSTf8r9bsgTnBgFHwteA=",
  3211 + "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
3212 3212 "dev": true,
3213 3213 "requires": {
3214 3214 "aproba": "^1.1.1",
... ... @@ -3427,7 +3427,7 @@
3427 3427 "create-react-class": {
3428 3428 "version": "15.6.3",
3429 3429 "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
3430   - "integrity": "sha1-LXMjf7P5cK5uvgEanmb0bbyoADY=",
  3430 + "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
3431 3431 "requires": {
3432 3432 "fbjs": "^0.8.9",
3433 3433 "loose-envify": "^1.3.1",
... ... @@ -3555,7 +3555,7 @@
3555 3555 "debug": {
3556 3556 "version": "2.6.9",
3557 3557 "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
3558   - "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
  3558 + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
3559 3559 "dev": true,
3560 3560 "requires": {
3561 3561 "ms": "2.0.0"
... ... @@ -3633,7 +3633,7 @@
3633 3633 "define-property": {
3634 3634 "version": "2.0.2",
3635 3635 "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
3636   - "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
  3636 + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
3637 3637 "dev": true,
3638 3638 "requires": {
3639 3639 "is-descriptor": "^1.0.2",
... ... @@ -3643,7 +3643,7 @@
3643 3643 "is-accessor-descriptor": {
3644 3644 "version": "1.0.0",
3645 3645 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
3646   - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
  3646 + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
3647 3647 "dev": true,
3648 3648 "requires": {
3649 3649 "kind-of": "^6.0.0"
... ... @@ -3652,7 +3652,7 @@
3652 3652 "is-data-descriptor": {
3653 3653 "version": "1.0.0",
3654 3654 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
3655   - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
  3655 + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
3656 3656 "dev": true,
3657 3657 "requires": {
3658 3658 "kind-of": "^6.0.0"
... ... @@ -3661,7 +3661,7 @@
3661 3661 "is-descriptor": {
3662 3662 "version": "1.0.2",
3663 3663 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
3664   - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
  3664 + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
3665 3665 "dev": true,
3666 3666 "requires": {
3667 3667 "is-accessor-descriptor": "^1.0.0",
... ... @@ -3724,7 +3724,7 @@
3724 3724 "delegate": {
3725 3725 "version": "3.2.0",
3726 3726 "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
3727   - "integrity": "sha1-tmtxwxWFIuirV0T3INjKDCr1kWY="
  3727 + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
3728 3728 },
3729 3729 "delegates": {
3730 3730 "version": "1.0.0",
... ... @@ -3880,7 +3880,7 @@
3880 3880 "domain-browser": {
3881 3881 "version": "1.2.0",
3882 3882 "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
3883   - "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=",
  3883 + "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
3884 3884 "dev": true
3885 3885 },
3886 3886 "domelementtype": {
... ... @@ -4035,7 +4035,7 @@
4035 4035 "errno": {
4036 4036 "version": "0.1.7",
4037 4037 "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
4038   - "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
  4038 + "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
4039 4039 "dev": true,
4040 4040 "requires": {
4041 4041 "prr": "~1.0.1"
... ... @@ -4554,7 +4554,7 @@
4554 4554 "esrecurse": {
4555 4555 "version": "4.2.1",
4556 4556 "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
4557   - "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
  4557 + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
4558 4558 "dev": true,
4559 4559 "requires": {
4560 4560 "estraverse": "^4.1.0"
... ... @@ -4769,7 +4769,7 @@
4769 4769 "external-editor": {
4770 4770 "version": "2.2.0",
4771 4771 "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
4772   - "integrity": "sha1-BFURz9jRM/OEZnPRBHwVTiFK09U=",
  4772 + "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
4773 4773 "requires": {
4774 4774 "chardet": "^0.4.0",
4775 4775 "iconv-lite": "^0.4.17",
... ... @@ -5197,7 +5197,7 @@
5197 5197 "fs-readdir-recursive": {
5198 5198 "version": "1.1.0",
5199 5199 "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
5200   - "integrity": "sha1-4y/AMKLM7kSmtTcTCNpUvgs5fSc=",
  5200 + "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
5201 5201 "dev": true
5202 5202 },
5203 5203 "fs-write-stream-atomic": {
... ... @@ -5238,8 +5238,7 @@
5238 5238 "ansi-regex": {
5239 5239 "version": "2.1.1",
5240 5240 "bundled": true,
5241   - "dev": true,
5242   - "optional": true
  5241 + "dev": true
5243 5242 },
5244 5243 "aproba": {
5245 5244 "version": "1.2.0",
... ... @@ -5260,14 +5259,12 @@
5260 5259 "balanced-match": {
5261 5260 "version": "1.0.0",
5262 5261 "bundled": true,
5263   - "dev": true,
5264   - "optional": true
  5262 + "dev": true
5265 5263 },
5266 5264 "brace-expansion": {
5267 5265 "version": "1.1.11",
5268 5266 "bundled": true,
5269 5267 "dev": true,
5270   - "optional": true,
5271 5268 "requires": {
5272 5269 "balanced-match": "^1.0.0",
5273 5270 "concat-map": "0.0.1"
... ... @@ -5282,20 +5279,17 @@
5282 5279 "code-point-at": {
5283 5280 "version": "1.1.0",
5284 5281 "bundled": true,
5285   - "dev": true,
5286   - "optional": true
  5282 + "dev": true
5287 5283 },
5288 5284 "concat-map": {
5289 5285 "version": "0.0.1",
5290 5286 "bundled": true,
5291   - "dev": true,
5292   - "optional": true
  5287 + "dev": true
5293 5288 },
5294 5289 "console-control-strings": {
5295 5290 "version": "1.1.0",
5296 5291 "bundled": true,
5297   - "dev": true,
5298   - "optional": true
  5292 + "dev": true
5299 5293 },
5300 5294 "core-util-is": {
5301 5295 "version": "1.0.2",
... ... @@ -5412,8 +5406,7 @@
5412 5406 "inherits": {
5413 5407 "version": "2.0.4",
5414 5408 "bundled": true,
5415   - "dev": true,
5416   - "optional": true
  5409 + "dev": true
5417 5410 },
5418 5411 "ini": {
5419 5412 "version": "1.3.5",
... ... @@ -5425,7 +5418,6 @@
5425 5418 "version": "1.0.0",
5426 5419 "bundled": true,
5427 5420 "dev": true,
5428   - "optional": true,
5429 5421 "requires": {
5430 5422 "number-is-nan": "^1.0.0"
5431 5423 }
... ... @@ -5440,7 +5432,6 @@
5440 5432 "version": "3.0.4",
5441 5433 "bundled": true,
5442 5434 "dev": true,
5443   - "optional": true,
5444 5435 "requires": {
5445 5436 "brace-expansion": "^1.1.7"
5446 5437 }
... ... @@ -5448,14 +5439,12 @@
5448 5439 "minimist": {
5449 5440 "version": "0.0.8",
5450 5441 "bundled": true,
5451   - "dev": true,
5452   - "optional": true
  5442 + "dev": true
5453 5443 },
5454 5444 "minipass": {
5455 5445 "version": "2.9.0",
5456 5446 "bundled": true,
5457 5447 "dev": true,
5458   - "optional": true,
5459 5448 "requires": {
5460 5449 "safe-buffer": "^5.1.2",
5461 5450 "yallist": "^3.0.0"
... ... @@ -5474,7 +5463,6 @@
5474 5463 "version": "0.5.1",
5475 5464 "bundled": true,
5476 5465 "dev": true,
5477   - "optional": true,
5478 5466 "requires": {
5479 5467 "minimist": "0.0.8"
5480 5468 }
... ... @@ -5564,8 +5552,7 @@
5564 5552 "number-is-nan": {
5565 5553 "version": "1.0.1",
5566 5554 "bundled": true,
5567   - "dev": true,
5568   - "optional": true
  5555 + "dev": true
5569 5556 },
5570 5557 "object-assign": {
5571 5558 "version": "4.1.1",
... ... @@ -5577,7 +5564,6 @@
5577 5564 "version": "1.4.0",
5578 5565 "bundled": true,
5579 5566 "dev": true,
5580   - "optional": true,
5581 5567 "requires": {
5582 5568 "wrappy": "1"
5583 5569 }
... ... @@ -5663,8 +5649,7 @@
5663 5649 "safe-buffer": {
5664 5650 "version": "5.1.2",
5665 5651 "bundled": true,
5666   - "dev": true,
5667   - "optional": true
  5652 + "dev": true
5668 5653 },
5669 5654 "safer-buffer": {
5670 5655 "version": "2.1.2",
... ... @@ -5700,7 +5685,6 @@
5700 5685 "version": "1.0.2",
5701 5686 "bundled": true,
5702 5687 "dev": true,
5703   - "optional": true,
5704 5688 "requires": {
5705 5689 "code-point-at": "^1.0.0",
5706 5690 "is-fullwidth-code-point": "^1.0.0",
... ... @@ -5720,7 +5704,6 @@
5720 5704 "version": "3.0.1",
5721 5705 "bundled": true,
5722 5706 "dev": true,
5723   - "optional": true,
5724 5707 "requires": {
5725 5708 "ansi-regex": "^2.0.0"
5726 5709 }
... ... @@ -5764,14 +5747,12 @@
5764 5747 "wrappy": {
5765 5748 "version": "1.0.2",
5766 5749 "bundled": true,
5767   - "dev": true,
5768   - "optional": true
  5750 + "dev": true
5769 5751 },
5770 5752 "yallist": {
5771 5753 "version": "3.1.1",
5772 5754 "bundled": true,
5773   - "dev": true,
5774   - "optional": true
  5755 + "dev": true
5775 5756 }
5776 5757 }
5777 5758 },
... ... @@ -5790,7 +5771,7 @@
5790 5771 "function-bind": {
5791 5772 "version": "1.1.1",
5792 5773 "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
5793   - "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
  5774 + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
5794 5775 "dev": true
5795 5776 },
5796 5777 "functional-red-black-tree": {
... ... @@ -6738,7 +6719,7 @@
6738 6719 "ini": {
6739 6720 "version": "1.3.5",
6740 6721 "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
6741   - "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc="
  6722 + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
6742 6723 },
6743 6724 "inline-style-prefixer": {
6744 6725 "version": "2.0.5",
... ... @@ -6788,7 +6769,7 @@
6788 6769 "invariant": {
6789 6770 "version": "2.2.4",
6790 6771 "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
6791   - "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=",
  6772 + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
6792 6773 "dev": true,
6793 6774 "requires": {
6794 6775 "loose-envify": "^1.0.0"
... ... @@ -6890,7 +6871,7 @@
6890 6871 "is-buffer": {
6891 6872 "version": "1.1.6",
6892 6873 "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
6893   - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=",
  6874 + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
6894 6875 "dev": true
6895 6876 },
6896 6877 "is-callable": {
... ... @@ -6934,7 +6915,7 @@
6934 6915 "is-descriptor": {
6935 6916 "version": "0.1.6",
6936 6917 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
6937   - "integrity": "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco=",
  6918 + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
6938 6919 "dev": true,
6939 6920 "requires": {
6940 6921 "is-accessor-descriptor": "^0.1.6",
... ... @@ -6945,7 +6926,7 @@
6945 6926 "kind-of": {
6946 6927 "version": "5.1.0",
6947 6928 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
6948   - "integrity": "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0=",
  6929 + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
6949 6930 "dev": true
6950 6931 }
6951 6932 }
... ... @@ -7053,7 +7034,7 @@
7053 7034 "is-plain-object": {
7054 7035 "version": "2.0.4",
7055 7036 "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
7056   - "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
  7037 + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
7057 7038 "dev": true,
7058 7039 "requires": {
7059 7040 "isobject": "^3.0.1"
... ... @@ -7120,7 +7101,7 @@
7120 7101 "is-windows": {
7121 7102 "version": "1.0.2",
7122 7103 "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
7123   - "integrity": "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0=",
  7104 + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
7124 7105 "dev": true
7125 7106 },
7126 7107 "is-word-character": {
... ... @@ -7260,7 +7241,7 @@
7260 7241 "json-parse-better-errors": {
7261 7242 "version": "1.0.2",
7262 7243 "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
7263   - "integrity": "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk=",
  7244 + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
7264 7245 "dev": true
7265 7246 },
7266 7247 "json-schema": {
... ... @@ -7277,7 +7258,7 @@
7277 7258 "json-schema-traverse": {
7278 7259 "version": "0.4.1",
7279 7260 "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
7280   - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
  7261 + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
7281 7262 "dev": true
7282 7263 },
7283 7264 "json-stable-stringify-without-jsonify": {
... ... @@ -7517,7 +7498,7 @@
7517 7498 "dependencies": {
7518 7499 "pify": {
7519 7500 "version": "2.3.0",
7520   - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
  7501 + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
7521 7502 "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
7522 7503 "dev": true
7523 7504 }
... ... @@ -8050,7 +8031,7 @@
8050 8031 "messageformat-parser": {
8051 8032 "version": "1.1.0",
8052 8033 "resolved": "https://registry.npmjs.org/messageformat-parser/-/messageformat-parser-1.1.0.tgz",
8053   - "integrity": "sha1-E7oiUKdrvejg/KDbs0dflcWUqQo="
  8034 + "integrity": "sha512-Hwem6G3MsKDLS1FtBRGIs8T50P1Q00r3srS6QJePCFbad9fq0nYxwf3rnU2BreApRGhmpKMV7oZI06Sy1c9TPA=="
8054 8035 },
8055 8036 "methods": {
8056 8037 "version": "1.1.2",
... ... @@ -8092,7 +8073,7 @@
8092 8073 "mime": {
8093 8074 "version": "1.6.0",
8094 8075 "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
8095   - "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=",
  8076 + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
8096 8077 "dev": true
8097 8078 },
8098 8079 "mime-db": {
... ... @@ -8113,7 +8094,7 @@
8113 8094 "mimic-fn": {
8114 8095 "version": "1.2.0",
8115 8096 "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
8116   - "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI="
  8097 + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
8117 8098 },
8118 8099 "min-document": {
8119 8100 "version": "2.19.0",
... ... @@ -8170,7 +8151,7 @@
8170 8151 "minimatch": {
8171 8152 "version": "3.0.4",
8172 8153 "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
8173   - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
  8154 + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
8174 8155 "requires": {
8175 8156 "brace-expansion": "^1.1.7"
8176 8157 }
... ... @@ -8265,7 +8246,7 @@
8265 8246 "is-extendable": {
8266 8247 "version": "1.0.1",
8267 8248 "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
8268   - "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
  8249 + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
8269 8250 "dev": true,
8270 8251 "requires": {
8271 8252 "is-plain-object": "^2.0.4"
... ... @@ -8343,7 +8324,7 @@
8343 8324 "nanomatch": {
8344 8325 "version": "1.2.13",
8345 8326 "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
8346   - "integrity": "sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk=",
  8327 + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
8347 8328 "dev": true,
8348 8329 "requires": {
8349 8330 "arr-diff": "^4.0.0",
... ... @@ -8495,7 +8476,7 @@
8495 8476 }
8496 8477 },
8497 8478 "ngFlowchart": {
8498   - "version": "git://github.com/thingsboard/ngFlowchart.git#1343a7478961f68280d81f0ecda4e722a2068e0f",
  8479 + "version": "git://github.com/thingsboard/ngFlowchart.git#ad172c26bb731f4e4e79d05dfa8cdc3f59cd1690",
8499 8480 "from": "git://github.com/thingsboard/ngFlowchart.git#master"
8500 8481 },
8501 8482 "ngclipboard": {
... ... @@ -8555,7 +8536,7 @@
8555 8536 "no-case": {
8556 8537 "version": "2.3.2",
8557 8538 "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
8558   - "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=",
  8539 + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
8559 8540 "dev": true,
8560 8541 "requires": {
8561 8542 "lower-case": "^1.1.1"
... ... @@ -8574,7 +8555,7 @@
8574 8555 "node-fetch": {
8575 8556 "version": "1.7.3",
8576 8557 "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
8577   - "integrity": "sha1-mA9vcthSEaU0fGsrwYxbhMPrR+8=",
  8558 + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
8578 8559 "requires": {
8579 8560 "encoding": "^0.1.11",
8580 8561 "is-stream": "^1.0.1"
... ... @@ -8775,7 +8756,7 @@
8775 8756 "npmlog": {
8776 8757 "version": "4.1.2",
8777 8758 "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
8778   - "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
  8759 + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
8779 8760 "dev": true,
8780 8761 "requires": {
8781 8762 "are-we-there-yet": "~1.1.2",
... ... @@ -9092,7 +9073,7 @@
9092 9073 "osenv": {
9093 9074 "version": "0.1.5",
9094 9075 "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
9095   - "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=",
  9076 + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
9096 9077 "requires": {
9097 9078 "os-homedir": "^1.0.0",
9098 9079 "os-tmpdir": "^1.0.0"
... ... @@ -9520,7 +9501,7 @@
9520 9501 "postcss-loader": {
9521 9502 "version": "3.0.0",
9522 9503 "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
9523   - "integrity": "sha1-a5eUPkfHLYRfqeA/Jzdz1OjdbC0=",
  9504 + "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
9524 9505 "dev": true,
9525 9506 "requires": {
9526 9507 "loader-utils": "^1.1.0",
... ... @@ -9823,7 +9804,7 @@
9823 9804 "private": {
9824 9805 "version": "0.1.8",
9825 9806 "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
9826   - "integrity": "sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8=",
  9807 + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
9827 9808 "dev": true
9828 9809 },
9829 9810 "process": {
... ... @@ -9846,7 +9827,7 @@
9846 9827 "promise": {
9847 9828 "version": "7.3.1",
9848 9829 "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
9849   - "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
  9830 + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
9850 9831 "requires": {
9851 9832 "asap": "~2.0.3"
9852 9833 }
... ... @@ -9926,7 +9907,7 @@
9926 9907 "pumpify": {
9927 9908 "version": "1.5.1",
9928 9909 "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
9929   - "integrity": "sha1-NlE74karJ1cLGjdKXOJ4v9dDcM4=",
  9910 + "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
9930 9911 "dev": true,
9931 9912 "requires": {
9932 9913 "duplexify": "^3.6.0",
... ... @@ -10091,7 +10072,7 @@
10091 10072 "rc-menu": {
10092 10073 "version": "5.1.4",
10093 10074 "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-5.1.4.tgz",
10094   - "integrity": "sha1-5d8I/ouDPoFGkTX/E7MKuPIf88Y=",
  10075 + "integrity": "sha512-ZUkUNda70GtTXcQDiO3rSDdk3sgIwDwzPUm5dVM8nRH/j84qv0BVBkIUwIBu8+s+G3G9lWLurRqh22dCqZPeOA==",
10095 10076 "requires": {
10096 10077 "babel-runtime": "6.x",
10097 10078 "classnames": "2.x",
... ... @@ -10122,7 +10103,7 @@
10122 10103 "rc-trigger": {
10123 10104 "version": "1.11.5",
10124 10105 "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-1.11.5.tgz",
10125   - "integrity": "sha1-+I+fhODnn44O8cjRv4rCIItxViA=",
  10106 + "integrity": "sha512-MBuUPw1nFzA4K7jQOwb7uvFaZFjXGd00EofUYiZ+l/fgKVq8wnLC0lkv36kwqM7vfKyftRo2sh7cWVpdPuNnnw==",
10126 10107 "requires": {
10127 10108 "babel-runtime": "6.x",
10128 10109 "create-react-class": "15.x",
... ... @@ -10281,7 +10262,7 @@
10281 10262 "react-transition-group": {
10282 10263 "version": "1.2.1",
10283 10264 "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.2.1.tgz",
10284   - "integrity": "sha1-4R9yslf5IbITIpp3TfRmEjRsfKY=",
  10265 + "integrity": "sha512-CWaL3laCmgAFdxdKbhhps+c0HRGF4c+hdM4H23+FI1QBNUyx/AMeIJGWorehPNSaKnQNOAxL7PQmqMu78CDj3Q==",
10285 10266 "requires": {
10286 10267 "chain-function": "^1.0.0",
10287 10268 "dom-helpers": "^3.2.0",
... ... @@ -10293,7 +10274,7 @@
10293 10274 "reactcss": {
10294 10275 "version": "1.2.3",
10295 10276 "resolved": "https://registry.npmjs.org/reactcss/-/reactcss-1.2.3.tgz",
10296   - "integrity": "sha1-wAATh15Vexzw39mjaKHD2rO1SN0=",
  10277 + "integrity": "sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A==",
10297 10278 "requires": {
10298 10279 "lodash": "^4.0.1"
10299 10280 }
... ... @@ -10476,7 +10457,7 @@
10476 10457 "regenerator-runtime": {
10477 10458 "version": "0.11.1",
10478 10459 "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
10479   - "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk="
  10460 + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
10480 10461 },
10481 10462 "regenerator-transform": {
10482 10463 "version": "0.14.1",
... ... @@ -10490,7 +10471,7 @@
10490 10471 "regex-not": {
10491 10472 "version": "1.0.2",
10492 10473 "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
10493   - "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
  10474 + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
10494 10475 "dev": true,
10495 10476 "requires": {
10496 10477 "extend-shallow": "^3.0.2",
... ... @@ -10795,7 +10776,7 @@
10795 10776 "ret": {
10796 10777 "version": "0.1.15",
10797 10778 "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
10798   - "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=",
  10779 + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
10799 10780 "dev": true
10800 10781 },
10801 10782 "retry": {
... ... @@ -10899,7 +10880,7 @@
10899 10880 "safer-buffer": {
10900 10881 "version": "2.1.2",
10901 10882 "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
10902   - "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo="
  10883 + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
10903 10884 },
10904 10885 "sass-graph": {
10905 10886 "version": "2.2.4",
... ... @@ -11233,7 +11214,7 @@
11233 11214 "snapdragon": {
11234 11215 "version": "0.8.2",
11235 11216 "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
11236   - "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
  11217 + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
11237 11218 "dev": true,
11238 11219 "requires": {
11239 11220 "base": "^0.11.1",
... ... @@ -11269,7 +11250,7 @@
11269 11250 "snapdragon-node": {
11270 11251 "version": "2.1.1",
11271 11252 "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
11272   - "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
  11253 + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
11273 11254 "dev": true,
11274 11255 "requires": {
11275 11256 "define-property": "^1.0.0",
... ... @@ -11289,7 +11270,7 @@
11289 11270 "is-accessor-descriptor": {
11290 11271 "version": "1.0.0",
11291 11272 "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
11292   - "integrity": "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY=",
  11273 + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
11293 11274 "dev": true,
11294 11275 "requires": {
11295 11276 "kind-of": "^6.0.0"
... ... @@ -11298,7 +11279,7 @@
11298 11279 "is-data-descriptor": {
11299 11280 "version": "1.0.0",
11300 11281 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
11301   - "integrity": "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc=",
  11282 + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
11302 11283 "dev": true,
11303 11284 "requires": {
11304 11285 "kind-of": "^6.0.0"
... ... @@ -11307,7 +11288,7 @@
11307 11288 "is-descriptor": {
11308 11289 "version": "1.0.2",
11309 11290 "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
11310   - "integrity": "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw=",
  11291 + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
11311 11292 "dev": true,
11312 11293 "requires": {
11313 11294 "is-accessor-descriptor": "^1.0.0",
... ... @@ -11320,7 +11301,7 @@
11320 11301 "snapdragon-util": {
11321 11302 "version": "3.0.1",
11322 11303 "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
11323   - "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
  11304 + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
11324 11305 "dev": true,
11325 11306 "requires": {
11326 11307 "kind-of": "^3.2.0"
... ... @@ -11340,7 +11321,7 @@
11340 11321 "sockjs": {
11341 11322 "version": "0.3.19",
11342 11323 "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
11343   - "integrity": "sha1-2Xa76ACve9IK4IWY1YI5NQiZPA0=",
  11324 + "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
11344 11325 "dev": true,
11345 11326 "requires": {
11346 11327 "faye-websocket": "^0.10.0",
... ... @@ -11464,7 +11445,7 @@
11464 11445 "spdx-expression-parse": {
11465 11446 "version": "3.0.0",
11466 11447 "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
11467   - "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=",
  11448 + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
11468 11449 "dev": true,
11469 11450 "requires": {
11470 11451 "spdx-exceptions": "^2.1.0",
... ... @@ -11558,7 +11539,7 @@
11558 11539 "split-string": {
11559 11540 "version": "3.1.0",
11560 11541 "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
11561   - "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
  11542 + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
11562 11543 "dev": true,
11563 11544 "requires": {
11564 11545 "extend-shallow": "^3.0.0"
... ... @@ -11698,7 +11679,7 @@
11698 11679 "string-width": {
11699 11680 "version": "2.1.1",
11700 11681 "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
11701   - "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
  11682 + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
11702 11683 "requires": {
11703 11684 "is-fullwidth-code-point": "^2.0.0",
11704 11685 "strip-ansi": "^4.0.0"
... ... @@ -11742,7 +11723,7 @@
11742 11723 "string_decoder": {
11743 11724 "version": "1.1.1",
11744 11725 "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
11745   - "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
  11726 + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
11746 11727 "requires": {
11747 11728 "safe-buffer": "~5.1.0"
11748 11729 }
... ... @@ -12711,7 +12692,7 @@
12711 12692 "symbol-observable": {
12712 12693 "version": "1.2.0",
12713 12694 "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
12714   - "integrity": "sha1-wiaIrtTqs83C3+rLtWFmBWCgCAQ="
  12695 + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
12715 12696 },
12716 12697 "table": {
12717 12698 "version": "5.4.6",
... ... @@ -12941,7 +12922,7 @@
12941 12922 "tmp": {
12942 12923 "version": "0.0.33",
12943 12924 "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
12944   - "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
  12925 + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
12945 12926 "requires": {
12946 12927 "os-tmpdir": "~1.0.2"
12947 12928 }
... ... @@ -12981,7 +12962,7 @@
12981 12962 "to-regex": {
12982 12963 "version": "3.0.2",
12983 12964 "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
12984   - "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
  12965 + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
12985 12966 "dev": true,
12986 12967 "requires": {
12987 12968 "define-property": "^2.0.2",
... ... @@ -13183,7 +13164,7 @@
13183 13164 "source-map": {
13184 13165 "version": "0.6.1",
13185 13166 "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
13186   - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
  13167 + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
13187 13168 "dev": true
13188 13169 }
13189 13170 }
... ... @@ -13508,7 +13489,7 @@
13508 13489 "uri-js": {
13509 13490 "version": "4.2.2",
13510 13491 "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
13511   - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
  13492 + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
13512 13493 "dev": true,
13513 13494 "requires": {
13514 13495 "punycode": "^2.1.0"
... ... @@ -13570,7 +13551,7 @@
13570 13551 "use": {
13571 13552 "version": "3.1.1",
13572 13553 "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
13573   - "integrity": "sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8=",
  13554 + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
13574 13555 "dev": true
13575 13556 },
13576 13557 "util": {
... ... @@ -14309,7 +14290,7 @@
14309 14290 "websocket-extensions": {
14310 14291 "version": "0.1.3",
14311 14292 "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
14312   - "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
  14293 + "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
14313 14294 "dev": true
14314 14295 },
14315 14296 "whatwg-fetch": {
... ... @@ -14423,7 +14404,7 @@
14423 14404 "ws": {
14424 14405 "version": "1.1.5",
14425 14406 "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz",
14426   - "integrity": "sha1-y9nm514J/F0skAFfIfDECHXg3VE=",
  14407 + "integrity": "sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==",
14427 14408 "requires": {
14428 14409 "options": ">=0.0.5",
14429 14410 "ultron": "1.0.x"
... ...
... ... @@ -403,19 +403,6 @@ export default angular.module('thingsboard.types', [])
403 403 widgetType: "WIDGET_TYPE",
404 404 adminSettings: "ADMIN_SETTINGS"
405 405 },
406   - edgeEventAction: {
407   - updated: "UPDATED",
408   - added: "ADDED",
409   - assignedToEdge: "ASSIGNED_TO_EDGE",
410   - deleted: "DELETED",
411   - unassignedFromEdge: "UNASSIGNED_FROM_EDGE",
412   - alarmAck: "ALARM_ACK",
413   - alarmClear: "ALARM_CLEAR",
414   - credentialsUpdated: "CREDENTIALS_UPDATED",
415   - attributesUpdated: "ATTRIBUTES_UPDATED",
416   - attributesDeleted: "ATTRIBUTES_DELETED",
417   - timeseriesUpdated: "TIMESERIES_UPDATED"
418   - },
419 406 edgeAttributeKeys: {
420 407 active: "active",
421 408 lastConnectTime: "lastConnectTime",
... ...
... ... @@ -14,7 +14,7 @@
14 14 * limitations under the License.
15 15 */
16 16 /*@ngInject*/
17   -export default function AddDashboardsToEdgeController(dashboardService, types, $mdDialog, $q, edgeId, edgeCustomerId, dashboards) {
  17 +export default function AddDashboardsToEdgeController(dashboardService, types, $mdDialog, $q, edgeId, dashboards) {
18 18
19 19 var vm = this;
20 20
... ...
... ... @@ -156,17 +156,6 @@ export function DashboardsController(userService, dashboardService, customerServ
156 156 );
157 157 }
158 158
159   - if (edgeId) {
160   - vm.edgeDashboardsTitle = $translate.instant('edge.dashboards');
161   - edgeService.getEdge(edgeId).then(
162   - function success(edge) {
163   - if (edge.customerId) {
164   - vm.edgeCustomerId = edge.customerId;
165   - }
166   - }
167   - )
168   - }
169   -
170 159 if (vm.dashboardsScope === 'tenant') {
171 160 fetchDashboardsFunction = function (pageLink) {
172 161 return dashboardService.getTenantDashboards(pageLink);
... ... @@ -726,7 +715,7 @@ export function DashboardsController(userService, dashboardService, customerServ
726 715 controller: 'AddDashboardsToEdgeController',
727 716 controllerAs: 'vm',
728 717 templateUrl: addDashboardsToEdgeTemplate,
729   - locals: {edgeId: edgeId, edgeCustomerId: vm.edgeCustomerId.id, dashboards: dashboards},
  718 + locals: {edgeId: edgeId, dashboards: dashboards},
730 719 parent: angular.element($document[0].body),
731 720 fullscreen: true,
732 721 targetEvent: $event
... ...
... ... @@ -54,6 +54,20 @@
54 54 <md-icon md-svg-icon="mdi:sync"></md-icon>
55 55 <span translate>edge.sync</span>
56 56 </md-button>
  57 + <md-button ngclipboard data-clipboard-action="copy"
  58 + ngclipboard-success="onEdgeInfoCopied('key')"
  59 + data-clipboard-text="{{edge.routingKey}}" ng-show="!isEdit"
  60 + class="md-raised">
  61 + <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
  62 + <span translate>edge.copy-edge-key</span>
  63 + </md-button>
  64 + <md-button ngclipboard data-clipboard-action="copy"
  65 + ngclipboard-success="onEdgeInfoCopied('secret')"
  66 + data-clipboard-text="{{edge.secret}}" ng-show="!isEdit"
  67 + class="md-raised">
  68 + <md-icon md-svg-icon="mdi:clipboard-arrow-left"></md-icon>
  69 + <span translate>edge.copy-edge-secret</span>
  70 + </md-button>
57 71 </div>
58 72
59 73 <md-content class="md-padding" layout="column">
... ...
... ... @@ -83,19 +83,18 @@ export default function EdgeDirective($compile, $templateCache, $translate, $mdD
83 83 $compile(element.contents())(scope);
84 84
85 85 scope.onEdgeInfoCopied = function(type) {
86   - let translateInstant = "";
  86 + let infoTypeLabel = "";
87 87 switch (type) {
88 88 case 'key':
89   - translateInstant = "edge.edge-key-copied-message";
  89 + infoTypeLabel = "edge.edge-key-copied-message";
90 90 break;
91 91 case 'secret':
92   - translateInstant = "edge.edge-secret-copied-message";
  92 + infoTypeLabel = "edge.edge-secret-copied-message";
93 93 break;
94 94 }
95   - toast.showSuccess($translate.instant(translateInstant), 750, angular.element(element).parent().parent(), 'top left');
  95 + toast.showSuccess($translate.instant(infoTypeLabel), 750, angular.element(element).parent().parent(), 'bottom left');
96 96 };
97 97
98   -
99 98 };
100 99 return {
101 100 restrict: "E",
... ...
... ... @@ -614,16 +614,6 @@ export default function ImportExport($log, $translate, $q, $mdDialog, $document,
614 614 }
615 615 );
616 616 return deferred.promise;
617   - case types.entityType.edge:
618   - openImportDialogCSV($event, entityType, 'edge.import', 'edge.edge-file').then(
619   - function success() {
620   - deferred.resolve();
621   - },
622   - function fail() {
623   - deferred.reject();
624   - }
625   - );
626   - return deferred.promise;
627 617 }
628 618
629 619 }
... ...
... ... @@ -17,6 +17,6 @@
17 17 -->
18 18 <div ng-if="(vm.parentCtl.ruleChainsScope === 'tenant' && item && item.root) ||
19 19 (vm.parentCtl.ruleChainsScope === 'edge' && vm.parentCtl.isRootRuleChain(item)) ||
20   - (vm.parentCtl.ruleChainsScope === 'edges' && vm.parentCtl.isRootRuleChain(item))" translate>rulechain.root </div>
  20 + (vm.parentCtl.ruleChainsScope === 'edges' && vm.parentCtl.isRootRuleChain(item))" translate>rulechain.root</div>
21 21
22   -<div ng-if="(vm.parentCtl.ruleChainsScope === 'edges' && vm.parentCtl.isDefaultEdgeRuleChain(item))" translate>rulechain.default </div>
  22 +<div ng-if="(vm.parentCtl.ruleChainsScope === 'edges' && vm.parentCtl.isDefaultEdgeRuleChain(item))" translate>rulechain.default</div>
... ...
... ... @@ -22,7 +22,8 @@ import addRuleChainsToEdgeTemplate from "./add-rulechains-to-edge.tpl.html";
22 22 /* eslint-enable import/no-unresolved, import/default */
23 23
24 24 /*@ngInject*/
25   -export default function RuleChainsController(ruleChainService, userService, importExport, $state, $stateParams, $filter, $translate, $mdDialog, types,
  25 +export default function RuleChainsController(ruleChainService, userService, importExport, $state,
  26 + $stateParams, $filter, $translate, $mdDialog, types,
26 27 $document, $q, edgeService) {
27 28
28 29 var vm = this;
... ... @@ -104,7 +105,6 @@ export default function RuleChainsController(ruleChainService, userService, impo
104 105 var deleteRuleChainFunction = null;
105 106
106 107 if (edgeId) {
107   - vm.edgeRuleChainsTitle = $translate.instant('edge.rulechains');
108 108 edgeService.getEdge(edgeId).then(
109 109 function success(edge) {
110 110 vm.edge = edge;
... ...