IgniteIGNITE-10611 Web Console: Refactor "ActivitiesService" to use uer object instead of id.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b131da0d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b131da0d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b131da0d Branch: refs/heads/ignite-10189 Commit: b131da0d60e9bf1e66269d0c8e38eecc47971559 Parents: ea63af0 Author: Vasiliy Sisko <[email protected]> Authored: Mon Dec 10 10:34:26 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Dec 10 10:34:26 2018 +0700 ---------------------------------------------------------------------- modules/web-console/backend/routes/activities.js | 4 ++-- modules/web-console/backend/services/activities.js | 8 +++++--- modules/web-console/frontend/app/data/i18n.js | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b131da0d/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 4db6ac2..11fd81b 100644 --- a/modules/web-console/backend/routes/activities.js +++ b/modules/web-console/backend/routes/activities.js @@ -24,8 +24,8 @@ const express = require('express'); module.exports = { implements: 'routes/activities', inject: ['services/activities'], + /** - * @param express * @param {ActivitiesService} activitiesService * @returns {Promise} */ @@ -35,7 +35,7 @@ module.exports = { // Post user activities to page. router.post('/page', (req, res) => { - activitiesService.merge(req.user._id, req.body) + activitiesService.merge(req.user, req.body) .then(res.api.ok) .catch(res.api.error); }); http://git-wip-us.apache.org/repos/asf/ignite/blob/b131da0d/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 9399eb0..bc0245d 100644 --- a/modules/web-console/backend/services/activities.js +++ b/modules/web-console/backend/services/activities.js @@ -35,13 +35,15 @@ module.exports.factory = (mongo) => { /** * Update page activities. * - * @param {String} owner - User ID + * @param {Object} user - User. * @param {String} action - Action string presentation. * @param {String} group - Action group string presentation. * @param {Date} [now] - Optional date to save in activity. - * @returns {Promise.<mongo.ObjectId>} that resolve activity + * @returns {Promise.<mongo.ObjectId>} that resolve activity. */ - static merge(owner, {action, group}, now = new Date()) { + static merge(user, {action, group}, now = new Date()) { + const owner = user._id; + mongo.Account.findById(owner) .then((user) => { user.lastActivity = new Date(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b131da0d/modules/web-console/frontend/app/data/i18n.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/data/i18n.js b/modules/web-console/frontend/app/data/i18n.js index a3c2480..20f9d25 100644 --- a/modules/web-console/frontend/app/data/i18n.js +++ b/modules/web-console/frontend/app/data/i18n.js @@ -46,10 +46,10 @@ export default { 'base.configuration.edit.advanced.models.model': 'Advanced cluster model edit', 'base.configuration.edit.advanced.igfs': 'Advanced cluster IGFSs', 'base.configuration.edit.advanced.igfs.igfs': 'Advanced cluster IGFS edit', - 'base.sql.tabs.notebooks-list': 'Query notebooks', - 'base.sql.notebook': 'Query notebook', - 'base.settings.profile': 'User profile', 'base.settings.admin': 'Admin panel', + 'base.settings.profile': 'User profile', + 'base.sql.notebook': 'Query notebook', + 'base.sql.tabs.notebooks-list': 'Query notebooks', // app/components/page-signin/template.pug 'app.components.page-signin.m1': 'Sign In',
