rb-homer 1.6.19 → 1.6.21-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/index.js CHANGED
@@ -294,20 +294,29 @@ else if (validCommand(commands.first, "app", "a") && commands.second) {
294
294
  var q = require("q");
295
295
  var deferred = q.defer();
296
296
  console.log(rbConfigMod);
297
- var request = require('request');
298
- request({
299
- url: "https://api.rambase.net/system/applications/api-operations/100385/instances?$access_token=" + rbConfigMod.access_token,
300
- method: "POST",
301
- json: true,
302
- body: { parameters: { lookupKey: componentName, description: componentName, namespace:'', contentType: 'component/html5' } }
303
- }, function (error, response, body) {
304
297
 
298
+ fetch("https://api.rambase.net/system/applications/api-operations/100385/instances?$access_token=" + rbConfigMod.access_token,
299
+ {
300
+ method: "POST",
301
+ headers: {
302
+ "Content-Type": "application/json"
303
+ },
304
+ body: JSON.stringify({ parameters: { lookupKey: componentName, description: componentName, namespace:'', contentType: 'component/html5' } })
305
+ })
306
+ .then(response => {
307
+ if (response.status !== 200) {
308
+ deferred.reject();
309
+ return;
310
+ }
311
+ return response.json();
312
+ })
313
+ .then(body => {
305
314
  if (body && body.operationInstance && body.operationInstance.objectReference && body.operationInstance.objectReference.objectId) {
306
315
  deferred.resolve({ appNo: body.operationInstance.objectReference.objectId, rbConfigMod: rbConfigMod });
307
316
  }
308
317
  else if (body && body.operationInstance && body.operationInstance.systemJob && body.operationInstance.systemJob.objectId > 0) {
309
318
  console.log("polling...");
310
- pollForStatus(data.operationInstance.operationInstanceLink, deferred);
319
+ pollForStatus(body.operationInstance.operationInstanceLink, deferred);
311
320
  }
312
321
  else {
313
322
  console.log(body.message);
@@ -318,8 +327,14 @@ else if (validCommand(commands.first, "app", "a") && commands.second) {
318
327
  }
319
328
  deferred.reject();
320
329
  }
330
+ })
331
+ .catch(error => {
332
+ console.error('Error:', error);
333
+ deferred.reject();
321
334
  });
322
335
 
336
+
337
+
323
338
  return deferred.promise;
324
339
  }
325
340
  }
@@ -598,43 +613,45 @@ function getComponentNameAndNo(path) {
598
613
 
599
614
  }
600
615
 
601
- function pollForStatus(link, deferred) {
602
- request
603
- .get(link).on('response', function (httpResponse) {
604
- var response = httpResponse.data;
616
+ async function pollForStatus(link, deferred, firstTimeStamp) {
617
+ if (!firstTimeStamp) {
618
+ firstTimeStamp = Date.now();
619
+ }
620
+ try {
621
+ const response = await fetch(link);
622
+ const data = await response.json();
605
623
 
606
- if(!response || !response.operationInstance || response.operationInstance.error){
607
- console.log(response.operationInstance.error.message, 'Operation Failed');
608
- if (deferred) {
609
- deferred.reject(response);
610
- }
624
+ if (!data || !data.operationInstance || data.operationInstance.error) {
625
+ console.log(data.operationInstance.error.message, 'Operation Failed');
626
+ deferred.reject(data);
611
627
  }
612
- else {
613
- var pollStatus = response.operationInstance.status;
614
- if (!pollStatus || (pollStatus !== 7 && pollStatus !== 9)) { //Not finished, poll again
615
- setTimeout(function () {
616
- pollForStatus(link, deferred);
617
- }, 2000);
618
-
619
- }
620
- else if (pollForStatus === 9) { //Finished
621
- deferred.resolve({ appNo: response.operationInstance.objectReference.objectId });
622
- }
628
+ else {
629
+ const pollStatus = data.operationInstance.status;
630
+ if (!pollStatus || (pollStatus !== 7 && pollStatus !== 9)) {
631
+ if ((Date.now() - firstTimeStamp) / 1000 < 120) { //Poll for 2 min
632
+ // Not finished, poll again
633
+ setTimeout(() => pollForStatus(link, deferred), 2000);
634
+ }
635
+ else {
636
+ deferred.reject();
637
+ }
638
+ }
639
+ else if (pollStatus === 9) {
640
+ // Finished
641
+ deferred.resolve({ appNo: data.operationInstance.objectReference.objectId });
642
+ }
623
643
  else {
624
- console.log("Error creating component.")
625
- if (body && body.operationInstance.error) {
626
- console.log(body.operationInstance.error.message);
627
- console.log(body.operationInstance.error.stackTrace);
644
+ console.log("Error creating component.");
645
+ if (data && data.operationInstance.error) {
646
+ console.log(data.operationInstance.error.message);
647
+ console.log(data.operationInstance.error.stackTrace);
628
648
  }
629
649
  deferred.reject();
630
650
  }
631
- }
632
-
633
- }).on('error', function (error) {
634
- console.log(error.data);
635
-
636
- if (deferred) {
637
- deferred.reject(error.data);
638
651
  }
639
- });
640
- }
652
+ } catch (error) {
653
+ console.log(error.message);
654
+ deferred.reject(error);
655
+ }
656
+ }
657
+
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "rb-homer",
3
- "version": "1.6.16",
3
+ "version": "1.6.20",
4
4
  "lockfileVersion": 2,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "rb-homer",
9
- "version": "1.6.16",
9
+ "version": "1.6.20",
10
10
  "hasInstallScript": true,
11
11
  "license": "ISC",
12
12
  "dependencies": {
@@ -21,7 +21,6 @@
21
21
  "path": "0.12.x",
22
22
  "pofile": "1.x.x",
23
23
  "q": "1.5.x",
24
- "request": "2.88.x",
25
24
  "requirejs": "2.3.x",
26
25
  "typescript": "3.x.x",
27
26
  "uglify-js": "3.x.x",
@@ -33,20 +32,6 @@
33
32
  "rb": "index.js"
34
33
  }
35
34
  },
36
- "node_modules/ajv": {
37
- "version": "6.12.6",
38
- "license": "MIT",
39
- "dependencies": {
40
- "fast-deep-equal": "^3.1.1",
41
- "fast-json-stable-stringify": "^2.0.0",
42
- "json-schema-traverse": "^0.4.1",
43
- "uri-js": "^4.2.2"
44
- },
45
- "funding": {
46
- "type": "github",
47
- "url": "https://github.com/sponsors/epoberezkin"
48
- }
49
- },
50
35
  "node_modules/anymatch": {
51
36
  "version": "3.1.2",
52
37
  "license": "ISC",
@@ -58,40 +43,11 @@
58
43
  "node": ">= 8"
59
44
  }
60
45
  },
61
- "node_modules/asn1": {
62
- "version": "0.2.4",
63
- "license": "MIT",
64
- "dependencies": {
65
- "safer-buffer": "~2.1.0"
66
- }
67
- },
68
- "node_modules/assert-plus": {
69
- "version": "1.0.0",
70
- "license": "MIT",
71
- "engines": {
72
- "node": ">=0.8"
73
- }
74
- },
75
46
  "node_modules/async": {
76
47
  "version": "3.2.4",
77
48
  "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
78
49
  "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
79
50
  },
80
- "node_modules/asynckit": {
81
- "version": "0.4.0",
82
- "license": "MIT"
83
- },
84
- "node_modules/aws-sign2": {
85
- "version": "0.7.0",
86
- "license": "Apache-2.0",
87
- "engines": {
88
- "node": "*"
89
- }
90
- },
91
- "node_modules/aws4": {
92
- "version": "1.11.0",
93
- "license": "MIT"
94
- },
95
51
  "node_modules/babylon": {
96
52
  "version": "6.18.0",
97
53
  "license": "MIT",
@@ -99,13 +55,6 @@
99
55
  "babylon": "bin/babylon.js"
100
56
  }
101
57
  },
102
- "node_modules/bcrypt-pbkdf": {
103
- "version": "1.0.2",
104
- "license": "BSD-3-Clause",
105
- "dependencies": {
106
- "tweetnacl": "^0.14.3"
107
- }
108
- },
109
58
  "node_modules/binary-extensions": {
110
59
  "version": "2.2.0",
111
60
  "license": "MIT",
@@ -139,10 +88,6 @@
139
88
  "node-gyp-build": "^4.2.0"
140
89
  }
141
90
  },
