You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/17 04:43:20 UTC
[1/5] ignite git commit: IGNITE-843 Refactor serve to es6.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc3 ddf268ca0 -> 5990bbcf3
IGNITE-843 Refactor serve to es6.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/acf54cff
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/acf54cff
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/acf54cff
Branch: refs/heads/ignite-843-rc3
Commit: acf54cffdbb4b5b1bb48fbe87cb1cadb8478f2ab
Parents: ddf268c
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 17 10:22:14 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 17 10:22:14 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 1 +
.../src/main/js/serve/mongo.js | 9 ++---
.../src/main/js/serve/routes/admin.js | 38 +++++++++-----------
.../src/main/js/serve/routes/agent.js | 6 ++--
.../src/main/js/serve/routes/caches.js | 32 ++++++++---------
.../src/main/js/serve/routes/clusters.js | 17 ++++-----
.../src/main/js/serve/routes/domains.js | 23 +++++-------
.../src/main/js/serve/routes/igfs.js | 24 ++++++-------
.../src/main/js/serve/routes/notebooks.js | 6 ++--
9 files changed, 66 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/acf54cff/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index cf51fa3..1e06cee 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -2100,6 +2100,7 @@ consoleModule.service('$agentDownload', [
lnk.setAttribute('href', '/api/v1/agent/download/zip');
lnk.setAttribute('target', '_self');
+ lnk.setAttribute('download', null);
lnk.style.display = 'none';
document.body.appendChild(lnk);
http://git-wip-us.apache.org/repos/asf/ignite/blob/acf54cff/modules/control-center-web/src/main/js/serve/mongo.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/mongo.js b/modules/control-center-web/src/main/js/serve/mongo.js
index 0ea72d9..5f7ef9e 100644
--- a/modules/control-center-web/src/main/js/serve/mongo.js
+++ b/modules/control-center-web/src/main/js/serve/mongo.js
@@ -547,11 +547,12 @@ module.exports.factory = function(deepPopulatePlugin, passportMongo, settings, p
/**
* Extract IDs from user spaces.
*
- * @param spaces Array of user spaces.
- * @returns {Array} of spaces ID.
+ * @param userId User ID.
+ * @returns {Promise}
*/
- result.spacesIds = function(spaces) {
- return spaces.map((value) => value._id);
+ result.spaceIds = function(userId) {
+ return result.Space.find({owner: userId}).lean().exec()
+ .then((spaces) => spaces.map((space) => space._id));
};
// Registering the routes of all plugin modules
http://git-wip-us.apache.org/repos/asf/ignite/blob/acf54cff/modules/control-center-web/src/main/js/serve/routes/admin.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/admin.js b/modules/control-center-web/src/main/js/serve/routes/admin.js
index 9b8cbee..bcf8321 100644
--- a/modules/control-center-web/src/main/js/serve/routes/admin.js
+++ b/modules/control-center-web/src/main/js/serve/routes/admin.js
@@ -24,7 +24,7 @@ module.exports = {
inject: ['require(lodash)', 'require(express)', 'require(nodemailer)', 'settings', 'mail', 'mongo']
};
-module.exports.factory = function(_, express, nodemailer, settings, mail, mongo) {
+module.exports.factory = function (_, express, nodemailer, settings, mail, mongo) {
return new Promise((factoryResolve) => {
const router = new express.Router();
@@ -45,28 +45,22 @@ module.exports.factory = function(_, express, nodemailer, settings, mail, mongo)
.then((user) => {
res.sendStatus(200);
- mongo.spaces(userId)
- .then((spaces) => {
- const spacesIds = mongo.spacesIds(spaces);
-
- return Promise.all([
- mongo.Cluster.remove({space: {$in: spacesIds}}).exec(),
- mongo.Cache.remove({space: {$in: spacesIds}}).exec(),
- mongo.DomainModel.remove({space: {$in: spacesIds}}).exec(),
- mongo.Notebook.remove({space: {$in: spacesIds}}).exec(),
- mongo.Space.remove({owner: userId}).exec()
- ]);
- })
- .catch((err) => {
- console.error(`Failed to cleanup spaces [user=${user.username}, err=${err}`);
- });
-
- return Promise.resolve(user);
+ return mongo.spaceIds(userId)
+ .then((spaceIds) => Promise.all([
+ mongo.Cluster.remove({space: {$in: spaceIds}}).exec(),
+ mongo.Cache.remove({space: {$in: spaceIds}}).exec(),
+ mongo.DomainModel.remove({space: {$in: spaceIds}}).exec(),
+ mongo.Notebook.remove({space: {$in: spaceIds}}).exec(),
+ mongo.Space.remove({owner: userId}).exec()
+ ]))
+ .then(() => user)
+ .catch((err) => console.error(`Failed to cleanup spaces [user=${user.username}, err=${err}`));
})
- .then((user) => mail.send(user, 'Your account was deleted',
- `Hello ${user.username}!<br><br>` +
- `You are receiving this email because your account for ${settings.smtp.username} was removed.`,
- 'Account was removed, but failed to send email notification to user!')
+ .then((user) =>
+ mail.send(user, 'Your account was deleted',
+ `Hello ${user.username}!<br><br>` +
+ `You are receiving this email because your account for <a href="http://${req.headers.host}">${settings.smtp.username}</a> was removed.`,
+ 'Account was removed, but failed to send email notification to user!')
)
.catch((err) => mongo.handleError(res, err));
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/acf54cff/modules/control-center-web/src/main/js/serve/routes/agent.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/agent.js b/modules/control-center-web/src/main/js/serve/routes/agent.js
index 0451e52..7bb05e7 100644
--- a/modules/control-center-web/src/main/js/serve/routes/agent.js
+++ b/modules/control-center-web/src/main/js/serve/routes/agent.js
@@ -148,11 +148,9 @@ module.exports.factory = function(_, express, apacheIgnite, fs, JSZip, settings,
// Get query cursor.
const cursor = client.ignite(req.body.demo).cache(req.body.cacheName).query(qry);
- return new Promise((resolve) => {
- cursor.getAll().then((rows) => resolve({meta: cursor.fieldsMetadata(), rows}));
- });
+ return cursor.getAll()
+ .then((rows) => res.json({meta: cursor.fieldsMetadata(), rows}));
})
- .then((response) => res.json(response))
.catch(_handleException(res));
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/acf54cff/modules/control-center-web/src/main/js/serve/routes/caches.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/caches.js b/modules/control-center-web/src/main/js/serve/routes/caches.js
index 0122864..855d2fc 100644
--- a/modules/control-center-web/src/main/js/serve/routes/caches.js
+++ b/modules/control-center-web/src/main/js/serve/routes/caches.js
@@ -36,25 +36,24 @@ module.exports.factory = function(_, express, mongo) {
*/
router.post('/list', (req, res) => {
const result = {};
- let spacesIds = [];
+ let spaceIds = [];
// Get owned space and all accessed space.
- mongo.spaces(req.currentUserId())
- .then((spaces) => {
- result.spaces = spaces;
- spacesIds = mongo.spacesIds(spaces);
+ mongo.spaceIds(req.currentUserId())
+ .then((_spaceIds) => {
+ spaceIds = _spaceIds;
- return mongo.Cluster.find({space: {$in: spacesIds}}).sort('name').lean().exec();
+ mongo.Cluster.find({space: {$in: _spaceIds}}).sort('name').lean().exec()
})
.then((clusters) => {
result.clusters = clusters;
- return mongo.DomainModel.find({space: {$in: spacesIds}}).sort('name').lean().exec();
+ return mongo.DomainModel.find({space: {$in: spaceIds}}).sort('name').lean().exec();
})
.then((domains) => {
result.domains = domains;
- return mongo.Cache.find({space: {$in: spacesIds}}).sort('name').lean().exec();
+ return mongo.Cache.find({space: {$in: spaceIds}}).sort('name').lean().exec();
})
.then((caches) => {
result.caches = caches;
@@ -118,16 +117,13 @@ module.exports.factory = function(_, express, mongo) {
* Remove all caches.
*/
router.post('/remove/all', (req, res) => {
- let spacesIds = [];
-
- mongo.spaces(req.currentUserId())
- .then((spaces) => {
- spacesIds = mongo.spacesIds(spaces);
-
- return mongo.Cluster.update({space: {$in: spacesIds}}, {caches: []}, {multi: true}).exec();
- })
- .then(() => mongo.DomainModel.update({space: {$in: spacesIds}}, {caches: []}, {multi: true}).exec())
- .then(() => mongo.Cache.remove({space: {$in: spacesIds}}).exec())
+ mongo.spaceIds(req.currentUserId())
+ .then((spaceIds) =>
+ mongo.Cluster.update({space: {$in: spaceIds}}, {caches: []}, {multi: true}).exec()
+ .then(() => mongo.DomainModel.update({space: {$in: spaceIds}}, {caches: []}, {multi: true}).exec())
+ .then(() => mongo.Cache.remove({space: {$in: spaceIds}}).exec())
+ )
+ .then(() => res.sendStatus(200))
.catch((err) => mongo.handleError(res, err));
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/acf54cff/modules/control-center-web/src/main/js/serve/routes/clusters.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/clusters.js b/modules/control-center-web/src/main/js/serve/routes/clusters.js
index aae7e42..469eae7 100644
--- a/modules/control-center-web/src/main/js/serve/routes/clusters.js
+++ b/modules/control-center-web/src/main/js/serve/routes/clusters.js
@@ -42,7 +42,7 @@ module.exports.factory = function(_, express, mongo) {
mongo.spaces(req.currentUserId())
.then((spaces) => {
result.spaces = spaces;
- spacesIds = mongo.spacesIds(spaces);
+ spacesIds = spaces.map((space) => space._id);
return mongo.DomainModel.find({space: {$in: spacesIds}}).sort('valueType').lean().exec();
})
@@ -133,17 +133,12 @@ module.exports.factory = function(_, express, mongo) {
* Remove all clusters.
*/
router.post('/remove/all', (req, res) => {
- let spacesIds = [];
-
// Get owned space and all accessed space.
- mongo.spaces(req.currentUserId())
- .then((spaces) => {
- spacesIds = mongo.spacesIds(spaces);
-
- return mongo.Cache.update({space: {$in: spacesIds}}, {clusters: []}, {multi: true}).exec();
- })
- .then(() => mongo.Igfs.update({space: {$in: spacesIds}}, {clusters: []}, {multi: true}).exec())
- .then(() => mongo.Cluster.remove({space: {$in: spacesIds}}).exec())
+ mongo.spaceIds(req.currentUserId())
+ .then((spaceIds) => mongo.Cache.update({space: {$in: spaceIds}}, {clusters: []}, {multi: true}).exec()
+ .then(() => mongo.Igfs.update({space: {$in: spaceIds}}, {clusters: []}, {multi: true}).exec())
+ .then(() => mongo.Cluster.remove({space: {$in: spaceIds}}).exec())
+ )
.then(() => res.sendStatus(200))
.catch((err) => mongo.handleError(res, err));
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/acf54cff/modules/control-center-web/src/main/js/serve/routes/domains.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/domains.js b/modules/control-center-web/src/main/js/serve/routes/domains.js
index d98398b..bd2dab5 100644
--- a/modules/control-center-web/src/main/js/serve/routes/domains.js
+++ b/modules/control-center-web/src/main/js/serve/routes/domains.js
@@ -41,7 +41,7 @@ module.exports.factory = (_, express, mongo) => {
mongo.spaces(req.currentUserId())
.then((spaces) => {
result.spaces = spaces;
- spacesIds = mongo.spacesIds(spaces);
+ spacesIds = spaces.map((space) => space._id);
return mongo.Cluster.find({space: {$in: spacesIds}}, '_id name').sort('name').lean().exec();
})
@@ -181,15 +181,9 @@ module.exports.factory = (_, express, mongo) => {
* Remove all domain models.
*/
router.post('/remove/all', (req, res) => {
- let spacesIds = [];
-
- mongo.spaces(req.currentUserId())
- .then((spaces) => {
- spacesIds = mongo.spacesIds(spaces);
-
- return mongo.Cache.update({space: {$in: spacesIds}}, {domains: []}, {multi: true}).exec();
- })
- .then(() => mongo.DomainModel.remove({space: {$in: spacesIds}}).exec())
+ mongo.spaceIds(req.currentUserId())
+ .then((spaceIds) => mongo.Cache.update({space: {$in: spaceIds}}, {domains: []}, {multi: true}).exec()
+ .then(() => mongo.DomainModel.remove({space: {$in: spaceIds}}).exec()))
.then(() => res.sendStatus(200))
.catch((err) => mongo.handleError(res, err));
});
@@ -202,11 +196,12 @@ module.exports.factory = (_, express, mongo) => {
let domainIds = [];
let cacheIds = [];
- // TODO IGNITE-843 also remove from links: Cache -> DomainModel ; DomainModel -> Cache; Cluster -> Cache.
+ mongo.spaceIds(req.currentUserId())
+ .then((_spaceIds) => {
+ spaceIds = _spaceIds;
- mongo.spaces(req.currentUserId())
- .then((spaces) => spaceIds = mongo.spacesIds(spaces))
- .then(() => mongo.DomainModel.find({$and: [{space: {$in: spaceIds}}, {demo: true}]}).lean().exec())
+ mongo.DomainModel.find({$and: [{space: {$in: spaceIds}}, {demo: true}]}).lean().exec()
+ })
.then((domains) => domainIds = _.map(domains, (domain) => domain._id))
.then(() => mongo.Cache.update({domains: {$in: domainIds}}, {$pull: {domains: {$in: domainIds}}}, {multi: true}).exec())
.then(() => mongo.DomainModel.remove({_id: {$in: domainIds}}).exec())
http://git-wip-us.apache.org/repos/asf/ignite/blob/acf54cff/modules/control-center-web/src/main/js/serve/routes/igfs.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/igfs.js b/modules/control-center-web/src/main/js/serve/routes/igfs.js
index 255220a..c204079 100644
--- a/modules/control-center-web/src/main/js/serve/routes/igfs.js
+++ b/modules/control-center-web/src/main/js/serve/routes/igfs.js
@@ -36,20 +36,20 @@ module.exports.factory = function(_, express, mongo) {
*/
router.post('/list', (req, res) => {
const result = {};
- let spacesIds = [];
+ let spaceIds = [];
// Get owned space and all accessed space.
mongo.spaces(req.currentUserId())
.then((spaces) => {
result.spaces = spaces;
- spacesIds = mongo.spacesIds(spaces);
+ spaceIds = spaces.map((space) => space._id);
- return mongo.Cluster.find({space: {$in: spacesIds}}, '_id name').sort('name').lean().exec();
+ return mongo.Cluster.find({space: {$in: spaceIds}}, '_id name').sort('name').lean().exec();
})
.then((clusters) => {
result.clusters = clusters;
- return mongo.Igfs.find({space: {$in: spacesIds}}).sort('name').lean().exec();
+ return mongo.Igfs.find({space: {$in: spaceIds}}).sort('name').lean().exec();
})
.then((igfss) => {
result.igfss = igfss;
@@ -99,7 +99,7 @@ module.exports.factory = function(_, express, mongo) {
const igfsId = params._id;
mongo.Cluster.update({igfss: {$in: [igfsId]}}, {$pull: {igfss: igfsId}}, {multi: true}).exec()
- .then(mongo.Igfs.remove(params).exec())
+ .then(() => mongo.Igfs.remove(params).exec())
.then(() => res.sendStatus(200))
.catch((err) => mongo.handleError(res, err));
});
@@ -108,16 +108,12 @@ module.exports.factory = function(_, express, mongo) {
* Remove all IGFSs.
*/
router.post('/remove/all', (req, res) => {
- let spacesIds = [];
-
// Get owned space and all accessed space.
- mongo.spaces(req.currentUserId())
- .then((spaces) => {
- spacesIds = mongo.spacesIds(spaces);
-
- return mongo.Cluster.update({space: {$in: spacesIds}}, {igfss: []}, {multi: true}).exec();
- })
- .then(() => mongo.Igfs.remove({space: {$in: spacesIds}}).exec())
+ mongo.spaceIds(req.currentUserId())
+ .then((spaceIds) =>
+ mongo.Cluster.update({space: {$in: spaceIds}}, {igfss: []}, {multi: true}).exec()
+ .then(() => mongo.Igfs.remove({space: {$in: spaceIds}}).exec())
+ )
.then(() => res.sendStatus(200))
.catch((err) => mongo.handleError(res, err));
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/acf54cff/modules/control-center-web/src/main/js/serve/routes/notebooks.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/notebooks.js b/modules/control-center-web/src/main/js/serve/routes/notebooks.js
index 8e79ec1..4055c27 100644
--- a/modules/control-center-web/src/main/js/serve/routes/notebooks.js
+++ b/modules/control-center-web/src/main/js/serve/routes/notebooks.js
@@ -50,7 +50,7 @@ module.exports.factory = function(express, mongo) {
*/
router.post('/get', (req, res) => {
mongo.spaces(req.currentUserId())
- .then((spaces) => mongo.Notebook.findOne({space: {$in: spaces.map((value) => value._id)}, _id: req.body.noteId}).exec())
+ .then((spaces) => mongo.Notebook.findOne({space: {$in: spaces.map((value) => value._id)}, _id: req.body.noteId}).lean().exec())
.then((notebook) => res.json(notebook))
.catch((err) => mongo.handleError(res, err));
});
@@ -102,8 +102,8 @@ module.exports.factory = function(express, mongo) {
* @param res Response.
*/
router.post('/new', (req, res) => {
- mongo.spaces(req.currentUserId())
- .then((spaces) => (new mongo.Notebook({space: spaces[0].id, name: req.body.name})).save())
+ mongo.spaceIds(req.currentUserId())
+ .then((spaceIds) => (new mongo.Notebook({space: spaceIds[0], name: req.body.name})).save())
.then((notebook) => res.send(notebook._id))
.catch((err) => mongo.handleError(res, err));
});
[3/5] ignite git commit: IGNITE-843 Refactor serve to es6.
Posted by ak...@apache.org.
IGNITE-843 Refactor serve to es6.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f3c4c0f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f3c4c0f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f3c4c0f
Branch: refs/heads/ignite-843-rc3
Commit: 9f3c4c0f8d5320cbfd5df014afec46e916bb704b
Parents: acf54cf
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 17 10:34:06 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 17 10:34:06 2016 +0700
----------------------------------------------------------------------
.../src/main/js/serve/routes/caches.js | 9 +++++----
.../src/main/js/serve/routes/clusters.js | 12 ++++++------
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f3c4c0f/modules/control-center-web/src/main/js/serve/routes/caches.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/caches.js b/modules/control-center-web/src/main/js/serve/routes/caches.js
index 855d2fc..e5f82ce 100644
--- a/modules/control-center-web/src/main/js/serve/routes/caches.js
+++ b/modules/control-center-web/src/main/js/serve/routes/caches.js
@@ -39,11 +39,12 @@ module.exports.factory = function(_, express, mongo) {
let spaceIds = [];
// Get owned space and all accessed space.
- mongo.spaceIds(req.currentUserId())
- .then((_spaceIds) => {
- spaceIds = _spaceIds;
+ mongo.spaces(req.currentUserId())
+ .then((spaces) => {
+ result.spaces = spaces;
+ spaceIds = spaces.map((space) => space._id);
- mongo.Cluster.find({space: {$in: _spaceIds}}).sort('name').lean().exec()
+ mongo.Cluster.find({space: {$in: spaceIds}}).sort('name').lean().exec()
})
.then((clusters) => {
result.clusters = clusters;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9f3c4c0f/modules/control-center-web/src/main/js/serve/routes/clusters.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/clusters.js b/modules/control-center-web/src/main/js/serve/routes/clusters.js
index 469eae7..d05002d 100644
--- a/modules/control-center-web/src/main/js/serve/routes/clusters.js
+++ b/modules/control-center-web/src/main/js/serve/routes/clusters.js
@@ -36,15 +36,15 @@ module.exports.factory = function(_, express, mongo) {
*/
router.post('/list', (req, res) => {
const result = {};
- let spacesIds = [];
+ let spaceIds = [];
let domains = {};
mongo.spaces(req.currentUserId())
.then((spaces) => {
result.spaces = spaces;
- spacesIds = spaces.map((space) => space._id);
+ spaceIds = spaces.map((space) => space._id);
- return mongo.DomainModel.find({space: {$in: spacesIds}}).sort('valueType').lean().exec();
+ return mongo.DomainModel.find({space: {$in: spaceIds}}).sort('valueType').lean().exec();
})
.then((_domains) => {
domains = _domains.reduce((map, obj) => {
@@ -53,7 +53,7 @@ module.exports.factory = function(_, express, mongo) {
return map;
}, {});
- return mongo.Cache.find({space: {$in: spacesIds}}).sort('name').lean().exec();
+ return mongo.Cache.find({space: {$in: spaceIds}}).sort('name').lean().exec();
})
.then((caches) => {
_.forEach(caches, (cache) => {
@@ -62,12 +62,12 @@ module.exports.factory = function(_, express, mongo) {
result.caches = caches;
- return mongo.Igfs.find({space: {$in: spacesIds}}).sort('name').lean().exec();
+ return mongo.Igfs.find({space: {$in: spaceIds}}).sort('name').lean().exec();
})
.then((igfss) => {
result.igfss = igfss;
- return mongo.Cluster.find({space: {$in: spacesIds}}).sort('name').deepPopulate(mongo.ClusterDefaultPopulate).lean().exec();
+ return mongo.Cluster.find({space: {$in: spaceIds}}).sort('name').deepPopulate(mongo.ClusterDefaultPopulate).lean().exec();
})
.then((clusters) => {
result.clusters = clusters;
[4/5] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d574e96e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d574e96e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d574e96e
Branch: refs/heads/ignite-843-rc3
Commit: d574e96ef9c9964769ac272e23eb46ed7142bfa0
Parents: 9f3c4c0 0fbaf07
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 17 10:34:43 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 17 10:34:43 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/DEVNOTES.txt | 10 +++++-----
.../src/main/js/controllers/igfs-controller.js | 8 +++++++-
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[5/5] ignite git commit: IGNITE-843 Refactor serve to es6.
Posted by ak...@apache.org.
IGNITE-843 Refactor serve to es6.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5990bbcf
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5990bbcf
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5990bbcf
Branch: refs/heads/ignite-843-rc3
Commit: 5990bbcf394847e9a206401dab97d96a240f98a7
Parents: d574e96
Author: Andrey <an...@gridgain.com>
Authored: Wed Feb 17 10:37:51 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Feb 17 10:37:51 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/serve/routes/admin.js | 2 +-
modules/control-center-web/src/main/js/serve/routes/caches.js | 2 +-
modules/control-center-web/src/main/js/serve/routes/domains.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5990bbcf/modules/control-center-web/src/main/js/serve/routes/admin.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/admin.js b/modules/control-center-web/src/main/js/serve/routes/admin.js
index bcf8321..02e7183 100644
--- a/modules/control-center-web/src/main/js/serve/routes/admin.js
+++ b/modules/control-center-web/src/main/js/serve/routes/admin.js
@@ -24,7 +24,7 @@ module.exports = {
inject: ['require(lodash)', 'require(express)', 'require(nodemailer)', 'settings', 'mail', 'mongo']
};
-module.exports.factory = function (_, express, nodemailer, settings, mail, mongo) {
+module.exports.factory = function(_, express, nodemailer, settings, mail, mongo) {
return new Promise((factoryResolve) => {
const router = new express.Router();
http://git-wip-us.apache.org/repos/asf/ignite/blob/5990bbcf/modules/control-center-web/src/main/js/serve/routes/caches.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/caches.js b/modules/control-center-web/src/main/js/serve/routes/caches.js
index e5f82ce..005fa53 100644
--- a/modules/control-center-web/src/main/js/serve/routes/caches.js
+++ b/modules/control-center-web/src/main/js/serve/routes/caches.js
@@ -44,7 +44,7 @@ module.exports.factory = function(_, express, mongo) {
result.spaces = spaces;
spaceIds = spaces.map((space) => space._id);
- mongo.Cluster.find({space: {$in: spaceIds}}).sort('name').lean().exec()
+ return mongo.Cluster.find({space: {$in: spaceIds}}).sort('name').lean().exec();
})
.then((clusters) => {
result.clusters = clusters;
http://git-wip-us.apache.org/repos/asf/ignite/blob/5990bbcf/modules/control-center-web/src/main/js/serve/routes/domains.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/domains.js b/modules/control-center-web/src/main/js/serve/routes/domains.js
index bd2dab5..257c7fa 100644
--- a/modules/control-center-web/src/main/js/serve/routes/domains.js
+++ b/modules/control-center-web/src/main/js/serve/routes/domains.js
@@ -200,7 +200,7 @@ module.exports.factory = (_, express, mongo) => {
.then((_spaceIds) => {
spaceIds = _spaceIds;
- mongo.DomainModel.find({$and: [{space: {$in: spaceIds}}, {demo: true}]}).lean().exec()
+ return mongo.DomainModel.find({$and: [{space: {$in: spaceIds}}, {demo: true}]}).lean().exec();
})
.then((domains) => domainIds = _.map(domains, (domain) => domain._id))
.then(() => mongo.Cache.update({domains: {$in: domainIds}}, {$pull: {domains: {$in: domainIds}}}, {multi: true}).exec())
[2/5] ignite git commit: IGNITE-843 Minor.
Posted by ak...@apache.org.
IGNITE-843 Minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0fbaf07f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0fbaf07f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0fbaf07f
Branch: refs/heads/ignite-843-rc3
Commit: 0fbaf07f363213d8daa9544260321ceec122b9e4
Parents: acf54cf
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Feb 17 10:24:38 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Feb 17 10:24:38 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/DEVNOTES.txt | 10 +++++-----
.../src/main/js/controllers/igfs-controller.js | 8 +++++++-
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fbaf07f/modules/control-center-web/DEVNOTES.txt
----------------------------------------------------------------------
diff --git a/modules/control-center-web/DEVNOTES.txt b/modules/control-center-web/DEVNOTES.txt
index 2572d47..cd553a2 100644
--- a/modules/control-center-web/DEVNOTES.txt
+++ b/modules/control-center-web/DEVNOTES.txt
@@ -1,10 +1,10 @@
Ignite Web Console Instructions
======================================
-How to deploy:
+How to deploy locally:
-1. Install locally NodeJS using installer from site https://nodejs.org for your OS.
-2. Install locally MongoDB follow instructions from site http://docs.mongodb.org/manual/installation
+1. Install locally NodeJS (version >=4.x) using installer from site https://nodejs.org for your OS.
+2. Install locally MongoDB (version >=3.x) follow instructions from site http://docs.mongodb.org/manual/installation
3. Checkout ignite-843-rc2 branch.
4. Change directory '$IGNITE_HOME/modules/control-center-web/src/main/js'.
5. Run "npm install" in terminal for download all dependencies.
@@ -15,14 +15,14 @@ Steps 1 - 5 should be executed once.
How to run console in development mode:
-1. In terminal change dir to $MONGO_INSTALL_DIR/server/3.0/bin
+1. Configure MongoDB to run as service or in terminal change dir to $MONGO_INSTALL_DIR/server/3.0/bin
and start MongoDB by executing "mongod".
2. In new terminal change directory '$IGNITE_HOME/modules/control-center-web/src/main/js'
and start application by executing "npm start".
3. In new terminal change directory '$IGNITE_HOME/modules/control-center-web/src/main/js'
- and start virtual server and local changes watcher by executing "gulp watch"
+ and start virtual server and local changes watcher by executing "gulp watch --debug"
or "gulp connect" to start virtual server only.
4. In browser open: http://localhost:8090
http://git-wip-us.apache.org/repos/asf/ignite/blob/0fbaf07f/modules/control-center-web/src/main/js/controllers/igfs-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
index de45a55..10f1cf4 100644
--- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js
@@ -362,10 +362,16 @@ consoleModule.controller('igfsController', [
}
};
+ function _igfsNames() {
+ return _.map($scope.igfss, function (igfs) {
+ return igfs.name;
+ });
+ }
+
// Save IGFS with new name.
$scope.cloneItem = function () {
if ($scope.tableReset(true) && validate($scope.backupItem)) {
- $clone.confirm($scope.backupItem.name).then(function (newName) {
+ $clone.confirm($scope.backupItem.name, _igfsNames()).then(function (newName) {
var item = angular.copy($scope.backupItem);
delete item._id;