Komodo / komodo-sdk

Compare View

switch
from
...
to
 
Commits (3)

Changes

Showing 3 changed files Side-by-side Diff

api-server/router-remote-products.js
Diff comments   View file @ 61a7a55
1 1 "use strict";
2 2  
3 3 const express = require('express');
4   -const sortObj = require('sort-object');
  4 +// const sortObj = require('sort-object');
5 5 const naturalCompare = require('string-natural-compare');
6 6  
7 7 const config = require('../config');
8   -const logger = require('../logger');
9 8 const matrix = require('../matrix');
10 9  
11 10 const router = express.Router();
12 11 module.exports = router;
13 12  
14   -function pageIndex(req, res, next) {
  13 +function pageIndex(req, res) {
15 14 res.json({
16 15 method: '/products',
17 16 error: null,
... ... @@ -19,7 +18,7 @@ function pageIndex(req, res, next) {
19 18 });
20 19 }
21 20  
22   -function pageSet(req, res, next) {
  21 +function pageSet(req, res) {
23 22 function responseWithUsageHelp() {
24 23 res.json({
25 24 method: '/remote-products/set',
... ... @@ -43,9 +42,20 @@ function pageSet(req, res, next) {
43 42 const remoteProduct = (req.params.remoteProduct || req.query.remote).trim();
44 43  
45 44 config.remote_products[localProduct] = remoteProduct;
  45 +
  46 + /*
46 47 config.remote_products = sortObj(config.remote_products, {
47 48 sort: naturalCompare.caseInsensitive
48 49 });
  50 + */
  51 +
  52 + const sortedRemoteProducts = {};
  53 + const remoteProductsKeys = Object.keys(config.remote_products).sort(naturalCompare.caseInsensitive);
  54 + remoteProductsKeys.forEach((item) => {
  55 + sortedRemoteProducts[item] = config.remote_products[item];
  56 + });
  57 + config.remote_products = sortedRemoteProducts;
  58 +
49 59 matrix.config_is_dirty = true;
50 60  
51 61 res.json({
... ... @@ -57,7 +67,7 @@ function pageSet(req, res, next) {
57 67 })
58 68 }
59 69  
60   -function pageDel(req, res, next) {
  70 +function pageDel(req, res) {
61 71 function responseWithUsageHelp() {
62 72 res.json({
63 73 method: '/remote-products/del',
1 1 {
2 2 "name": "komodo-sdk",
3   - "version": "1.37.13",
  3 + "version": "1.37.14",
4 4 "lockfileVersion": 1,
5 5 "requires": true,
6 6 "dependencies": {
... ... @@ -152,7 +152,8 @@
152 152 "arr-union": {
153 153 "version": "3.1.0",
154 154 "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
155   - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
  155 + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
  156 + "optional": true
156 157 },
157 158 "array-flatten": {
158 159 "version": "1.1.1",
... ... @@ -373,23 +374,6 @@
373 374 "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
374 375 "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
375 376 },
376   - "bytewise": {
377   - "version": "1.1.0",
378   - "resolved": "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz",
379   - "integrity": "sha1-HRPL/3F65xWAlKqIGzXQgbOHJT4=",
380   - "requires": {
381   - "bytewise-core": "^1.2.2",
382   - "typewise": "^1.0.3"
383   - }
384   - },
385   - "bytewise-core": {
386   - "version": "1.2.3",
387   - "resolved": "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz",
388   - "integrity": "sha1-P7QQx+kVWOsasiqCg0V3qmvWHUI=",
389   - "requires": {
390   - "typewise-core": "^1.2"
391   - }
392   - },
393 377 "cache-base": {
394 378 "version": "1.0.1",
395 379 "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
... ... @@ -1177,6 +1161,7 @@
1177 1161 "version": "2.0.1",
1178 1162 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
1179 1163 "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
  1164 + "optional": true,
1180 1165 "requires": {
1181 1166 "is-extendable": "^0.1.0"
1182 1167 }
... ... @@ -1915,7 +1900,8 @@
1915 1900 "get-value": {
1916 1901 "version": "2.0.6",
1917 1902 "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
1918   - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
  1903 + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
  1904 + "optional": true
1919 1905 },
1920 1906 "getpass": {
1921 1907 "version": "0.1.7",
... ... @@ -2201,7 +2187,8 @@
2201 2187 "is-buffer": {
2202 2188 "version": "1.1.5",
2203 2189 "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
2204   - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw="
  2190 + "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
  2191 + "optional": true
2205 2192 },
2206 2193 "is-data-descriptor": {
2207 2194 "version": "0.1.4",
... ... @@ -2234,7 +2221,8 @@
2234 2221 "is-extendable": {
2235 2222 "version": "0.1.1",
2236 2223 "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
2237   - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
  2224 + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
  2225 + "optional": true
2238 2226 },
2239 2227 "is-extglob": {
2240 2228 "version": "2.1.1",
... ... @@ -2270,6 +2258,7 @@
2270 2258 "version": "2.0.4",
2271 2259 "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
2272 2260 "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
  2261 + "optional": true,
2273 2262 "requires": {
2274 2263 "isobject": "^3.0.1"
2275 2264 },
... ... @@ -2277,7 +2266,8 @@
2277 2266 "isobject": {
2278 2267 "version": "3.0.1",
2279 2268 "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
2280   - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
  2269 + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
  2270 + "optional": true
2281 2271 }
2282 2272 }
2283 2273 },
... ... @@ -2387,6 +2377,7 @@
2387 2377 "version": "3.2.2",
2388 2378 "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
2389 2379 "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
  2380 + "optional": true,
2390 2381 "requires": {
2391 2382 "is-buffer": "^1.1.5"
2392 2383 }
... ... @@ -3245,17 +3236,6 @@
3245 3236 "send": "0.16.2"
3246 3237 }
3247 3238 },
3248   - "set-value": {
3249   - "version": "0.4.3",
3250   - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
3251   - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
3252   - "requires": {
3253   - "extend-shallow": "^2.0.1",
3254   - "is-extendable": "^0.1.1",
3255   - "is-plain-object": "^2.0.1",
3256   - "to-object-path": "^0.3.0"
3257   - }
3258   - },
3259 3239 "setprototypeof": {
3260 3240 "version": "1.1.0",
3261 3241 "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
... ... @@ -3419,29 +3399,6 @@
3419 3399 "kind-of": "^3.2.0"
3420 3400 }
3421 3401 },
3422   - "sort-asc": {
3423   - "version": "0.2.0",
3424   - "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz",
3425   - "integrity": "sha1-AKSelHvCXVEL/eLLuN/9qfUOsvw="
3426   - },
3427   - "sort-desc": {
3428   - "version": "0.2.0",
3429   - "resolved": "https://registry.npmjs.org/sort-desc/-/sort-desc-0.2.0.tgz",
3430   - "integrity": "sha1-KAwb2vxld4h87brR7S5BwDeXZkY="
3431   - },
3432   - "sort-object": {
3433   - "version": "3.0.2",
3434   - "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-3.0.2.tgz",
3435   - "integrity": "sha1-2vK2k/YR990qIbgrgF5OrCMPdV4=",
3436   - "requires": {
3437   - "bytewise": "^1.1.0",
3438   - "get-value": "^2.0.2",
3439   - "is-extendable": "^0.1.1",
3440   - "sort-asc": "^0.2.0",
3441   - "sort-desc": "^0.2.0",
3442   - "union-value": "^0.2.3"
3443   - }
3444   - },
3445 3402 "source-map": {
3446 3403 "version": "0.5.7",
3447 3404 "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
... ... @@ -3678,6 +3635,7 @@
3678 3635 "version": "0.3.0",
3679 3636 "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
3680 3637 "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
  3638 + "optional": true,
3681 3639 "requires": {
3682 3640 "kind-of": "^3.0.2"
3683 3641 }
... ... @@ -3791,19 +3749,6 @@
3791 3749 }
3792 3750 }
3793 3751 },
3794   - "typewise": {
3795   - "version": "1.0.3",
3796   - "resolved": "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz",
3797   - "integrity": "sha1-EGeTZUCvl5N8xdz5kiSG6fooRlE=",
3798   - "requires": {
3799   - "typewise-core": "^1.2.0"
3800   - }
3801   - },
3802   - "typewise-core": {
3803   - "version": "1.2.0",
3804   - "resolved": "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz",
3805   - "integrity": "sha1-l+uRgFx/VdL5QXSPpQ0xXZke8ZU="
3806   - },
3807 3752 "uid-safe": {
3808 3753 "version": "2.1.5",
3809 3754 "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz",
... ... @@ -3812,17 +3757,6 @@
3812 3757 "random-bytes": "~1.0.0"
3813 3758 }
3814 3759 },
3815   - "union-value": {
3816   - "version": "0.2.4",
3817   - "resolved": "https://registry.npmjs.org/union-value/-/union-value-0.2.4.tgz",
3818   - "integrity": "sha1-c3UVJ4ZnkFfns3qmdug0aPwCdPA=",
3819   - "requires": {
3820   - "arr-union": "^3.1.0",
3821   - "get-value": "^2.0.6",
3822   - "is-extendable": "^0.1.1",
3823   - "set-value": "^0.4.3"
3824   - }
3825   - },
3826 3760 "uniqid": {
3827 3761 "version": "4.1.1",
3828 3762 "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz",
1 1 {
2 2 "name": "komodo-sdk",
3   - "version": "1.37.13",
  3 + "version": "1.37.14",
4 4 "description": "SDK for Komodo",
5 5 "main": "index.js",
6 6 "scripts": {
... ... @@ -39,7 +39,6 @@
39 39 "request": "^2.88.0",
40 40 "sha1": "^1.1.1",
41 41 "simple-git": "^1.80.1",
42   - "sort-object": "^3.0.2",
43 42 "strftime": "^0.10.0",
44 43 "string-natural-compare": "^2.0.2",
45 44 "uniqid": "^4.1.1",