142
- "node_modules/caseless": {
143
- "version": "0.12.0",
144
- "license": "Apache-2.0"
145
- },
146
91
  "node_modules/cheerio": {
147
92
  "version": "1.0.0-rc.10",
148
93
  "license": "MIT",
@@ -195,16 +140,6 @@
195
140
  "fsevents": "~2.3.2"
196
141
  }
197
142
  },
198
- "node_modules/combined-stream": {
199
- "version": "1.0.8",
200
- "license": "MIT",
201
- "dependencies": {
202
- "delayed-stream": "~1.0.0"
203
- },
204
- "engines": {
205
- "node": ">= 0.8"
206
- }
207
- },
208
143
  "node_modules/copy-anything": {
209
144
  "version": "2.0.3",
210
145
  "license": "MIT",
@@ -248,16 +183,6 @@
248
183
  "type": "^1.0.1"
249
184
  }
250
185
  },
251
- "node_modules/dashdash": {
252
- "version": "1.14.1",
253
- "license": "MIT",
254
- "dependencies": {
255
- "assert-plus": "^1.0.0"
256
- },
257
- "engines": {
258
- "node": ">=0.10"
259
- }
260
- },
261
186
  "node_modules/debug": {
262
187
  "version": "2.6.9",
263
188
  "license": "MIT",
@@ -265,13 +190,6 @@
265
190
  "ms": "2.0.0"
266
191
  }
267
192
  },
268
- "node_modules/delayed-stream": {
269
- "version": "1.0.0",
270
- "license": "MIT",
271
- "engines": {
272
- "node": ">=0.4.0"
273
- }
274
- },
275
193
  "node_modules/dom-serializer": {
276
194
  "version": "1.3.2",
277
195
  "license": "MIT",
@@ -319,14 +237,6 @@
319
237
  "url": "https://github.com/fb55/domutils?sponsor=1"
320
238
  }
321
239
  },
322
- "node_modules/ecc-jsbn": {
323
- "version": "0.1.2",
324
- "license": "MIT",
325
- "dependencies": {
326
- "jsbn": "~0.1.0",
327
- "safer-buffer": "^2.1.0"
328
- }
329
- },
330
240
  "node_modules/entities": {
331
241
  "version": "2.2.0",
332
242
  "license": "BSD-2-Clause",
@@ -382,25 +292,6 @@
382
292
  "version": "2.5.0",
383
293
  "license": "ISC"
384
294
  },
385
- "node_modules/extend": {
386
- "version": "3.0.2",
387
- "license": "MIT"
388
- },
389
- "node_modules/extsprintf": {
390
- "version": "1.3.0",
391
- "engines": [
392
- "node >=0.6.0"
393
- ],
394
- "license": "MIT"
395
- },
396
- "node_modules/fast-deep-equal": {
397
- "version": "3.1.3",
398
- "license": "MIT"
399
- },
400
- "node_modules/fast-json-stable-stringify": {
401
- "version": "2.1.0",
402
- "license": "MIT"
403
- },
404
295
  "node_modules/fill-range": {
405
296
  "version": "7.0.1",
406
297
  "license": "MIT",
@@ -411,32 +302,6 @@
411
302
  "node": ">=8"
412
303
  }
413
304
  },
414
- "node_modules/forever-agent": {
415
- "version": "0.6.1",
416
- "license": "Apache-2.0",
417
- "engines": {
418
- "node": "*"
419
- }
420
- },
421
- "node_modules/form-data": {
422
- "version": "2.3.3",
423
- "license": "MIT",
424
- "dependencies": {
425
- "asynckit": "^0.4.0",
426
- "combined-stream": "^1.0.6",
427
- "mime-types": "^2.1.12"
428
- },
429
- "engines": {
430
- "node": ">= 0.12"
431
- }
432
- },
433
- "node_modules/getpass": {
434
- "version": "0.1.7",
435
- "license": "MIT",
436
- "dependencies": {
437
- "assert-plus": "^1.0.0"
438
- }
439
- },
440
305
  "node_modules/glob-parent": {
441
306
  "version": "5.1.2",
442
307
  "license": "ISC",
@@ -456,24 +321,6 @@
456
321
  "version": "1.3.0",
457
322
  "license": "MIT"
458
323
  },
