Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/data/EsOrdersRepository.ts b/data/EsOrdersRepository.ts
- index d149fc4..e589deb 100644
- --- a/data/EsOrdersRepository.ts
- +++ b/data/EsOrdersRepository.ts
- @@ -6,6 +6,7 @@ import * as elasticsearch from "elasticsearch";
- import {OperationalStates} from "../enums/OperationalStates";
- import SearchParams = Elasticsearch.SearchParams;
- import {OrderLookupResult} from "../models/OrderLookupResult";
- +import {SearchResult} from "../models/SearchResult";
- import {Order} from "../models/Order";
- import {TabletTypes} from "../enums/TabletTypes";
- import {HardwareTypes} from "../enums/HardwareTypes";
- @@ -50,7 +51,7 @@ export class EsOrdersRepository {
- }
- } else {
- if (callback) {
- - callback({ success: true, found: true, orders: result.hits.hits});
- + callback({ success: true, found: true, orders: <SearchResult<Order>[]>result.hits.hits});
- }
- }
- });
- diff --git a/package.json b/package.json
- index 8647ed9..916fa2c 100644
- --- a/package.json
- +++ b/package.json
- @@ -11,6 +11,13 @@
- "author": "mike",
- "contributors": [],
- "dependencies": {
- + "@types/bluebird": "^3.5.18",
- + "@types/config": "0.0.33",
- + "@types/elasticsearch": "^5.0.17",
- + "@types/express": "^4.0.39",
- + "@types/node": "^6.0.92",
- + "@types/request": "^2.0.8",
- + "@types/request-promise": "^4.1.39",
- "bluebird": "3.4.7",
- "body-parser": "1.13.1",
- "cluster": "0.7.7",
- @@ -27,7 +34,7 @@
- "os": "0.1.1",
- "request": "2.74.0",
- "require-optional": "0.4.0",
- - "securus.tablets.libraries.svCore": "qa",
- + "securus.tablets.libraries.svCore": "dev",
- "shelljs": "0.7.4",
- "uuid": "2.0.1",
- "ws": "1.1.1",
- @@ -41,6 +48,10 @@
- "scripts": {
- "postinstall": "node ./npm-scripts/postinstall.js",
- "typings": "typings",
- - "test": "mocha"
- + "test": "mocha",
- + "tsc": "tsc"
- + },
- + "devDependencies": {
- + "typescript": "^2.6.1"
- }
- }
- diff --git a/svSlpAdminServer.js b/svSlpAdminServer.js
- index 8f320ee..324b73b 100644
- --- a/svSlpAdminServer.js
- +++ b/svSlpAdminServer.js
- @@ -99,7 +99,7 @@ function doHttpWorkers() {
- app.get('/svadmin/order/number/:orderNumber', do_orderRead); // XXX Keep
- app.get('/svadmin/inventory/aid/:sv_aid', do_inventoryRead); // XXX Keep
- // SCP functions
- - app.post("/svadmin/siteIdVerify", do_siteIdVerify); // XXX Keep
- + //app.post("/svadmin/siteIdVerify", do_siteIdVerify); // XXX Keep
- // meta-services functions
- function do_alive(req, response) {
- diff --git a/tsconfig.json b/tsconfig.json
- index b7763ea..39c3cbe 100644
- --- a/tsconfig.json
- +++ b/tsconfig.json
- @@ -1,7 +1,8 @@
- {
- "compilerOptions": {
- "module": "commonjs",
- - "target": "es5",
- + "target": "es6",
- + "lib": ["es2016"],
- "sourceMap": true
- },
- "exclude": [
- diff --git a/typings.json b/typings.json
- deleted file mode 100644
- index b0a2505..0000000
- --- a/typings.json
- +++ /dev/null
- @@ -1,15 +0,0 @@
- -{
- - "name": "securus.tablets.services.slp",
- - "dependencies": {
- - "bluebird": "registry:npm/bluebird#3.4.1+20160909132857",
- - "config": "registry:dt/config#0.0.0+20161025203753",
- - "express": "registry:npm/express#4.14.0+20160925001530",
- - "request": "registry:npm/request#2.69.0+20160428223725"
- - },
- - "globalDependencies": {
- - "elasticsearch": "registry:dt/elasticsearch#5.0.0+20170117233756",
- - "moment": "registry:dt/moment#2.11.1+20161010105546",
- - "node": "registry:dt/node#6.0.0+20161121110008",
- - "request-promise": "github:DefinitelyTyped/DefinitelyTyped/request-promise/index.d.ts#5a5ababe928c20de99c9ea172926cb0885d9c726"
- - }
- -}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement