From 51b57a159cf4af79a4b5e28f4e4eeb64016183a6 Mon Sep 17 00:00:00 2001 From: EduardoFF Date: Mon, 26 Aug 2024 00:12:07 +0300 Subject: [PATCH 1/9] refactored code to remove sonar cloud warning about nested more than 4 levels deep --- public/src/client/groups/list.js | 37 +++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index aa270bf7f4..127fb545ca 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -4,7 +4,41 @@ define('forum/groups/list', [ 'forum/infinitescroll', 'benchpress', 'api', 'bootbox', 'alerts', ], function (infinitescroll, Benchpress, api, bootbox, alerts) { const Groups = {}; +Groups.init = function () { + infinitescroll.init(Groups.loadMoreGroups); + // Group creation + $('button[data-action="new"]').on('click', handleNewGroup); + + const params = utils.params(); + $('#search-sort').val(params.sort || 'alpha'); + + // Group searching + $('#search-text').on('keyup', Groups.search); + $('#search-button').on('click', Groups.search); + $('#search-sort').on('change', handleSearchSortChange); +}; + +function handleNewGroup() { + bootbox.prompt('[[groups:new-group.group-name]]', function (name) { + if (name && name.length) { + createGroup(name); + } + }); +} + +function createGroup(name) { + api.post('/groups', { name: name }) + .then((res) => { + ajaxify.go('groups/' + res.slug); + }) + .catch(alerts.error); +} + +function handleSearchSortChange() { + ajaxify.go('groups?sort=' + $('#search-sort').val()); +} + /* Groups.init = function () { infinitescroll.init(Groups.loadMoreGroups); @@ -29,7 +63,8 @@ define('forum/groups/list', [ $('#search-sort').on('change', function () { ajaxify.go('groups?sort=' + $('#search-sort').val()); }); - }; + }; + */ Groups.loadMoreGroups = function (direction) { if (direction < 0) { From 8535134d39e07abfd8aeccc84c1db7cc19946428 Mon Sep 17 00:00:00 2001 From: EduardoFF Date: Mon, 26 Aug 2024 00:17:00 +0300 Subject: [PATCH 2/9] fixed linting issues due to commented out code --- public/src/client/groups/list.js | 86 +++++++++++--------------------- 1 file changed, 29 insertions(+), 57 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 127fb545ca..89984cc499 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -4,69 +4,41 @@ define('forum/groups/list', [ 'forum/infinitescroll', 'benchpress', 'api', 'bootbox', 'alerts', ], function (infinitescroll, Benchpress, api, bootbox, alerts) { const Groups = {}; -Groups.init = function () { - infinitescroll.init(Groups.loadMoreGroups); + Groups.init = function () { + infinitescroll.init(Groups.loadMoreGroups); - // Group creation - $('button[data-action="new"]').on('click', handleNewGroup); + // Group creation + $('button[data-action="new"]').on('click', handleNewGroup); - const params = utils.params(); - $('#search-sort').val(params.sort || 'alpha'); + const params = utils.params(); + $('#search-sort').val(params.sort || 'alpha'); - // Group searching - $('#search-text').on('keyup', Groups.search); - $('#search-button').on('click', Groups.search); - $('#search-sort').on('change', handleSearchSortChange); -}; + // Group searching + $('#search-text').on('keyup', Groups.search); + $('#search-button').on('click', Groups.search); + $('#search-sort').on('change', handleSearchSortChange); + }; -function handleNewGroup() { - bootbox.prompt('[[groups:new-group.group-name]]', function (name) { - if (name && name.length) { - createGroup(name); - } - }); -} + function handleNewGroup() { + bootbox.prompt('[[groups:new-group.group-name]]', function (name) { + if (name && name.length) { + createGroup(name); + } + }); + } -function createGroup(name) { - api.post('/groups', { name: name }) - .then((res) => { - ajaxify.go('groups/' + res.slug); - }) - .catch(alerts.error); -} + function createGroup(name) { + api.post('/groups', { name: name }) + .then((res) => { + ajaxify.go('groups/' + res.slug); + }) + .catch(alerts.error); + } -function handleSearchSortChange() { - ajaxify.go('groups?sort=' + $('#search-sort').val()); -} - /* - Groups.init = function () { - infinitescroll.init(Groups.loadMoreGroups); - - // Group creation - $('button[data-action="new"]').on('click', function () { - bootbox.prompt('[[groups:new-group.group-name]]', function (name) { - if (name && name.length) { - api.post('/groups', { - name: name, - }).then((res) => { - ajaxify.go('groups/' + res.slug); - }).catch(alerts.error); - } - }); - }); - const params = utils.params(); - $('#search-sort').val(params.sort || 'alpha'); - - // Group searching - $('#search-text').on('keyup', Groups.search); - $('#search-button').on('click', Groups.search); - $('#search-sort').on('change', function () { - ajaxify.go('groups?sort=' + $('#search-sort').val()); - }); - }; - */ - - Groups.loadMoreGroups = function (direction) { + function handleSearchSortChange() { + ajaxify.go('groups?sort=' + $('#search-sort').val()); + } + Groups.loadMoreGroups = function (direction) { if (direction < 0) { return; } From cd89971f0c40cb98b9b451ecf3a0fc480925f363 Mon Sep 17 00:00:00 2001 From: EduardoFF Date: Mon, 26 Aug 2024 00:40:42 +0300 Subject: [PATCH 3/9] fixed linting errors due to mixing tab and spaces --- public/src/client/groups/list.js | 64 +++++++++++++++----------------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js index 89984cc499..46d1141eb0 100644 --- a/public/src/client/groups/list.js +++ b/public/src/client/groups/list.js @@ -1,44 +1,41 @@ 'use strict'; -define('forum/groups/list', [ - 'forum/infinitescroll', 'benchpress', 'api', 'bootbox', 'alerts', -], function (infinitescroll, Benchpress, api, bootbox, alerts) { +define('forum/groups/list', ['forum/infinitescroll', 'benchpress', 'api', 'bootbox', 'alerts'], function (infinitescroll, Benchpress, api, bootbox, alerts) { const Groups = {}; - Groups.init = function () { - infinitescroll.init(Groups.loadMoreGroups); + Groups.init = function () { + infinitescroll.init(Groups.loadMoreGroups); - // Group creation - $('button[data-action="new"]').on('click', handleNewGroup); + // Group creation + $('button[data-action="new"]').on('click', handleNewGroup); + const params = utils.params(); + $('#search-sort').val(params.sort || 'alpha'); - const params = utils.params(); - $('#search-sort').val(params.sort || 'alpha'); - - // Group searching - $('#search-text').on('keyup', Groups.search); - $('#search-button').on('click', Groups.search); - $('#search-sort').on('change', handleSearchSortChange); - }; + // Group searching + $('#search-text').on('keyup', Groups.search); + $('#search-button').on('click', Groups.search); + $('#search-sort').on('change', handleSearchSortChange); + }; - function handleNewGroup() { - bootbox.prompt('[[groups:new-group.group-name]]', function (name) { - if (name && name.length) { - createGroup(name); - } - }); - } + function handleNewGroup() { + bootbox.prompt('[[groups:new-group.group-name]]', function (name) { + if (name && name.length) { + createGroup(name); + } + }); + } - function createGroup(name) { - api.post('/groups', { name: name }) - .then((res) => { - ajaxify.go('groups/' + res.slug); - }) - .catch(alerts.error); - } + function createGroup(name) { + api.post('/groups', { name: name }) + .then((res) => { + ajaxify.go('groups/' + res.slug); + }) + .catch(alerts.error); + } - function handleSearchSortChange() { - ajaxify.go('groups?sort=' + $('#search-sort').val()); - } - Groups.loadMoreGroups = function (direction) { + function handleSearchSortChange() { + ajaxify.go('groups?sort=' + $('#search-sort').val()); + } + Groups.loadMoreGroups = function (direction) { if (direction < 0) { return; } @@ -68,7 +65,6 @@ define('forum/groups/list', [ const groupsEl = $('#groups-list'); const queryEl = $('#search-text'); const sortEl = $('#search-sort'); - socket.emit('groups.search', { query: queryEl.val(), options: { From 13d5526a61d42daee0011c743701e29ffa11ef39 Mon Sep 17 00:00:00 2001 From: EduardoFF Date: Mon, 26 Aug 2024 09:14:19 +0300 Subject: [PATCH 4/9] refactored code, tested, one line not covered --- src/settings.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/settings.js b/src/settings.js index 87508b1dcb..365a305e1d 100644 --- a/src/settings.js +++ b/src/settings.js @@ -139,18 +139,19 @@ Settings.prototype.get = function (key, def) { obj = obj[part]; } } - if (obj === undefined) { - if (def === undefined) { - def = this.defCfg; - for (let j = 0; j < parts.length; j += 1) { - part = parts[j]; - if (part && def != null) { - def = def[part]; - } + if (obj === undefined && def === undefined) { + def = this.defCfg; + for (let j = 0; j < parts.length; j += 1) { + part = parts[j]; + if (part && def != null) { + def = def[part]; } } return def; } + if (obj === undefined) { + return def; + } return obj; }; From 087dd9a75a72b73d683d8d862516a924bdfff89b Mon Sep 17 00:00:00 2001 From: EduardoFF Date: Mon, 26 Aug 2024 09:33:48 +0300 Subject: [PATCH 5/9] triggering actions --- src/settings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/settings.js b/src/settings.js index 365a305e1d..90cfe96121 100644 --- a/src/settings.js +++ b/src/settings.js @@ -149,6 +149,7 @@ Settings.prototype.get = function (key, def) { } return def; } + // this is uncovered if (obj === undefined) { return def; } From a6ff0bc62c844ad082fe025a8577d37aadba991c Mon Sep 17 00:00:00 2001 From: EduardoFF Date: Mon, 26 Aug 2024 10:04:48 +0300 Subject: [PATCH 6/9] triggering actions --- src/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.js b/src/settings.js index 90cfe96121..ee4f9e7e7a 100644 --- a/src/settings.js +++ b/src/settings.js @@ -149,7 +149,7 @@ Settings.prototype.get = function (key, def) { } return def; } - // this is uncovered + // this is uncovered, yes it is if (obj === undefined) { return def; } From 8d4c73c4449a3b8c97ff37a977b2644ac98a9567 Mon Sep 17 00:00:00 2001 From: EduardoFF Date: Mon, 26 Aug 2024 10:46:26 +0300 Subject: [PATCH 7/9] triggering actions --- src/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.js b/src/settings.js index ee4f9e7e7a..6d76d41651 100644 --- a/src/settings.js +++ b/src/settings.js @@ -149,7 +149,7 @@ Settings.prototype.get = function (key, def) { } return def; } - // this is uncovered, yes it is + // this is uncovered, if (obj === undefined) { return def; } From 5efe2c61242ed8a4e1ffdbab80b3a215471a64bc Mon Sep 17 00:00:00 2001 From: EduardoFF Date: Mon, 26 Aug 2024 10:49:09 +0300 Subject: [PATCH 8/9] triggering actions --- src/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.js b/src/settings.js index 6d76d41651..ee4f9e7e7a 100644 --- a/src/settings.js +++ b/src/settings.js @@ -149,7 +149,7 @@ Settings.prototype.get = function (key, def) { } return def; } - // this is uncovered, + // this is uncovered, yes it is if (obj === undefined) { return def; } From b1f418a939bb110a376a1f313ef7d6ec5ed20e4c Mon Sep 17 00:00:00 2001 From: EduardoFF Date: Mon, 26 Aug 2024 10:57:43 +0300 Subject: [PATCH 9/9] triggering actions --- src/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.js b/src/settings.js index ee4f9e7e7a..90cfe96121 100644 --- a/src/settings.js +++ b/src/settings.js @@ -149,7 +149,7 @@ Settings.prototype.get = function (key, def) { } return def; } - // this is uncovered, yes it is + // this is uncovered if (obj === undefined) { return def; }