459
- "node_modules/har-schema": {
460
- "version": "2.0.0",
461
- "license": "ISC",
462
- "engines": {
463
- "node": ">=4"
464
- }
465
- },
466
- "node_modules/har-validator": {
467
- "version": "5.1.5",
468
- "license": "MIT",
469
- "dependencies": {
470
- "ajv": "^6.12.3",
471
- "har-schema": "^2.0.0"
472
- },
473
- "engines": {
474
- "node": ">=6"
475
- }
476
- },
477
324
  "node_modules/htmlparser2": {
478
325
  "version": "6.1.0",
479
326
  "funding": [
@@ -491,19 +338,6 @@
491
338
  "entities": "^2.0.0"
492
339
  }
493
340
  },
494
- "node_modules/http-signature": {
495
- "version": "1.2.0",
496
- "license": "MIT",
497
- "dependencies": {
498
- "assert-plus": "^1.0.0",
499
- "jsprim": "^1.2.2",
500
- "sshpk": "^1.7.0"
501
- },
502
- "engines": {
503
- "node": ">=0.8",
504
- "npm": ">=1.3.7"
505
- }
506
- },
507
341
  "node_modules/image-size": {
508
342
  "version": "0.5.5",
509
343
  "license": "MIT",
@@ -598,41 +432,6 @@
598
432
  "version": "2.0.0",
599
433
  "license": "ISC"
600
434
  },
601
- "node_modules/isstream": {
602
- "version": "0.1.2",
603
- "license": "MIT"
604
- },
605
- "node_modules/jsbn": {
606
- "version": "0.1.1",
607
- "license": "MIT"
608
- },
609
- "node_modules/json-schema": {
610
- "version": "0.4.0",
611
- "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
612
- "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
613
- },
614
- "node_modules/json-schema-traverse": {
615
- "version": "0.4.1",
616
- "license": "MIT"
617
- },
618
- "node_modules/json-stringify-safe": {
619
- "version": "5.0.1",
620
- "license": "ISC"
621
- },
622
- "node_modules/jsprim": {
623
- "version": "1.4.2",
624
- "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
625
- "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
626
- "dependencies": {
627
- "assert-plus": "1.0.0",
628
- "extsprintf": "1.3.0",
629
- "json-schema": "0.4.0",
630
- "verror": "1.10.0"
631
- },
632
- "engines": {
633
- "node": ">=0.6.0"
634
- }
635
- },
636
435
  "node_modules/jszip": {
637
436
  "version": "3.10.1",
638
437
  "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
@@ -716,23 +515,6 @@
716
515
  "node": ">=4"
717
516
  }
718
517
  },
719
- "node_modules/mime-db": {
720
- "version": "1.49.0",
721
- "license": "MIT",
722
- "engines": {
723
- "node": ">= 0.6"
724
- }
725
- },
726
- "node_modules/mime-types": {
727
- "version": "2.1.32",
728
- "license": "MIT",
729
- "dependencies": {
730
- "mime-db": "1.49.0"
731
- },
732
- "engines": {
733
- "node": ">= 0.6"
734
- }
735
- },
736
518
  "node_modules/ms": {
737
519
  "version": "2.0.0",
738
520
  "license": "MIT"
@@ -768,8 +550,9 @@
768
550
  }
769
551
  },
770
552
  "node_modules/node-notifier/node_modules/semver": {
771
- "version": "7.3.5",
772
- "license": "ISC",
553
+ "version": "7.6.0",
554
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
555
+ "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
773
556
  "dependencies": {
774
557
  "lru-cache": "^6.0.0"
775
558
  },
@@ -798,13 +581,6 @@
798
581
  "url": "https://github.com/fb55/nth-check?sponsor=1"
799
582
  }
800
583
  },
801
- "node_modules/oauth-sign": {
802
- "version": "0.9.0",
803
- "license": "Apache-2.0",
804
- "engines": {
805
- "node": "*"
806
- }
807
- },
808
584
  "node_modules/opn": {
809
585
  "version": "6.0.0",
810
586
  "license": "MIT",
@@ -846,10 +622,6 @@
846
622
  "util": "^0.10.3"
847
623
  }
848
624
  },
849
- "node_modules/performance-now": {
850
- "version": "2.1.0",
851
- "license": "MIT"
852
- },
853
625
  "node_modules/picomatch": {
854
626
  "version": "2.3.0",
855
627
  "license": "MIT",
@@ -888,17 +660,6 @@
888
660
  "license": "MIT",
889
661
  "optional": true
890
662
  },
891
- "node_modules/psl": {
892
- "version": "1.8.0",
893
- "license": "MIT"
894
- },
895
- "node_modules/punycode": {
896
- "version": "2.1.1",
897
- "license": "MIT",
898
- "engines": {
899
- "node": ">=6"
900
- }
901
- },
902
663
  "node_modules/q": {
903
664
  "version": "1.5.1",
904
665
  "license": "MIT",
@@ -907,14 +668,6 @@
907
668
  "teleport": ">=0.2.0"
908
669
  }
909
670
  },
910
- "node_modules/qs": {
911
- "version": "6.5.3",
912
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
913
- "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
914
- "engines": {
915
- "node": ">=0.6"
916
- }
917
- },
918
671
  "node_modules/readable-stream": {
919
672
  "version": "2.3.7",
920
673
  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -944,42 +697,6 @@
944
697
  "node": ">=8.10.0"
945
698
  }
946
699
  },
947
- "node_modules/request": {
948
- "version": "2.88.2",
949
- "license": "Apache-2.0",
950
- "dependencies": {
951
- "aws-sign2": "~0.7.0",
952
- "aws4": "^1.8.0",
953
- "caseless": "~0.12.0",
954
- "combined-stream": "~1.0.6",
955
- "extend": "~3.0.2",
956
- "forever-agent": "~0.6.1",
957
- "form-data": "~2.3.2",
958
- "har-validator": "~5.1.3",
959
- "http-signature": "~1.2.0",
960
- "is-typedarray": "~1.0.0",
961
- "isstream": "~0.1.2",
962
- "json-stringify-safe": "~5.0.1",
963
- "mime-types": "~2.1.19",
964
- "oauth-sign": "~0.9.0",
965
- "performance-now": "^2.1.0",
966
- "qs": "~6.5.2",
967
- "safe-buffer": "^5.1.2",
968
- "tough-cookie": "~2.5.0",
969
- "tunnel-agent": "^0.6.0",
970
- "uuid": "^3.3.2"
971
- },
972
- "engines": {
973
- "node": ">= 6"
974
- }
975
- },
976
- "node_modules/request/node_modules/uuid": {
977
- "version": "3.4.0",
978
- "license": "MIT",
979
- "bin": {
980
- "uuid": "bin/uuid"
981
- }
982
- },
983
700
  "node_modules/requirejs": {
984
701
  "version": "2.3.6",
985
702
  "license": "MIT",
@@ -991,35 +708,14 @@
991
708
  "node": ">=0.4.0"
992
709
  }
