Skip to content

Commit d15bd11

Browse files
polonelpolonel
committed
style(code): cleanup
1 parent 613d763 commit d15bd11

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1732
-1462
lines changed

‎.eslintignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/src/public/js/plugins/*
2+
/src/public/js/vendor/*
3+
/mobile/*
4+
/public/*

‎.eslintrc.json

+15-20
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,30 @@
11
{
2-
"plugins": ["node"],
3-
"extends": ["standard", "plugin:node/recommended"],
2+
"plugins": ["import", "prettier", "standard"],
3+
"extends": ["standard", "prettier", "prettier/standard"],
44
"root": true,
55
"parserOptions": {
66
"ecmaVersion": 5
77
},
88
"env": {
99
"browser": true,
10-
"node": true
10+
"node": true,
11+
"mocha": true
1112
},
1213
"rules": {
14+
"standard/no-callback-literal": 0, // enable after error handing refactor
1315
"node/exports-style": ["error", "module.exports"],
16+
"new-cap": 0,
1417
"no-console": "off",
15-
// "new-cap": "error",
16-
"quotes": ["error", "single"],
17-
"curly": ["error", "multi-or-nest"],
18-
"complexity": ["error", 20],
19-
"wrap-iife": ["error", "outside"],
20-
"semi": ["error", "always"],
21-
"no-extra-semi": "error",
22-
"no-func-assign": "error",
23-
"no-redeclare": "error"
18+
"complexity": ["error", 20]
2419
},
2520
"globals": {
26-
"angular": 1,
27-
"define": 1,
28-
"requirejs": 1,
29-
"MG": 1,
30-
"Snackbar": 1,
31-
"ROLES": 1,
32-
"io": 1,
33-
"d3": 1
21+
"angular": true,
22+
"define": true,
23+
"requirejs": true,
24+
"MG": true,
25+
"Snackbar": true,
26+
"ROLES": true,
27+
"io": true,
28+
"d3": true
3429
}
3530
}

‎gruntfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = function (grunt) {
88

99
express: {
1010
options: {
11-
//Override Defaults
11+
// Override Defaults
1212
},
1313
web: {
1414
options: {

‎package.json

+3
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,13 @@
111111
"css-loader": "2.1.0",
112112
"eslint": "5.12.1",
113113
"eslint-config-angular": "0.5.0",
114+
"eslint-config-prettier": "3.6.0",
114115
"eslint-config-standard": "12.0.0",
115116
"eslint-plugin-angular": "4.0.0",
116117
"eslint-plugin-import": "2.14.0",
117118
"eslint-plugin-node": "8.0.1",
119+
"eslint-plugin-prettier": "3.0.1",
120+
"eslint-plugin-promise": "4.0.1",
118121
"eslint-plugin-react": "7.12.4",
119122
"eslint-plugin-standard": "4.0.0",
120123
"exports-loader": "0.7.0",

‎src/cache/quickStats.js

+2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ var init = function (tickets, callback) {
4040
function (done) {
4141
if (tickets) {
4242
ticketSchema.populate(tickets, { path: 'owner comments.owner assignee' }, function (err, _tickets) {
43+
if (err) return done(err)
44+
4345
$tickets = _tickets
4446

4547
return done()

‎src/controllers/api/v1/groups.js

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ apiGroups.get = function (req, res) {
5050

5151
if (hasPublic) {
5252
GroupSchema.getAllPublicGroups(function (err, grps) {
53+
if (err) return res.status(400).json({ success: false, error: err })
54+
5355
groups = groups.concat(grps)
5456

5557
return res.json({ success: true, groups: groups })

‎src/controllers/api/v1/reports.js

+9
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ apiReports.generate.ticketsByPriority = function (req, res) {
124124
function (done) {
125125
if (_.includes(postData.groups, '-1')) {
126126
groupSchema.getAllGroupsNoPopulate(function (err, grps) {
127+
if (err) return done(err)
127128
return done(null, grps)
128129
})
129130
} else {
@@ -199,6 +200,8 @@ apiReports.generate.ticketsByStatus = function (req, res) {
199200
function (done) {
200201
if (_.includes(postData.groups, '-1')) {
201202
groupSchema.getAllGroupsNoPopulate(function (err, grps) {
203+
if (err) return done(err)
204+
202205
return done(null, grps)
203206
})
204207
} else {
@@ -278,6 +281,8 @@ apiReports.generate.ticketsByTags = function (req, res) {
278281
function (done) {
279282
if (_.includes(postData.groups, '-1')) {
280283
groupSchema.getAllGroupsNoPopulate(function (err, grps) {
284+
if (err) return done(err)
285+
281286
return done(null, grps)
282287
})
283288
} else {
@@ -356,6 +361,8 @@ apiReports.generate.ticketsByType = function (req, res) {
356361
function (done) {
357362
if (_.includes(postData.groups, '-1')) {
358363
groupSchema.getAllGroupsNoPopulate(function (err, grps) {
364+
if (err) return done(err)
365+
359366
return done(null, grps)
360367
})
361368
} else {
@@ -434,6 +441,8 @@ apiReports.generate.ticketsByUser = function (req, res) {
434441
function (done) {
435442
if (_.includes(postData.groups, '-1')) {
436443
groupSchema.getAllGroupsNoPopulate(function (err, grps) {
444+
if (err) return done(err)
445+
437446
return done(null, grps)
438447
})
439448
} else {

‎src/controllers/api/v1/tickets.js

+2
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,8 @@ apiTickets.update = function (req, res) {
651651
if (!_.isUndefined(reqTicket.assignee) && !_.isNull(reqTicket.assignee)) {
652652
ticket.assignee = reqTicket.assignee
653653
ticket.populate('assignee', function (err, t) {
654+
if (err) return cb(err)
655+
654656
var HistoryItem = {
655657
action: 'ticket:set:assignee',
656658
description: t.assignee.fullname + ' was set as assignee',

‎src/controllers/debug.js

+8
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,17 @@ debugController.populatedatabase = function (req, res) {
389389
},
390390
function (done) {
391391
userSchema.findAll(function (err, users) {
392+
if (err) return done(err)
393+
392394
groupSchema.getAllGroups(function (err, groups) {
395+
if (err) return done(err)
396+
393397
ticketTypeSchema.getTypes(function (err, types) {
398+
if (err) return done(err)
399+
394400
tagSchema.getTags(function (err, tags) {
401+
if (err) return done(err)
402+
395403
var loremIpsum = require('lorem-ipsum')
396404
for (var i = 0; i < 100001; i++) {
397405
var user = users[Math.floor(Math.random() * users.length)]

‎src/controllers/main.js

+7
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ mainController.about = function (req, res) {
6161
var marked = require('marked')
6262
var settings = require('../models/setting')
6363
settings.getSettingByName('legal:privacypolicy', function (err, privacyPolicy) {
64+
if (err)
65+
return res.render('error', {
66+
layout: false,
67+
error: err,
68+
message: err.message
69+
})
70+
6471
var content = {}
6572
content.title = 'About'
6673
content.nav = 'about'

‎src/controllers/reports.js

+8
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ reportsController.generate = function (req, res) {
5959

6060
var prioritySchema = require('../models/ticketpriority')
6161
prioritySchema.getPriorities(function (err, priorities) {
62+
if (err) {
63+
return res.render('error', {
64+
layout: false,
65+
error: err,
66+
message: err.message
67+
})
68+
}
69+
6270
content.data.priorities = priorities
6371

6472
return res.render('subviews/reports/generate', content)

‎src/controllers/settings.js

-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
* Copyright (c) 2014-2019. All rights reserved.
1313
*/
1414

