Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "widgets refactor"

Browse Source 
This reverts commit 9e94edb5aa.
This commit is contained in:
Baris Usakli
2017-07-07 15:35:06 -04:00
parent 9e94edb5aa
commit e0de922ede
10 changed files with 130 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/widgets/index.js
View File

@@ -3,35 +3,27 @@
var async = require('async');
var winston = require('winston');
var templates = require('templates.js');
var _ = require('lodash');
var plugins = require('../plugins');
var translator = require('../translator');
var db = require('../database');
var apiController = require('../controllers/api');
var widgets = module.exports;
widgets.render = function (uid, options, callback) {
if (!options.template) {
widgets.render = function (uid, area, req, res, callback) {
if (!area.locations || !area.template) {
return callback(new Error('[[error:invalid-data]]'));
}
async.waterfall([
function (next) {
widgets.getWidgetDataForTemplates(['global', options.template], next);
widgets.getAreas(['global', area.template], area.locations, next);
},
function (data, next) {
var widgetsByLocation = {};
delete data.global.drafts;
var locations = _.uniq(Object.keys(data.global).concat(Object.keys(data[options.template])));
var returnData = {};
async.each(locations, function (location, done) {
widgetsByLocation[location] = (data.global[location] || []).concat(data[options.template][location] || []);
async.map(area.locations, function (location, done) {
widgetsByLocation[location] = data.global[location].concat(data[area.template][location]);
if (!widgetsByLocation[location].length) {
return done(null, { location: location, widgets: [] });
@@ -41,43 +33,28 @@ widgets.render = function (uid, options, callback) {
if (!widget || !widget.data ||
(!!widget.data['hide-registered'] && uid !== 0) ||
(!!widget.data['hide-guests'] && uid === 0) ||
(!!widget.data['hide-mobile'] && options.req.useragent.isMobile)) {
(!!widget.data['hide-mobile'] && area.isMobile)) {
return next();
}
renderWidget(widget, uid, options, next);
}, function (err, renderedWidgets) {
if (err) {
return done(err);
}
returnData[location] = renderedWidgets.filter(Boolean);
done();
renderWidget(widget, uid, area, req, res, next);
}, function (err, result) {
done(err, { location: location, widgets: result.filter(Boolean) });
});
}, function (err) {
next(err, returnData);
});
}, next);
},
], callback);
};
function renderWidget(widget, uid, options, callback) {
function renderWidget(widget, uid, area, req, res, callback) {
async.waterfall([
function (next) {
if (options.res.locals.isAPI) {
apiController.loadConfig(options.req, next);
} else {
next(null, options.res.locals.config);
}
},
function (config, next) {
var templateData = _.assign(options.templateData, { config: config });
plugins.fireHook('filter:widget.render:' + widget.widget, {
uid: uid,
area: options,
templateData: templateData,
area: area,
data: widget.data,
req: options.req,
res: options.res,
req: req,
res: res,
}, next);
},
function (data, next) {
@@ -107,28 +84,23 @@ function renderWidget(widget, uid, options, callback) {
], callback);
}
widgets.getWidgetDataForTemplates = function (templates, callback) {
widgets.getAreas = function (templates, locations, callback) {
var keys = templates.map(function (tpl) {
return 'widgets:' + tpl;
});
async.waterfall([
function (next) {
db.getObjects(keys, next);
db.getObjectsFields(keys, locations, next);
},
function (data, next) {
var returnData = {};
templates.forEach(function (template, index) {
returnData[template] = returnData[template] || {};
var templateWidgetData = data[index] || {};
var locations = Object.keys(templateWidgetData);
locations.forEach(function (location) {
if (templateWidgetData && templateWidgetData[location]) {
if (data && data[index] && data[index][location]) {
try {
returnData[template][location] = JSON.parse(templateWidgetData[location]);
returnData[template][location] = JSON.parse(data[index][location]);
} catch (err) {
winston.error('can not parse widget data. template: ' + template + ' location: ' + location);
returnData[template][location] = [];