993
710
  },
994
- "node_modules/safe-buffer": {
995
- "version": "5.2.1",
996
- "funding": [
997
- {
998
- "type": "github",
999
- "url": "https://github.com/sponsors/feross"
1000
- },
1001
- {
1002
- "type": "patreon",
1003
- "url": "https://www.patreon.com/feross"
1004
- },
1005
- {
1006
- "type": "consulting",
1007
- "url": "https://feross.org/support"
1008
- }
1009
- ],
1010
- "license": "MIT"
1011
- },
1012
- "node_modules/safer-buffer": {
1013
- "version": "2.1.2",
1014
- "license": "MIT"
1015
- },
1016
711
  "node_modules/sax": {
1017
712
  "version": "1.2.4",
1018
713
  "license": "ISC"
1019
714
  },
1020
715
  "node_modules/semver": {
1021
- "version": "5.7.1",
1022
- "license": "ISC",
716
+ "version": "5.7.2",
717
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
718
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
1023
719
  "optional": true,
1024
720
  "bin": {
1025
721
  "semver": "bin/semver"
@@ -1042,24 +738,6 @@
1042
738
  "node": ">=0.10.0"
1043
739
  }
1044
740
  },
1045
- "node_modules/sshpk": {
1046
- "version": "1.16.1",
1047
- "license": "MIT",
1048
- "dependencies": {
1049
- "asn1": "~0.2.3",
1050
- "assert-plus": "^1.0.0",
1051
- "bcrypt-pbkdf": "^1.0.0",
1052
- "dashdash": "^1.12.0",
1053
- "ecc-jsbn": "~0.1.1",
1054
- "getpass": "^0.1.1",
1055
- "jsbn": "~0.1.0",
1056
- "safer-buffer": "^2.0.2",
1057
- "tweetnacl": "~0.14.0"
1058
- },
1059
- "engines": {
1060
- "node": ">=0.10.0"
1061
- }
1062
- },
1063
741
  "node_modules/string_decoder": {
1064
742
  "version": "1.1.1",
1065
743
  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -1083,35 +761,10 @@
1083
761
  "node": ">=8.0"
1084
762
  }
1085
763
  },
1086
- "node_modules/tough-cookie": {
1087
- "version": "2.5.0",
1088
- "license": "BSD-3-Clause",
1089
- "dependencies": {
1090
- "psl": "^1.1.28",
1091
- "punycode": "^2.1.1"
1092
- },
1093
- "engines": {
1094
- "node": ">=0.8"
1095
- }
1096
- },
1097
764
  "node_modules/tslib": {
1098
765
  "version": "2.3.0",
1099
766
  "license": "0BSD"
1100
767
  },
1101
- "node_modules/tunnel-agent": {
1102
- "version": "0.6.0",
1103
- "license": "Apache-2.0",
1104
- "dependencies": {
1105
- "safe-buffer": "^5.0.1"
1106
- },
1107
- "engines": {
1108
- "node": "*"
1109
- }
1110
- },
1111
- "node_modules/tweetnacl": {
1112
- "version": "0.14.5",
1113
- "license": "Unlicense"
1114
- },
1115
768
  "node_modules/type": {
1116
769
  "version": "1.2.0",
1117
770
  "license": "ISC"
@@ -1144,13 +797,6 @@
1144
797
  "node": ">=0.8.0"
1145
798
  }
1146
799
  },
1147
- "node_modules/uri-js": {
1148
- "version": "4.4.1",
1149
- "license": "BSD-2-Clause",
1150
- "dependencies": {
1151
- "punycode": "^2.1.0"
1152
- }
1153
- },
1154
800
  "node_modules/utf-8-validate": {
1155
801
  "version": "5.0.5",
1156
802
  "hasInstallScript": true,
@@ -1178,18 +824,6 @@
1178
824
  "uuid": "dist/bin/uuid"
1179
825
  }
1180
826
  },
1181
- "node_modules/verror": {
1182
- "version": "1.10.0",
1183
- "engines": [
1184
- "node >=0.6.0"
1185
- ],
1186
- "license": "MIT",
1187
- "dependencies": {
1188
- "assert-plus": "^1.0.0",
1189
- "core-util-is": "1.0.2",
1190
- "extsprintf": "^1.2.0"
1191
- }
1192
- },
1193
827
  "node_modules/websocket": {
1194
828
  "version": "1.0.34",
1195
829
  "license": "Apache-2.0",
@@ -1258,15 +892,6 @@
1258
892
  }
1259
893
  },
1260
894
  "dependencies": {
1261
- "ajv": {
1262
- "version": "6.12.6",
1263
- "requires": {
1264
- "fast-deep-equal": "^3.1.1",
1265
- "fast-json-stable-stringify": "^2.0.0",
1266
- "json-schema-traverse": "^0.4.1",
1267
- "uri-js": "^4.2.2"
1268
- }
1269
- },
1270
895
  "anymatch": {
1271
896
  "version": "3.1.2",
1272
897
  "requires": {
@@ -1274,38 +899,14 @@
1274
899
  "picomatch": "^2.0.4"
1275
900
  }
1276
901
  },
1277
- "asn1": {
1278
- "version": "0.2.4",
1279
- "requires": {
1280
- "safer-buffer": "~2.1.0"
1281
- }
1282
- },
1283
- "assert-plus": {
1284
- "version": "1.0.0"
1285
- },
1286
902
  "async": {
1287
903
  "version": "3.2.4",
1288
904
  "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
1289
905
  "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
1290
906
  },
1291
- "asynckit": {
1292
- "version": "0.4.0"
1293
- },
1294
- "aws-sign2": {
1295
- "version": "0.7.0"
1296
- },
1297
- "aws4": {
1298
- "version": "1.11.0"
1299
- },
1300
907
  "babylon": {
1301
908
  "version": "6.18.0"
1302
909
  },
1303
- "bcrypt-pbkdf": {
1304
- "version": "1.0.2",
1305
- "requires": {
1306
- "tweetnacl": "^0.14.3"
1307
- }
1308
- },
1309
910
  "binary-extensions": {
1310
911
  "version": "2.2.0"
1311
912
  },
@@ -1327,9 +928,6 @@
1327
928
  "node-gyp-build": "^4.2.0"
1328
929
  }
1329
930
  },
1330
- "caseless": {
1331
- "version": "0.12.0"
1332
- },
1333
931
  "cheerio": {
1334
932
  "version": "1.0.0-rc.10",
1335
933
  "requires": {
@@ -1365,12 +963,6 @@
1365
963
  "readdirp": "~3.6.0"
1366
964
  }
1367
965
  },
1368
- "combined-stream": {
1369
- "version": "1.0.8",
1370
- "requires": {
1371
- "delayed-stream": "~1.0.0"
1372
- }
1373
- },
1374
966
  "copy-anything": {
1375
967
  "version": "2.0.3",
1376
968
  "requires": {
@@ -1400,21 +992,12 @@
1400
992
  "type": "^1.0.1"
1401
993
  }
1402
994
  },
1403
- "dashdash": {
1404
- "version": "1.14.1",
1405
- "requires": {
1406
- "assert-plus": "^1.0.0"
1407
- }
1408
- },
1409
995
  "debug": {
1410
996
  "version": "2.6.9",
1411
997
  "requires": {
1412
998
  "ms": "2.0.0"
1413
999
  }
1414
1000
  },
1415
- "delayed-stream": {
1416
- "version": "1.0.0"
1417
- },
1418
1001
  "dom-serializer": {
1419
1002
  "version": "1.3.2",
1420
1003
  "requires": {
@@ -1440,13 +1023,6 @@
1440
1023
  "domhandler": "^4.2.0"
1441
1024
  }
1442
1025
  },
1443
- "ecc-jsbn": {
1444
- "version": "0.1.2",
1445
- "requires": {
1446
- "jsbn": "~0.1.0",
1447
- "safer-buffer": "^2.1.0"
1448
- }
1449
- },
1450
1026
  "entities": {
1451
1027
  "version": "2.2.0"
1452
1028
  },
@@ -1491,41 +1067,12 @@
1491
1067
  }
1492
1068
  }
1493
1069
  },
1494
- "extend": {
1495
- "version": "3.0.2"
1496
- },
1497
- "extsprintf": {
1498
- "version": "1.3.0"
1499
- },
1500
- "fast-deep-equal": {
1501
- "version": "3.1.3"
1502
- },
1503
- "fast-json-stable-stringify": {
1504
- "version": "2.1.0"
1505
- },
1506
1070
  "fill-range": {
1507
1071
  "version": "7.0.1",
1508
1072
  "requires": {
1509
1073
  "to-regex-range": "^5.0.1"
1510
1074
  }
1511
1075
  },
1512
- "forever-agent": {
1513
- "version": "0.6.1"
1514
- },
1515
- "form-data": {
1516
- "version": "2.3.3",
1517
- "requires": {
1518
- "asynckit": "^0.4.0",
1519
- "combined-stream": "^1.0.6",
1520
- "mime-types": "^2.1.12"
1521
- }
1522
- },
1523
- "getpass": {
1524
- "version": "0.1.7",
1525
- "requires": {
1526
- "assert-plus": "^1.0.0"
1527
- }
1528
- },
1529
1076
  "glob-parent": {
1530
1077
  "version": "5.1.2",
1531
1078
  "requires": {
@@ -1539,16 +1086,6 @@
1539
1086
  "growly": {
1540
1087
  "version": "1.3.0"
1541
1088
  },
1542
- "har-schema": {
1543
- "version": "2.0.0"
1544
- },
1545
- "har-validator": {
1546
- "version": "5.1.5",
1547
- "requires": {
1548
- "ajv": "^6.12.3",
1549
- "har-schema": "^2.0.0"
1550
- }
1551
- },
1552
1089
  "htmlparser2": {
1553
1090
  "version": "6.1.0",
1554
1091
  "requires": {
@@ -1558,14 +1095,6 @@
1558
1095
  "entities": "^2.0.0"
1559
1096
  }
1560
1097
  },
1561
- "http-signature": {
1562
- "version": "1.2.0",
1563
- "requires": {
1564
- "assert-plus": "^1.0.0",
1565
- "jsprim": "^1.2.2",
1566
- "sshpk": "^1.7.0"
1567
- }
1568
- },
1569
1098
  "image-size": {
1570
1099
  "version": "0.5.5",
1571
1100
  "optional": true
@@ -1619,34 +1148,6 @@
1619
1148
  "isexe": {
1620
1149
  "version": "2.0.0"
1621
1150
  },
1622
- "isstream": {
1623
- "version": "0.1.2"
1624
- },
1625
- "jsbn": {
1626
- "version": "0.1.1"
1627
- },
1628
- "json-schema": {
1629
- "version": "0.4.0",
1630
- "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
1631
- "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
1632
- },
1633
- "json-schema-traverse": {
1634
- "version": "0.4.1"
1635
- },
1636
- "json-stringify-safe": {
1637
- "version": "5.0.1"
1638
- },
1639
- "jsprim": {
1640
- "version": "1.4.2",
1641
- "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
1642
- "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
1643
- "requires": {
1644
- "assert-plus": "1.0.0",
1645
- "extsprintf": "1.3.0",
1646
- "json-schema": "0.4.0",
1647
- "verror": "1.10.0"
1648
- }
1649
- },
1650
1151
  "jszip": {
1651
1152
  "version": "3.10.1",
1652
1153
  "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
@@ -1706,15 +1207,6 @@
1706
1207
  "version": "1.6.0",
1707
1208
  "optional": true
1708
1209
  },
1709
- "mime-db": {
1710
- "version": "1.49.0"
1711
- },
1712
- "mime-types": {
1713
- "version": "2.1.32",
1714
- "requires": {
1715
- "mime-db": "1.49.0"
1716
- }
1717
- },
1718
1210
  "ms": {
1719
1211
  "version": "2.0.0"
1720
1212
  },
@@ -1740,7 +1232,9 @@
1740
1232
  },
1741
1233
  "dependencies": {
1742
1234
  "semver": {
1743
- "version": "7.3.5",
1235
+ "version": "7.6.0",
1236
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
1237
+ "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
1744
1238
  "requires": {
1745
1239
  "lru-cache": "^6.0.0"
1746
1240
  }
@@ -1758,9 +1252,6 @@
1758
1252
  "boolbase": "^1.0.0"
1759
1253
  }
1760
1254
  },
1761
- "oauth-sign": {
1762
- "version": "0.9.0"
1763
- },
1764
1255
  "opn": {
1765
1256
  "version": "6.0.0",
1766
1257
  "requires": {
@@ -1793,9 +1284,6 @@
1793
1284
  "util": "^0.10.3"
1794
1285
  }
1795
1286
  },
1796
- "performance-now": {
1797
- "version": "2.1.0"
1798
- },
1799
1287
  "picomatch": {
1800
1288
  "version": "2.3.0"
1801
1289
  },
@@ -1818,20 +1306,9 @@
1818
1306
  "version": "1.0.1",
1819
1307
  "optional": true
1820
1308
  },
1821
- "psl": {
1822
- "version": "1.8.0"
1823
- },
1824
- "punycode": {
1825
- "version": "2.1.1"
1826
- },
1827
1309
  "q": {
1828
1310
  "version": "1.5.1"
1829
1311
  },
1830
- "qs": {
1831
- "version": "6.5.3",
1832
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
1833
- "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
1834
- },
1835
1312
  "readable-stream": {
1836
1313
  "version": "2.3.7",
1837
1314
  "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -1859,50 +1336,16 @@
1859
1336
  "picomatch": "^2.2.1"
1860
1337
  }
1861
1338
  },