15-
var async = require('async')
1615
var _ = require('lodash')
17-
var jsStringEscape = require('js-string-escape')
18-
var settingSchema = require('../models/setting')
19-
var ticketTypeSchema = require('../models/tickettype')
2016
var permissions = require('../permissions')
2117
var settingsUtil = require('../settings/settingsUtil')
2218

‎src/controllers/tickets.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ ticketsController.getByStatus = function (req, res, next) {
9191
status: []
9292
}
9393

94-
var pathname = url.parse(req.url).pathname
94+
var pathname = url.URL(req.url).pathname
9595
var arr = pathname.split('/')
9696
var tType = 'new'
9797
var s = 0

‎src/emitter/events.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ var notifications = require('../notifications') // Load Push Events
3636
var hostname = data.hostname
3737

3838
ticketSchema.getTicketById(ticketObj._id, function (err, ticket) {
39-
if (err) return true
39+
if (err) return false
4040

4141
settingsSchema.getSettingsByName(['tps:enable', 'tps:username', 'tps:apikey'], function (err, tpsSettings) {
42+
if (err) return false
43+
4244
var tpsEnabled = _.head(_.filter(tpsSettings, ['name', 'tps:enable']))
4345
var tpsUsername = _.head(_.filter(tpsSettings, ['name', 'tps:username']))
4446
var tpsApiKey = _.head(_.filter(tpsSettings), ['name', 'tps:apikey'])
@@ -302,6 +304,8 @@ var notifications = require('../notifications') // Load Push Events
302304
io.sockets.emit('updateComments', ticket)
303305

304306
settingsSchema.getSettingsByName(['tps:enable', 'tps:username', 'tps:apikey'], function (err, tpsSettings) {
307+
if (err) return false
308+
305309
var tpsEnabled = _.head(_.filter(tpsSettings, ['name', 'tps:enable']))
306310
var tpsUsername = _.head(_.filter(tpsSettings, ['name', 'tps:username']))
307311
var tpsApiKey = _.head(_.filter(tpsSettings), ['name', 'tps:apikey'])
@@ -441,6 +445,8 @@ var notifications = require('../notifications') // Load Push Events
441445

442446
emitter.on('ticket:setAssignee', function (data) {
443447
settingsSchema.getSettingsByName(['tps:enable', 'tps:username', 'tps:apikey'], function (err, tpsSettings) {
448+
if (err) return false
449+
444450
var tpsEnabled = _.head(_.filter(tpsSettings, ['name', 'tps:enable']))
445451
var tpsUsername = _.head(_.filter(tpsSettings, ['name', 'tps:username']))
446452
var tpsApiKey = _.head(_.filter(tpsSettings), ['name', 'tps:apikey'])

‎src/helpers/hbs/helpers.js

+1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ var helpers = {
215215
return l >= r
216216
},
217217
typeof: function (l, r) {
218+
// eslint-disable-next-line
218219
return typeof l === r
219220
}
220221
}

‎src/helpers/viewdata/index.js

+8
Original file line numberDiff line numberDiff line change
@@ -312,20 +312,26 @@ viewController.getData = function (request, cb) {
312312
},
313313
function (callback) {
314314
viewController.getShowTourSetting(request, function (err, data) {
315+
if (err) return callback(err)
316+
315317
viewdata.showTour = data
316318

317319
return callback()
318320
})
319321
},
320322
function (callback) {
321323
viewController.getOverdueSetting(request, function (err, data) {
324+
if (err) return callback(err)
325+
322326
viewdata.showOverdue = data
323327

324328
return callback()
325329
})
326330
},
327331
function (callback) {
328332
viewController.getPluginsInfo(request, function (err, data) {
333+
if (err) return callback(err)
334+
329335
viewdata.plugins = data
330336

331337
return callback()
@@ -589,6 +595,8 @@ viewController.getShowTourSetting = function (request, callback) {
589595

590596
var userSchema = require('../../models/user')
591597
userSchema.getUser(request.user._id, function (err, user) {
598+
if (err) return callback(err)
599+
592600
var hasTourCompleted = false
593601

594602
if (user.preferences.tourCompleted) {

‎src/middleware/index.js

+1-19
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,19 @@
1212
* Copyright (c) 2014-2019. All rights reserved.
1313
*/
1414

15-
var _ = require('lodash')
16-
1715
var path = require('path')
18-
1916
var async = require('async')
20-
2117
var express = require('express')
22-
2318
var mongoose = require('mongoose')
24-
2519
var HandleBars = require('handlebars').create()
26-
2720
var hbs = require('express-hbs')
28-
2921
var hbsHelpers = require('../helpers/hbs/helpers')
30-
3122
var winston = require('winston')
32-
3323
var flash = require('connect-flash')
34-
3524
var bodyParser = require('body-parser')
36-
3725
var cookieParser = require('cookie-parser')
38-
39-
var favicon = require('serve-favicon')
40-
4126
var session = require('express-session')
42-
4327
var MongoStore = require('connect-mongo')(session)
44-
4528
var passportConfig = require('../passport')()
4629

4730
var middleware = {}
@@ -57,13 +40,12 @@ module.exports = function (app, db, callback) {
5740
hbs.express4({
5841
handlebars: HandleBars,
5942
defaultLayout: path.join(__dirname, '../views/layout/main.hbs'),
60-
partialsDir: [path.join(__dirname + '/../views/partials/'), path.join(__dirname + '/../views/subviews/reports')]
43+
partialsDir: [path.join(__dirname, '../views/partials/'), path.join(__dirname, '../views/subviews/reports')]
6144
})
6245
)
6346
app.set('view engine', 'hbs')
6447
hbsHelpers.register(hbs.handlebars)
6548

66-
// app.use(favicon(nconf.get('base_dir') + '/public/img/favicon.ico'));
6749
app.use(bodyParser.urlencoded({ extended: false }))
6850
app.use(bodyParser.json())
6951
app.use(cookieParser())

0 commit comments

Comments
 (0)