feat: #7743 navigation

src/navigation/admin.js

@@ -1,23 +1,22 @@
 'use strict';
 
-var async = require('async');
 const _ = require('lodash');
 
-var plugins = require('../plugins');
+const plugins = require('../plugins');
-var db = require('../database');
+const db = require('../database');
-var translator = require('../translator');
+const translator = require('../translator');
-var pubsub = require('../pubsub');
+const pubsub = require('../pubsub');
 
-var admin = module.exports;
+const admin = module.exports;
 let cache = null;
 
 pubsub.on('admin:navigation:save', function () {
 	cache = null;
 });
 
-admin.save = function (data, callback) {
+admin.save = async function (data) {
-	var order = Object.keys(data);
+	const order = Object.keys(data);
-	var items = data.map(function (item, index) {
+	const items = data.map(function (item, index) {
 		for (var i in item) {
 			if (item.hasOwnProperty(i) && typeof item[i] === 'string' && (i === 'title' || i === 'text')) {
 				item[i] = translator.escape(item[i]);
@@ -29,54 +28,42 @@ admin.save = function (data, callback) {
 
 	cache = null;
 	pubsub.publish('admin:navigation:save');
-	async.waterfall([
+	await db.delete('navigation:enabled');
-		function (next) {
+	await db.sortedSetAdd('navigation:enabled', order, items);
-			db.delete('navigation:enabled', next);
-		},
-		function (next) {
-			db.sortedSetAdd('navigation:enabled', order, items, next);
-		},
-	], callback);
 };
 
-admin.getAdmin = function (callback) {
+admin.getAdmin = async function () {
-	async.parallel({
+	const [enabled, available] = await Promise.all([
-		enabled: admin.get,
+		admin.get(),
-		available: getAvailable,
+		getAvailable(),
-	}, callback);
+	]);
+	return { enabled: enabled, available: available };
 };
 
-admin.get = function (callback) {
+admin.get = async function () {
 	if (cache) {
-		return setImmediate(callback, null, _.cloneDeep(cache));
+		return _.cloneDeep(cache);
 	}
-	async.waterfall([
+	const data = await db.getSortedSetRange('navigation:enabled', 0, -1);
-		function (next) {
+	cache = data.map(function (item) {
-			db.getSortedSetRange('navigation:enabled', 0, -1, next);
+		item = JSON.parse(item);
-		},
+		item.groups = item.groups || [];
-		function (data, next) {
+		if (item.groups && !Array.isArray(item.groups)) {
-			data = data.map(function (item) {
+			item.groups = [item.groups];
-				item = JSON.parse(item);
+		}
-				item.groups = item.groups || [];
+		return item;
-				if (item.groups && !Array.isArray(item.groups)) {
+	});
-					item.groups = [item.groups];
-				}
-				return item;
-			});
 
-			cache = data;
+	return _.cloneDeep(cache);
-			next(null, _.cloneDeep(cache));
-		},
-	], callback);
 };
 
-function getAvailable(callback) {
+async function getAvailable() {
-	var core = require('../../install/data/navigation.json').map(function (item) {
+	const core = require('../../install/data/navigation.json').map(function (item) {
 		item.core = true;
 		return item;
 	});
 
-	plugins.fireHook('filter:navigation.available', core, callback);
+	return await plugins.fireHook('filter:navigation.available', core);
 }
 
 require('../promisify')(admin);

src/navigation/index.js

@@ -1,42 +1,36 @@
 'use strict';
 
-var async = require('async');
+const nconf = require('nconf');
-var nconf = require('nconf');
+const admin = require('./admin');
-
+const translator = require('../translator');
-var admin = require('./admin');
-var translator = require('../translator');
 const groups = require('../groups');
 
-var navigation = module.exports;
+const navigation = module.exports;
-
+
-navigation.get = function (uid, callback) {
+navigation.get = async function (uid) {
-	async.waterfall([
+	let data = await admin.get();
-		admin.get,
+
-		function (data, next) {
+	data = data.filter(item => item && item.enabled).map(function (item) {
-			data = data.filter(function (item) {
+		item.originalRoute = item.route;
-				return item && item.enabled;
+
-			}).map(function (item) {
+		if (!item.route.startsWith('http')) {
-				item.originalRoute = item.route;
+			item.route = nconf.get('relative_path') + item.route;
-
+		}
-				if (!item.route.startsWith('http')) {
+
-					item.route = nconf.get('relative_path') + item.route;
+		Object.keys(item).forEach(function (key) {
-				}
+			item[key] = translator.unescape(item[key]);
-
+		});
-				Object.keys(item).forEach(function (key) {
+
-					item[key] = translator.unescape(item[key]);
+		return item;
-				});
+	});
-
+
-				return item;
+	const pass = await Promise.all(data.map(async function (navItem) {
-			});
+		if (!navItem.groups.length) {
-
+			return true;
-			async.filter(data, function (navItem, next) {
+		}
-				if (!navItem.groups.length) {
+		return await groups.isMemberOfAny(uid, navItem.groups);
-					return setImmediate(next, null, true);
+	}));
-				}
+	return data.filter((navItem, i) => pass[i]);
-				groups.isMemberOfAny(uid, navItem.groups, next);
-			}, next);
-		},
-	], callback);
 };
 
 require('../promisify')(navigation);