1862
- "request": {
1863
- "version": "2.88.2",
1864
- "requires": {
1865
- "aws-sign2": "~0.7.0",
1866
- "aws4": "^1.8.0",
1867
- "caseless": "~0.12.0",
1868
- "combined-stream": "~1.0.6",
1869
- "extend": "~3.0.2",
1870
- "forever-agent": "~0.6.1",
1871
- "form-data": "~2.3.2",
1872
- "har-validator": "~5.1.3",
1873
- "http-signature": "~1.2.0",
1874
- "is-typedarray": "~1.0.0",
1875
- "isstream": "~0.1.2",
1876
- "json-stringify-safe": "~5.0.1",
1877
- "mime-types": "~2.1.19",
1878
- "oauth-sign": "~0.9.0",
1879
- "performance-now": "^2.1.0",
1880
- "qs": "~6.5.2",
1881
- "safe-buffer": "^5.1.2",
1882
- "tough-cookie": "~2.5.0",
1883
- "tunnel-agent": "^0.6.0",
1884
- "uuid": "^3.3.2"
1885
- },
1886
- "dependencies": {
1887
- "uuid": {
1888
- "version": "3.4.0"
1889
- }
1890
- }
1891
- },
1892
1339
  "requirejs": {
1893
1340
  "version": "2.3.6"
1894
1341
  },
1895
- "safe-buffer": {
1896
- "version": "5.2.1"
1897
- },
1898
- "safer-buffer": {
1899
- "version": "2.1.2"
1900
- },
1901
1342
  "sax": {
1902
1343
  "version": "1.2.4"
1903
1344
  },
1904
1345
  "semver": {
1905
- "version": "5.7.1",
1346
+ "version": "5.7.2",
1347
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
1348
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
1906
1349
  "optional": true
1907
1350
  },
1908
1351
  "setimmediate": {
@@ -1917,20 +1360,6 @@
1917
1360
  "version": "0.6.1",
1918
1361
  "optional": true
1919
1362
  },
1920
- "sshpk": {
1921
- "version": "1.16.1",
1922
- "requires": {
1923
- "asn1": "~0.2.3",
1924
- "assert-plus": "^1.0.0",
1925
- "bcrypt-pbkdf": "^1.0.0",
1926
- "dashdash": "^1.12.0",
1927
- "ecc-jsbn": "~0.1.1",
1928
- "getpass": "^0.1.1",
1929
- "jsbn": "~0.1.0",
1930
- "safer-buffer": "^2.0.2",
1931
- "tweetnacl": "~0.14.0"
1932
- }
1933
- },
1934
1363
  "string_decoder": {
1935
1364
  "version": "1.1.1",
1936
1365
  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -1952,25 +1381,9 @@
1952
1381
  "is-number": "^7.0.0"
1953
1382
  }
1954
1383
  },
1955
- "tough-cookie": {
1956
- "version": "2.5.0",
1957
- "requires": {
1958
- "psl": "^1.1.28",
1959
- "punycode": "^2.1.1"
1960
- }
1961
- },
1962
1384
  "tslib": {
1963
1385
  "version": "2.3.0"
1964
1386
  },
1965
- "tunnel-agent": {
1966
- "version": "0.6.0",
1967
- "requires": {
1968
- "safe-buffer": "^5.0.1"
1969
- }
1970
- },
1971
- "tweetnacl": {
1972
- "version": "0.14.5"
1973
- },
1974
1387
  "type": {
1975
1388
  "version": "1.2.0"
1976
1389
  },
@@ -1986,12 +1399,6 @@
1986
1399
  "uglify-js": {
1987
1400
  "version": "3.14.1"
1988
1401
  },
