IGNITE-6920 Fixed dependencies resolving.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c10aa0c4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c10aa0c4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c10aa0c4 Branch: refs/heads/ignite-zk-ce Commit: c10aa0c4bfbd18ee03887c690c27defe8cdb4b3c Parents: 9a8b95e Author: Andrey Novikov <[email protected]> Authored: Fri Nov 24 14:14:48 2017 +0700 Committer: Andrey Novikov <[email protected]> Committed: Tue Dec 12 21:39:02 2017 +0700 ---------------------------------------------------------------------- modules/web-console/backend/app/agentSocket.js | 8 ++--- .../web-console/backend/app/agentsHandler.js | 15 ++++---- modules/web-console/backend/app/apiServer.js | 9 +++-- .../web-console/backend/app/browsersHandler.js | 7 ++-- modules/web-console/backend/app/configure.js | 14 ++++++-- modules/web-console/backend/app/mongo.js | 10 +++--- modules/web-console/backend/app/mongoose.js | 8 ++--- modules/web-console/backend/app/nconf.js | 6 ++-- modules/web-console/backend/app/settings.js | 6 ++-- .../web-console/backend/routes/activities.js | 37 ++++++++++---------- modules/web-console/backend/routes/admin.js | 8 ++--- modules/web-console/backend/routes/caches.js | 6 ++-- modules/web-console/backend/routes/clusters.js | 6 ++-- .../web-console/backend/routes/configuration.js | 6 ++-- modules/web-console/backend/routes/demo.js | 7 ++-- modules/web-console/backend/routes/domains.js | 6 ++-- modules/web-console/backend/routes/downloads.js | 6 ++-- modules/web-console/backend/routes/igfss.js | 6 ++-- modules/web-console/backend/routes/notebooks.js | 7 ++-- modules/web-console/backend/routes/profile.js | 10 +++--- modules/web-console/backend/routes/public.js | 9 ++--- .../web-console/backend/services/activities.js | 7 ++-- modules/web-console/backend/services/auth.js | 5 ++- modules/web-console/backend/services/caches.js | 7 ++-- .../web-console/backend/services/clusters.js | 7 ++-- .../backend/services/configurations.js | 5 ++- modules/web-console/backend/services/domains.js | 7 ++-- .../web-console/backend/services/downloads.js | 13 +++---- modules/web-console/backend/services/igfss.js | 7 ++-- modules/web-console/backend/services/mails.js | 9 ++--- .../web-console/backend/services/notebooks.js | 7 ++-- .../backend/services/notifications.js | 5 ++- .../web-console/backend/services/sessions.js | 5 ++- modules/web-console/backend/services/users.js | 7 ++-- 34 files changed, 167 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/app/agentSocket.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/agentSocket.js b/modules/web-console/backend/app/agentSocket.js index 6e4518a..39d880f 100644 --- a/modules/web-console/backend/app/agentSocket.js +++ b/modules/web-console/backend/app/agentSocket.js @@ -17,14 +17,15 @@ 'use strict'; +const _ = require('lodash'); + // Fire me up! /** * Module interaction with agents. */ module.exports = { - implements: 'agent-socket', - inject: ['require(lodash)'] + implements: 'agent-socket' }; /** @@ -78,10 +79,9 @@ class Command { } /** - * @param _ * @returns {AgentSocket} */ -module.exports.factory = function(_) { +module.exports.factory = function() { /** * Connected agent descriptor. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/app/agentsHandler.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/agentsHandler.js b/modules/web-console/backend/app/agentsHandler.js index 844ce1e..9ee64ce 100644 --- a/modules/web-console/backend/app/agentsHandler.js +++ b/modules/web-console/backend/app/agentsHandler.js @@ -19,6 +19,12 @@ const uuid = require('uuid/v4'); +const fs = require('fs'); +const path = require('path'); +const JSZip = require('jszip'); +const socketio = require('socket.io'); +const _ = require('lodash'); + // Fire me up! /** @@ -26,21 +32,16 @@ const uuid = require('uuid/v4'); */ module.exports = { implements: 'agents-handler', - inject: ['require(lodash)', 'require(fs)', 'require(path)', 'require(jszip)', 'require(socket.io)', 'settings', 'mongo', 'agent-socket'] + inject: ['settings', 'mongo', 'agent-socket'] }; /** - * @param _ - * @param fs - * @param path - * @param JSZip - * @param socketio * @param settings * @param mongo * @param {AgentSocket} AgentSocket * @returns {AgentsHandler} */ -module.exports.factory = function(_, fs, path, JSZip, socketio, settings, mongo, AgentSocket) { +module.exports.factory = function(settings, mongo, AgentSocket) { class AgentSockets { constructor() { /** http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/app/apiServer.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/apiServer.js b/modules/web-console/backend/app/apiServer.js index cb09750..0030529 100644 --- a/modules/web-console/backend/app/apiServer.js +++ b/modules/web-console/backend/app/apiServer.js @@ -17,12 +17,17 @@ 'use strict'; +const fs = require('fs'); +const path = require('path'); + // Fire me up! +const Express = require('express'); + module.exports = { implements: 'api-server', - inject: ['require(fs)', 'require(path)', 'require(express)', 'settings', 'configure', 'routes'], - factory(fs, path, Express, settings, configure, routes) { + inject: ['settings', 'configure', 'routes'], + factory(settings, configure, routes) { /** * Connected agents manager. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/app/browsersHandler.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/browsersHandler.js b/modules/web-console/backend/app/browsersHandler.js index 7ae247b..198bc12 100644 --- a/modules/web-console/backend/app/browsersHandler.js +++ b/modules/web-console/backend/app/browsersHandler.js @@ -17,6 +17,9 @@ 'use strict'; +const _ = require('lodash'); +const socketio = require('socket.io'); + // Fire me up! /** @@ -24,8 +27,8 @@ */ module.exports = { implements: 'browsers-handler', - inject: ['require(lodash)', 'require(socket.io)', 'configure', 'errors', 'mongo'], - factory: (_, socketio, configure, errors, mongo) => { + inject: ['configure', 'errors', 'mongo'], + factory: (configure, errors, mongo) => { class BrowserSockets { constructor() { this.sockets = new Map(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/app/configure.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/configure.js b/modules/web-console/backend/app/configure.js index 7624bdd..b7bdb49 100644 --- a/modules/web-console/backend/app/configure.js +++ b/modules/web-console/backend/app/configure.js @@ -17,6 +17,15 @@ 'use strict'; +const _ = require('lodash'); +const logger = require('morgan'); +const cookieParser = require('cookie-parser'); +const bodyParser = require('body-parser'); +const session = require('express-session'); +const connectMongo = require('connect-mongo'); +const passport = require('passport'); +const passportSocketIo = require('passport.socketio'); + // Fire me up! /** @@ -24,11 +33,10 @@ */ module.exports = { implements: 'configure', - inject: ['require(lodash)', 'require(morgan)', 'require(cookie-parser)', 'require(body-parser)', - 'require(express-session)', 'require(connect-mongo)', 'require(passport)', 'require(passport.socketio)', 'settings', 'mongo', 'middlewares:*'] + inject: ['settings', 'mongo', 'middlewares:*'] }; -module.exports.factory = function(_, logger, cookieParser, bodyParser, session, connectMongo, passport, passportSocketIo, settings, mongo, apis) { +module.exports.factory = function(settings, mongo, apis) { const _sessionStore = new (connectMongo(session))({mongooseConnection: mongo.connection}); return { http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/app/mongo.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js index e0d0a0f..de91676 100644 --- a/modules/web-console/backend/app/mongo.js +++ b/modules/web-console/backend/app/mongo.js @@ -17,6 +17,8 @@ 'use strict'; +const passportMongo = require('passport-local-mongoose'); + // Fire me up! /** @@ -24,10 +26,10 @@ */ module.exports = { implements: 'mongo', - inject: ['require(passport-local-mongoose)', 'settings', 'mongoose'] + inject: ['settings', 'mongoose'] }; -const defineSchema = (passportMongo, mongoose) => { +const defineSchema = (mongoose) => { const Schema = mongoose.Schema; const ObjectId = mongoose.Schema.Types.ObjectId; const result = { connection: mongoose.connection }; @@ -1150,7 +1152,7 @@ const defineSchema = (passportMongo, mongoose) => { return result; }; -module.exports.factory = function(passportMongo, settings, mongoose) { +module.exports.factory = function(settings, mongoose) { // Use native promises mongoose.Promise = global.Promise; @@ -1204,5 +1206,5 @@ module.exports.factory = function(passportMongo, settings, mongoose) { return Promise.reject(err); }); }) - .then(() => defineSchema(passportMongo, mongoose)); + .then(() => defineSchema(mongoose)); }; http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/app/mongoose.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/mongoose.js b/modules/web-console/backend/app/mongoose.js index 7b6e7f3..94f9c60 100644 --- a/modules/web-console/backend/app/mongoose.js +++ b/modules/web-console/backend/app/mongoose.js @@ -17,13 +17,11 @@ 'use strict'; +const mongoose = require('mongoose'); + // Fire me up! module.exports = { implements: 'mongoose', - inject: ['require(mongoose)'] -}; - -module.exports.factory = (mongoose) => { - return mongoose; + factory: () => mongoose }; http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/app/nconf.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/nconf.js b/modules/web-console/backend/app/nconf.js index 6813f0f..3f5d7d1 100644 --- a/modules/web-console/backend/app/nconf.js +++ b/modules/web-console/backend/app/nconf.js @@ -17,6 +17,9 @@ 'use strict'; +const fs = require('fs'); +const nconf = require('nconf'); + // Fire me up! /** @@ -24,8 +27,7 @@ */ module.exports = { implements: 'nconf', - inject: ['require(nconf)', 'require(fs)'], - factory(nconf, fs) { + factory() { nconf.env({separator: '_'}).argv(); const dfltFile = 'config/settings.json'; http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/app/settings.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/settings.js b/modules/web-console/backend/app/settings.js index 5032443..2d94eb5 100644 --- a/modules/web-console/backend/app/settings.js +++ b/modules/web-console/backend/app/settings.js @@ -17,6 +17,8 @@ 'use strict'; +const fs = require('fs'); + // Fire me up! /** @@ -24,8 +26,8 @@ */ module.exports = { implements: 'settings', - inject: ['nconf', 'require(fs)'], - factory(nconf, fs) { + inject: ['nconf'], + factory(nconf) { /** * Normalize a port into a number, string, or false. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/activities.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/activities.js b/modules/web-console/backend/routes/activities.js index ad0e469..4db6ac2 100644 --- a/modules/web-console/backend/routes/activities.js +++ b/modules/web-console/backend/routes/activities.js @@ -17,29 +17,30 @@ 'use strict'; +const express = require('express'); + // Fire me up! module.exports = { implements: 'routes/activities', - inject: ['require(express)', 'services/activities'] -}; + inject: ['services/activities'], + /** + * @param express + * @param {ActivitiesService} activitiesService + * @returns {Promise} + */ + factory: (activitiesService) => { + return new Promise((factoryResolve) => { + const router = new express.Router(); -/** - * @param express - * @param {ActivitiesService} activitiesService - * @returns {Promise} - */ -module.exports.factory = function(express, activitiesService) { - return new Promise((factoryResolve) => { - const router = new express.Router(); + // Post user activities to page. + router.post('/page', (req, res) => { + activitiesService.merge(req.user._id, req.body) + .then(res.api.ok) + .catch(res.api.error); + }); - // Post user activities to page. - router.post('/page', (req, res) => { - activitiesService.merge(req.user._id, req.body) - .then(res.api.ok) - .catch(res.api.error); + factoryResolve(router); }); - - factoryResolve(router); - }); + } }; http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/admin.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/admin.js b/modules/web-console/backend/routes/admin.js index 5ee41c8..a9efc8d 100644 --- a/modules/web-console/backend/routes/admin.js +++ b/modules/web-console/backend/routes/admin.js @@ -17,16 +17,16 @@ 'use strict'; +const express = require('express'); + // Fire me up! module.exports = { implements: 'routes/admin', - inject: ['require(lodash)', 'require(express)', 'settings', 'mongo', 'services/spaces', 'services/mails', 'services/sessions', 'services/users', 'services/notifications'] + inject: ['settings', 'mongo', 'services/spaces', 'services/mails', 'services/sessions', 'services/users', 'services/notifications'] }; /** - * @param _ - * @param express * @param settings * @param mongo * @param spacesService @@ -36,7 +36,7 @@ module.exports = { * @param {NotificationsService} notificationsService * @returns {Promise} */ -module.exports.factory = function(_, express, settings, mongo, spacesService, mailsService, sessionsService, usersService, notificationsService) { +module.exports.factory = function(settings, mongo, spacesService, mailsService, sessionsService, usersService, notificationsService) { return new Promise((factoryResolve) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/caches.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/caches.js b/modules/web-console/backend/routes/caches.js index e040fda..d7ed8b8 100644 --- a/modules/web-console/backend/routes/caches.js +++ b/modules/web-console/backend/routes/caches.js @@ -17,14 +17,16 @@ 'use strict'; +const express = require('express'); + // Fire me up! module.exports = { implements: 'routes/caches', - inject: ['require(lodash)', 'require(express)', 'mongo', 'services/caches'] + inject: ['mongo', 'services/caches'] }; -module.exports.factory = function(_, express, mongo, cachesService) { +module.exports.factory = function(mongo, cachesService) { return new Promise((factoryResolve) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/clusters.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/clusters.js b/modules/web-console/backend/routes/clusters.js index 97a446a..24334c2 100644 --- a/modules/web-console/backend/routes/clusters.js +++ b/modules/web-console/backend/routes/clusters.js @@ -17,14 +17,16 @@ 'use strict'; +const express = require('express'); + // Fire me up! module.exports = { implements: 'routes/clusters', - inject: ['require(lodash)', 'require(express)', 'mongo', 'services/clusters'] + inject: ['mongo', 'services/clusters'] }; -module.exports.factory = function(_, express, mongo, clustersService) { +module.exports.factory = function(mongo, clustersService) { return new Promise((factoryResolve) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/configuration.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/configuration.js b/modules/web-console/backend/routes/configuration.js index c3ff5d6..d9bde75 100644 --- a/modules/web-console/backend/routes/configuration.js +++ b/modules/web-console/backend/routes/configuration.js @@ -17,14 +17,16 @@ 'use strict'; +const express = require('express'); + // Fire me up! module.exports = { implements: 'routes/configurations', - inject: ['require(lodash)', 'require(express)', 'mongo', 'services/configurations'] + inject: ['mongo', 'services/configurations'] }; -module.exports.factory = function(_, express, mongo, configurationsService) { +module.exports.factory = function(mongo, configurationsService) { return new Promise((factoryResolve) => { const router = new express.Router(); /** http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/demo.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/demo.js b/modules/web-console/backend/routes/demo.js index b200d83..a18fa7a 100644 --- a/modules/web-console/backend/routes/demo.js +++ b/modules/web-console/backend/routes/demo.js @@ -17,6 +17,9 @@ 'use strict'; +const express = require('express'); +const _ = require('lodash'); + // Fire me up! const clusters = require('./demo/clusters.json'); @@ -26,7 +29,7 @@ const igfss = require('./demo/igfss.json'); module.exports = { implements: 'routes/demo', - inject: ['require(lodash)', 'require(express)', 'errors', 'settings', 'mongo', 'services/spaces'] + inject: ['errors', 'settings', 'mongo', 'services/spaces'] }; /** @@ -39,7 +42,7 @@ module.exports = { * @param spacesService * @return {Promise} */ -module.exports.factory = (_, express, errors, settings, mongo, spacesService) => { +module.exports.factory = (errors, settings, mongo, spacesService) => { return new Promise((factoryResolve) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/domains.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/domains.js b/modules/web-console/backend/routes/domains.js index db1d892..caa9201 100644 --- a/modules/web-console/backend/routes/domains.js +++ b/modules/web-console/backend/routes/domains.js @@ -17,14 +17,16 @@ 'use strict'; +const express = require('express'); + // Fire me up! module.exports = { implements: 'routes/domains', - inject: ['require(lodash)', 'require(express)', 'mongo', 'services/domains'] + inject: ['mongo', 'services/domains'] }; -module.exports.factory = (_, express, mongo, domainsService) => { +module.exports.factory = (mongo, domainsService) => { return new Promise((factoryResolve) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/downloads.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/downloads.js b/modules/web-console/backend/routes/downloads.js index 88a1923..a06bb27 100644 --- a/modules/web-console/backend/routes/downloads.js +++ b/modules/web-console/backend/routes/downloads.js @@ -17,11 +17,13 @@ 'use strict'; +const express = require('express'); + // Fire me up! module.exports = { implements: 'routes/downloads', - inject: ['require(lodash)', 'require(express)', 'services/agents', 'services/activities'] + inject: ['services/agents', 'services/activities'] }; /** @@ -31,7 +33,7 @@ module.exports = { * @param {ActivitiesService} activitiesService * @returns {Promise} */ -module.exports.factory = function(_, express, downloadsService, activitiesService) { +module.exports.factory = function(downloadsService, activitiesService) { return new Promise((resolveFactory) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/igfss.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/igfss.js b/modules/web-console/backend/routes/igfss.js index c88d627..b95f21f 100644 --- a/modules/web-console/backend/routes/igfss.js +++ b/modules/web-console/backend/routes/igfss.js @@ -17,14 +17,16 @@ 'use strict'; +const express = require('express'); + // Fire me up! module.exports = { implements: 'routes/igfss', - inject: ['require(lodash)', 'require(express)', 'mongo', 'services/igfss'] + inject: ['mongo', 'services/igfss'] }; -module.exports.factory = function(_, express, mongo, igfssService) { +module.exports.factory = function(mongo, igfssService) { return new Promise((factoryResolve) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/notebooks.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/notebooks.js b/modules/web-console/backend/routes/notebooks.js index c330809..0807db8 100644 --- a/modules/web-console/backend/routes/notebooks.js +++ b/modules/web-console/backend/routes/notebooks.js @@ -17,14 +17,17 @@ 'use strict'; +const express = require('express'); +const _ = require('lodash'); + // Fire me up! module.exports = { implements: 'routes/notebooks', - inject: ['require(lodash)', 'require(express)', 'mongo', 'services/spaces', 'services/notebooks'] + inject: ['mongo', 'services/spaces', 'services/notebooks'] }; -module.exports.factory = (_, express, mongo, spacesService, notebooksService) => { +module.exports.factory = (mongo, spacesService, notebooksService) => { return new Promise((factoryResolve) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/profile.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/profile.js b/modules/web-console/backend/routes/profile.js index 76edf72..0ce2656 100644 --- a/modules/web-console/backend/routes/profile.js +++ b/modules/web-console/backend/routes/profile.js @@ -17,22 +17,22 @@ 'use strict'; +const express = require('express'); +const _ = require('lodash'); + // Fire me up! module.exports = { implements: 'routes/profiles', - inject: ['require(lodash)', 'require(express)', 'mongo', 'services/users'] + inject: ['mongo', 'services/users'] }; /** - * - * @param _ Lodash module - * @param express Express module * @param mongo * @param {UsersService} usersService * @returns {Promise} */ -module.exports.factory = function(_, express, mongo, usersService) { +module.exports.factory = function(mongo, usersService) { return new Promise((resolveFactory) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/routes/public.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/routes/public.js b/modules/web-console/backend/routes/public.js index 860e267..a643a00 100644 --- a/modules/web-console/backend/routes/public.js +++ b/modules/web-console/backend/routes/public.js @@ -17,23 +17,24 @@ 'use strict'; +const express = require('express'); +const passport = require('passport'); + // Fire me up! module.exports = { implements: 'routes/public', - inject: ['require(express)', 'require(passport)', 'mongo', 'services/mails', 'services/users', 'services/auth'] + inject: ['mongo', 'services/mails', 'services/users', 'services/auth'] }; /** - * @param express - * @param passport * @param mongo * @param mailsService * @param {UsersService} usersService * @param {AuthService} authService * @returns {Promise} */ -module.exports.factory = function(express, passport, mongo, mailsService, usersService, authService) { +module.exports.factory = function(mongo, mailsService, usersService, authService) { return new Promise((factoryResolve) => { const router = new express.Router(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/activities.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/activities.js b/modules/web-console/backend/services/activities.js index a049f65..9399eb0 100644 --- a/modules/web-console/backend/services/activities.js +++ b/modules/web-console/backend/services/activities.js @@ -17,19 +17,20 @@ 'use strict'; +const _ = require('lodash'); + // Fire me up! module.exports = { implements: 'services/activities', - inject: ['require(lodash)', 'mongo'] + inject: ['mongo'] }; /** - * @param _ * @param mongo * @returns {ActivitiesService} */ -module.exports.factory = (_, mongo) => { +module.exports.factory = (mongo) => { class ActivitiesService { /** * Update page activities. http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/auth.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/auth.js b/modules/web-console/backend/services/auth.js index c3423da..dde2460 100644 --- a/modules/web-console/backend/services/auth.js +++ b/modules/web-console/backend/services/auth.js @@ -21,18 +21,17 @@ module.exports = { implements: 'services/auth', - inject: ['require(lodash)', 'mongo', 'settings', 'errors'] + inject: ['mongo', 'settings', 'errors'] }; /** - * @param _ * @param mongo * @param settings * @param errors * @returns {AuthService} */ -module.exports.factory = (_, mongo, settings, errors) => { +module.exports.factory = (mongo, settings, errors) => { class AuthService { /** * Generate token string. http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/caches.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/caches.js b/modules/web-console/backend/services/caches.js index 19aed82..5c96ccd 100644 --- a/modules/web-console/backend/services/caches.js +++ b/modules/web-console/backend/services/caches.js @@ -17,21 +17,22 @@ 'use strict'; +const _ = require('lodash'); + // Fire me up! module.exports = { implements: 'services/caches', - inject: ['require(lodash)', 'mongo', 'services/spaces', 'errors'] + inject: ['mongo', 'services/spaces', 'errors'] }; /** - * @param _ * @param mongo * @param {SpacesService} spaceService * @param errors * @returns {CachesService} */ -module.exports.factory = (_, mongo, spaceService, errors) => { +module.exports.factory = (mongo, spaceService, errors) => { /** * Convert remove status operation to own presentation. * http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/clusters.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/clusters.js b/modules/web-console/backend/services/clusters.js index 06e413a..9f50ede 100644 --- a/modules/web-console/backend/services/clusters.js +++ b/modules/web-console/backend/services/clusters.js @@ -17,21 +17,22 @@ 'use strict'; +const _ = require('lodash'); + // Fire me up! module.exports = { implements: 'services/clusters', - inject: ['require(lodash)', 'mongo', 'services/spaces', 'errors'] + inject: ['mongo', 'services/spaces', 'errors'] }; /** - * @param _ * @param mongo * @param {SpacesService} spacesService * @param errors * @returns {ClustersService} */ -module.exports.factory = (_, mongo, spacesService, errors) => { +module.exports.factory = (mongo, spacesService, errors) => { /** * Convert remove status operation to own presentation. * http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/configurations.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/configurations.js b/modules/web-console/backend/services/configurations.js index 7eef8a2..36d9932 100644 --- a/modules/web-console/backend/services/configurations.js +++ b/modules/web-console/backend/services/configurations.js @@ -21,11 +21,10 @@ module.exports = { implements: 'services/configurations', - inject: ['require(lodash)', 'mongo', 'services/spaces', 'services/clusters', 'services/caches', 'services/domains', 'services/igfss'] + inject: ['mongo', 'services/spaces', 'services/clusters', 'services/caches', 'services/domains', 'services/igfss'] }; /** - * @param _ * @param mongo * @param {SpacesService} spacesService * @param {ClustersService} clustersService @@ -34,7 +33,7 @@ module.exports = { * @param {IgfssService} igfssService * @returns {ConfigurationsService} */ -module.exports.factory = (_, mongo, spacesService, clustersService, cachesService, domainsService, igfssService) => { +module.exports.factory = (mongo, spacesService, clustersService, cachesService, domainsService, igfssService) => { class ConfigurationsService { static list(userId, demo) { let spaces; http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/domains.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/domains.js b/modules/web-console/backend/services/domains.js index 22582c1..e25d091 100644 --- a/modules/web-console/backend/services/domains.js +++ b/modules/web-console/backend/services/domains.js @@ -17,22 +17,23 @@ 'use strict'; +const _ = require('lodash'); + // Fire me up! module.exports = { implements: 'services/domains', - inject: ['require(lodash)', 'mongo', 'services/spaces', 'services/caches', 'errors'] + inject: ['mongo', 'services/spaces', 'services/caches', 'errors'] }; /** - * @param _ * @param mongo * @param {SpacesService} spacesService * @param {CachesService} cachesService * @param errors * @returns {DomainsService} */ -module.exports.factory = (_, mongo, spacesService, cachesService, errors) => { +module.exports.factory = (mongo, spacesService, cachesService, errors) => { /** * Convert remove status operation to own presentation. * http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/downloads.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/downloads.js b/modules/web-console/backend/services/downloads.js index 3dfc2be..6a03fe2 100644 --- a/modules/web-console/backend/services/downloads.js +++ b/modules/web-console/backend/services/downloads.js @@ -17,24 +17,25 @@ 'use strict'; +const fs = require('fs'); +const path = require('path'); +const _ = require('lodash'); +const JSZip = require('jszip'); + // Fire me up! module.exports = { implements: 'services/agents', - inject: ['require(lodash)', 'require(fs)', 'require(path)', 'require(jszip)', 'settings', 'agents-handler', 'errors'] + inject: ['settings', 'agents-handler', 'errors'] }; /** - * @param _ - * @param fs - * @param path - * @param JSZip * @param settings * @param agentsHnd * @param errors * @returns {DownloadsService} */ -module.exports.factory = (_, fs, path, JSZip, settings, agentsHnd, errors) => { +module.exports.factory = (settings, agentsHnd, errors) => { class DownloadsService { /** * Get agent archive with user agent configuration. http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/igfss.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/igfss.js b/modules/web-console/backend/services/igfss.js index acb565b..e9ff38e 100644 --- a/modules/web-console/backend/services/igfss.js +++ b/modules/web-console/backend/services/igfss.js @@ -17,21 +17,22 @@ 'use strict'; +const _ = require('lodash'); + // Fire me up! module.exports = { implements: 'services/igfss', - inject: ['require(lodash)', 'mongo', 'services/spaces', 'errors'] + inject: ['mongo', 'services/spaces', 'errors'] }; /** - * @param _ * @param mongo * @param {SpacesService} spacesService * @param errors * @returns {IgfssService} */ -module.exports.factory = (_, mongo, spacesService, errors) => { +module.exports.factory = (mongo, spacesService, errors) => { /** * Convert remove status operation to own presentation. * http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/mails.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/mails.js b/modules/web-console/backend/services/mails.js index 3c22a95..6a31e93 100644 --- a/modules/web-console/backend/services/mails.js +++ b/modules/web-console/backend/services/mails.js @@ -17,20 +17,21 @@ 'use strict'; +const _ = require('lodash'); +const nodemailer = require('nodemailer'); + // Fire me up! module.exports = { implements: 'services/mails', - inject: ['require(lodash)', 'require(nodemailer)', 'settings'] + inject: ['settings'] }; /** - * @param _ - * @param nodemailer * @param settings * @returns {MailsService} */ -module.exports.factory = (_, nodemailer, settings) => { +module.exports.factory = (settings) => { /** * Send mail to user. * http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/notebooks.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/notebooks.js b/modules/web-console/backend/services/notebooks.js index 9aa2c38..5d8b57d 100644 --- a/modules/web-console/backend/services/notebooks.js +++ b/modules/web-console/backend/services/notebooks.js @@ -17,21 +17,22 @@ 'use strict'; +const _ = require('lodash'); + // Fire me up! module.exports = { implements: 'services/notebooks', - inject: ['require(lodash)', 'mongo', 'services/spaces', 'errors'] + inject: ['mongo', 'services/spaces', 'errors'] }; /** - * @param _ * @param mongo * @param {SpacesService} spacesService * @param errors * @returns {NotebooksService} */ -module.exports.factory = (_, mongo, spacesService, errors) => { +module.exports.factory = (mongo, spacesService, errors) => { /** * Convert remove status operation to own presentation. * http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/notifications.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/notifications.js b/modules/web-console/backend/services/notifications.js index f1860e7..c7d8033 100644 --- a/modules/web-console/backend/services/notifications.js +++ b/modules/web-console/backend/services/notifications.js @@ -21,16 +21,15 @@ module.exports = { implements: 'services/notifications', - inject: ['require(lodash)', 'mongo', 'browsers-handler'] + inject: ['mongo', 'browsers-handler'] }; /** - * @param _ * @param mongo * @param browsersHnd * @returns {NotificationsService} */ -module.exports.factory = (_, mongo, browsersHnd) => { +module.exports.factory = (mongo, browsersHnd) => { class NotificationsService { /** * Update notifications. http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/sessions.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/sessions.js b/modules/web-console/backend/services/sessions.js index 7f3fc73..0518ce2 100644 --- a/modules/web-console/backend/services/sessions.js +++ b/modules/web-console/backend/services/sessions.js @@ -21,16 +21,15 @@ module.exports = { implements: 'services/sessions', - inject: ['require(lodash)', 'mongo', 'errors'] + inject: ['mongo', 'errors'] }; /** - * @param _ * @param mongo * @param errors * @returns {SessionsService} */ -module.exports.factory = (_, mongo, errors) => { +module.exports.factory = (mongo, errors) => { class SessionsService { /** * Become user. http://git-wip-us.apache.org/repos/asf/ignite/blob/c10aa0c4/modules/web-console/backend/services/users.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/services/users.js b/modules/web-console/backend/services/users.js index 991928a..620f7e9 100644 --- a/modules/web-console/backend/services/users.js +++ b/modules/web-console/backend/services/users.js @@ -17,15 +17,16 @@ 'use strict'; +const _ = require('lodash'); + // Fire me up! module.exports = { implements: 'services/users', - inject: ['require(lodash)', 'errors', 'settings', 'mongo', 'services/spaces', 'services/mails', 'services/activities', 'agents-handler'] + inject: ['errors', 'settings', 'mongo', 'services/spaces', 'services/mails', 'services/activities', 'agents-handler'] }; /** - * @param _ * @param mongo * @param errors * @param settings @@ -35,7 +36,7 @@ module.exports = { * @param {AgentsHandler} agentHnd * @returns {UsersService} */ -module.exports.factory = (_, errors, settings, mongo, spacesService, mailsService, activitiesService, agentHnd) => { +module.exports.factory = (errors, settings, mongo, spacesService, mailsService, activitiesService, agentHnd) => { const _randomString = () => { const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; const possibleLen = possible.length;