1989
- "uri-js": {
1990
- "version": "4.4.1",
1991
- "requires": {
1992
- "punycode": "^2.1.0"
1993
- }
1994
- },
1995
1402
  "utf-8-validate": {
1996
1403
  "version": "5.0.5",
1997
1404
  "requires": {
@@ -2012,14 +1419,6 @@
2012
1419
  "uuid": {
2013
1420
  "version": "8.3.2"
2014
1421
  },
2015
- "verror": {
2016
- "version": "1.10.0",
2017
- "requires": {
2018
- "assert-plus": "^1.0.0",
2019
- "core-util-is": "1.0.2",
2020
- "extsprintf": "^1.2.0"
2021
- }
2022
- },
2023
1422
  "websocket": {
2024
1423
  "version": "1.0.34",
2025
1424
  "requires": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rb-homer",
3
- "version": "1.6.19",
3
+ "version": "1.6.21-beta",
4
4
  "description": "Create and synchronize Rambase applications.",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -23,7 +23,6 @@
23
23
  "path": "0.12.x",
24
24
  "pofile": "1.x.x",
25
25
  "q": "1.5.x",
26
- "request": "2.88.x",
27
26
  "requirejs": "2.3.x",
28
27
  "typescript": "3.x.x",
29
28
  "uglify-js": "3.x.x",
@@ -44,32 +44,6 @@ exports.check = function(rbConfig) {
44
44
  deferred.resolve();
45
45
  return deferred.promise;
46
46
  });
47
-
48
- // var requestModule = require("request");
49
- // requestModule('https://registry.npmjs.org/rb-homer', function (err, res) {
50
- // try {
51
- // if (!err) {
52
- // var data = res.body;
53
- // var parsedBody = JSON.parse(res.body);
54
- // var currentVersion = packageJSON.version;
55
- // var latestVersion = parsedBody['dist-tags'].latest;
56
-
57
- // if (updateNeeded(currentVersion, latestVersion)){
58
- // console.log('\x1b[45m%s\x1b[0m', 'Update available ' + currentVersion + ' -> ' + latestVersion);
59
- // console.log('Run: \x1b[36m%s\x1b[0m', 'npm install -g rb-homer');
60
- // }
61
- // }
62
-
63
- // updateTimeStamp();
64
- // deferred.resolve();
65
- // return deferred.promise;
66
-
67
- // } catch (error) {
68
- // deferred.resolve();
69
- // return deferred.promise;
70
- // }
71
-
72
- // });
73
47
 
74
48
  function updateNeeded(localVerions, remoteVersion) {
75
49
  var l = localVerions.split(".");
package/src/login.js CHANGED
@@ -32,22 +32,28 @@ function startServer(deferred, rbConfig) {
32
32
  rbConfig.access_tokenUpdatedTimeStamp = new Date().getTime();
33
33
 
34
34
  // Get userpid
35
- var requestModule = require('request');
36
- requestModule('https://api.rambase.net/system/sessions/current?$access_token=' + post.access_token, function (err, resp) {
37
- if (err) {
38
- deferred.reject();
39
- return;
40
- }
41
- if (resp && resp.body){
42
- var parsedBody = JSON.parse(resp.body);
43
- var pid = parsedBody.session.pid;
44
- var targetSystem = parsedBody.session.ramBaseName;
35
+
36
+ fetch(`https://api.rambase.net/system/sessions/current?$access_token=${post.access_token}`)
37
+ .then(response => {
38
+ if (!response.ok) {
39
+ console.log("Error");
40
+ deferred.reject();
41
+ return;
42
+ }
43
+ return response.json();
44
+ })
45
+ .then(parsedBody => {
46
+ const pid = parsedBody.session.pid;
47
+ const targetSystem = parsedBody.session.ramBaseName;
45
48
  rbConfig.pid = pid;
46
49
  rbConfig.ramBaseName = targetSystem;
47
- fs.writeFileSync(__dirname + '/rbConfig.json', JSON.stringify(rbConfig), 'utf8' );
48
- deferred.resolve(rbConfig);
49
- }
50
- });
50
+ fs.writeFileSync(`${__dirname}/rbConfig.json`, JSON.stringify(rbConfig), 'utf8');
51
+ deferred.resolve(rbConfig);
52
+ })
53
+ .catch(error => {
54
+ console.error(error);
55
+ deferred.reject();
56
+ });
51
57
  }
52
58
  else {
53
59
  deferred.reject();
@@ -95,7 +101,6 @@ function openLogin(deferred, reason, rbConfig) {
95
101
  exports.tryLogin = function(rbConfig) {
96
102
  var q = require("q");
97
103
  var deferred = q.defer();
98
- var request = require('request');
99
104
 
100
105
  var checkUpdate = require("./checkUpdate.js");
101
106
  checkUpdate.check(rbConfig).then(login);
@@ -111,26 +116,27 @@ exports.tryLogin = function(rbConfig) {
111
116
  return deferred.promise;
112
117
  }
113
118
 
114
- request
115
- .get('https://api.rambase.net/system/sessions/current?$access_token=' + rbConfig.access_token)
116
- .on('response', function(response) {
117
- if (response.statusCode !== 200) {
118
- var reason;
119
- if (response.statusCode === 401){
120
- reason = "Accesstoken expired";
121
- }
122
- else if (response === "500") {
123
- reason = "Internal server error";
124
- }
125
- openLogin(deferred, reason, rbConfig);
119
+ fetch('https://api.rambase.net/system/sessions/current?$access_token=' + rbConfig.access_token)
120
+ .then(response => {
121
+ if (response.status !== 200) {
122
+ var reason;
123
+ if (response.status === 401){
124
+ reason = "Accesstoken expired";
126
125
  }
127
- else {
128
- deferred.resolve(rbConfig);
126
+ else if (response === "500") {
127
+ reason = "Internal server error";
129
128
  }
130
- })
131
- .on('error', function(err) {
132
- openLogin(deferred, "Something went wrong", rbConfig);
133
- })
129
+ openLogin(deferred, reason, rbConfig);
130
+ }
131
+ return response.json();
132
+ })
133
+ .then(data => {
134
+ deferred.resolve(rbConfig);
135
+ })
136
+ .catch(error => {
137
+ console.error('Error:', error);
138
+ openLogin(deferred, "Something went wrong", rbConfig);
139
+ });
134
140
  }
135
141
 
136
142
  return deferred.promise;
@@ -163,14 +163,14 @@
163
163
  "rb_022": {
164
164
  "prefix": "rb-complex-dropdown (component)",
165
165
  "body": [
166
- "<div rb-fieldname=\"${1:}\"> \n\t <label rb-inspect=\"{{${2:vm.productLink}}}\" class=\"control-label\">{{'${3:Product}' | translate}}</label> \n\t <rb-complex-dropdown \n\t\t attr-placement=\"${4:bottom|left}\" \n\t\t attr-component=\"${5:productLookup}\" \n\t\t attr-params=\"${6:vm.productParams}\" \n\t\t ng-model=\"${7:vm.product.name}\" \n\t\t metadata-model=\"${8:vm.product.productId}\" \n\t\t attr-placeholder=\"{{'${9:Product lookup}' | translate}}\" \n\t\t attr-focus=\"${10:vm.setFocus}\" \n\t\t attr-onkeydown=\"${11:vm.keydown}\"> \n\t</rb-complex-dropdown> \n</div>"
166
+ "<div rb-fieldname=\"${1:}\"> \n\t <label rb-inspect=\"{{${2:vm.productLink}}}\" class=\"control-label\">{{'${3:Product}' | translate}}</label> \n\t <rb-complex-dropdown \n\t\t attr-placement=\"${4:bottom|left}\" \n\t\t attr-component=\"${5:productLookup}\" \n\t\t attr-params=\"${6:vm.productParams}\" \n\t\t ng-model=\"${7:vm.product.name}\" \n\t\t metadata-model=\"${8:vm.product.productId}\" \n\t\t attr-placeholder=\"{{'${9:Product lookup}' | translate}}\" \n\t\t attr-focus=\"${10:vm.setFocus}\" \n\t\t attr-onkeydown=\"${11:vm.keydown}\" \n\t\t attr-onclear=\"${12:vm.clearComplexDropdown()}\"> \n\t</rb-complex-dropdown> \n</div>"
167
167
  ],
168
168
  "description": "attr-params is used to pass parameters to the component specified in attr-component."
169
169
  },
170
170
  "rb_023": {
171
171
  "prefix": "rb-complex-dropdown (template)",
172
172
  "body": [
173
- "<script type=\"text/ng-template\" id=\"productTemplate\"> \n\t <div rb-grid \n\t\t k-data-source=\"vm.dataSource\" \n\t\t k-on-change=\"vm.itemSelected(kendoEvent);hidePopover()\" \n\t\t data-default-filter=\"ProductName\" \n\t\t style=\"width:450px;height:400px\" \n\t\t k-columns='[\n\t\t\t{\n\t\t\t\t\"field\":\"status\",\n\t\t\t\t\"title\":\"St\"|translate,\n\t\t\t\t\"width\":40\n\t\t\t},\n\t\t\t{\n\t\t\t\t\"field\":\"product.name\",\n\t\t\t\t\"title\":\"Product name\"|translate\n\t\t\t}]'> \n\t </div>\n</script> \n\n<div rb-fieldname=\"${1:}\"> \n\t <label rb-inspect=\"{{${2:vm.productLink}}}\" class=\"control-label\">{{'${3:Product}' | translate}}</label> \n\t <rb-complex-dropdown \n\t\t attr-placement=\"${4:bottom|left}\" \n\t\t attr-template=\"${5:productTemplate}\" \n\t\t ng-model=\"${7:vm.product.name}\" \n\t\t metadata-model=\"${8:vm.product.productId}\" \n\t\t attr-placeholder=\"{{'${9:Product lookup}' | translate}}\" \n\t\t attr-focus=\"${10:vm.setFocus}\" \n\t\t attr-onkeydown=\"${11:vm.keydown}\"> \n\t</rb-complex-dropdown> \n</div>"
173
+ "<script type=\"text/ng-template\" id=\"productTemplate\"> \n\t <div rb-grid \n\t\t k-data-source=\"vm.dataSource\" \n\t\t k-on-change=\"vm.itemSelected(kendoEvent);hidePopover()\" \n\t\t data-default-filter=\"ProductName\" \n\t\t style=\"width:450px;height:400px\" \n\t\t k-columns='[\n\t\t\t{\n\t\t\t\t\"field\":\"status\",\n\t\t\t\t\"title\":\"St\"|translate,\n\t\t\t\t\"width\":40\n\t\t\t},\n\t\t\t{\n\t\t\t\t\"field\":\"product.name\",\n\t\t\t\t\"title\":\"Product name\"|translate\n\t\t\t}]'> \n\t </div>\n</script> \n\n<div rb-fieldname=\"${1:}\"> \n\t <label rb-inspect=\"{{${2:vm.productLink}}}\" class=\"control-label\">{{'${3:Product}' | translate}}</label> \n\t <rb-complex-dropdown \n\t\t attr-placement=\"${4:bottom|left}\" \n\t\t attr-template=\"${5:productTemplate}\" \n\t\t ng-model=\"${7:vm.product.name}\" \n\t\t metadata-model=\"${8:vm.product.productId}\" \n\t\t attr-placeholder=\"{{'${9:Product lookup}' | translate}}\" \n\t\t attr-focus=\"${10:vm.setFocus}\" \n\t\t attr-onkeydown=\"${11:vm.keydown}\" \n\t\t attr-onclear=\"${12:vm.clearComplexDropdown()}\"> \n\t</rb-complex-dropdown> \n</div>"
174
174
  ],
175
175
  "description": "attr-template points to the script template id"
176
176
  },
@@ -327,5 +327,12 @@
327
327
  "<rb-input \n\t type=\"multiselect\" \n\t model=\"${1:vm.currency}\" \n\t label=\"{{'${2:Currency}' | translate}}\" \n\t rb-fieldname=\"${3:currency}\" \n\t apiresource=\"${4:base/currencies/?$top=80}\" \n\t value=\"${5:currency}\" \n\t text=\"${6:currencyDomainDescription}\" \n\t description=\"${7:vm.currencyDescr}\" \n\t k-on-change=\"${8:vm.currencySelected()}\" auto-close=\"${9:false}\" value-primitive=\"${10:true}\" k-on-deselect=\"${11:vm.currencyDeSelected()}\" placeholder=\"${12:vm.currencyPlaceholder}\">\n</rb-input>"
328
328
  ],
329
329
  "description": "Multiselect using apiresource."
330
+ },
331
+ "rb_046":{
332
+ "prefix": "rb-custom-filter",
333
+ "body": [
334
+ "<div class=\"k-header k-grid-toolbar rb-custom-filter\">\n\t<div rb-filter-field=\"\" k-data-source=\"vm.dataSource\" \n\t\t data-default-filter=\"title\" k-on-change=\"\"></div>\n\t<div class=\"rb-custom-filter-icons\">\n\t\t<i class=\"icon-plus\" ng-click=\"vm.dosomeThing()\"></i>\n\t\t<i class=\"icon-minus\"></i>\n\t</div>\n</div>"
335
+ ],
336
+ "description": "Standalone implementation of rb-filter-field"
330
337
  }
331
338
  }