CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix sortby deprecation warning (#1842)

Browse Source 
chore: 🤖 install lodash and fix sortby deprecation
This commit is contained in:
Dharini Jeeva authored and GitHub committed 2023-08-15 11:36:57 -07:00
1 parent 6d1b80aaf0
commit 40673c180c
7 files changed
+46 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ui/admin/app/routes/scopes/scope/sessions.js
+5 -5
View File
@@ -7,12 +7,11 @@ import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';
import { all, hash } from 'rsvp';
import { A } from '@ember/array';
import runEvery from 'ember-pollster/decorators/route/run-every';
import { notifySuccess, notifyError } from 'core/decorators/notify';
import config from '../../../config/environment';
import { resourceFilter } from 'core/decorators/resource-filter';
import sortBy from 'lodash/sortBy';
const POLL_TIMEOUT_SECONDS = config.sessionPollingTimeoutSeconds;
export default class ScopesScopeSessionsRoute extends Route {
@@ -80,9 +79,10 @@ export default class ScopesScopeSessionsRoute extends Route {
)
);
// Sort sessions by time created...
let sortedSessionAggregates = A(sessionAggregates)
.sortBy('session.created_time')
.reverse();
let sortedSessionAggregates = sortBy(
sessionAggregates,
'session.created_time'
).reverse();
// Then move active sessions to the top...
sortedSessionAggregates = [
...sortedSessionAggregates.filter(
ui/admin/app/routes/scopes/scope/workers/index.js
+5 -1
View File
@@ -6,6 +6,7 @@
import Route from '@ember/routing/route';
import { action } from '@ember/object';
import { resourceFilter } from 'core/decorators/resource-filter';
import sortBy from 'lodash/sortBy';
export default class ScopesScopeWorkersIndexRoute extends Route {
// =attributes
@@ -42,7 +43,10 @@ export default class ScopesScopeWorkersIndexRoute extends Route {
// =methods
model() {
const workers = this.modelFor('scopes.scope.workers').sortBy('displayName');
const workers = sortBy(
this.modelFor('scopes.scope.workers'),
'displayName'
);
if (this.tags?.length) {
// Return workers that have config tags that have at
ui/admin/package.json
+2 -1
View File
@@ -101,7 +101,8 @@
"stylelint": "^15.10.1",
"stylelint-config-prettier-scss": "^0.0.1",
"stylelint-config-standard-scss": "^6.0.0",
"webpack": "^5.76.0"
"webpack": "^5.76.0",
"lodash": "4.17.21"
},
"engines": {
"node": "12.* || 14.* || 16.*"
ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js
+3 -4
View File
@@ -4,6 +4,7 @@
*/
import Controller from '@ember/controller';
import sortBy from 'lodash/sortBy';
export default class ScopesScopeProjectsSessionsIndexController extends Controller {
// =attributes
@@ -15,10 +16,8 @@ export default class ScopesScopeProjectsSessionsIndexController extends Controll
*/
get sorted() {
const sessions = this.model;
const sortedSessions = sessions
// sort by created time
.sortBy('session.created_time')
.reverse();
// sort by created time
const sortedSessions = sortBy(sessions, 'session.created_time').reverse();
return [
// then move active sessions to the top
...sortedSessions.filter((session) => session.isCancelable),
ui/desktop/app/controllers/scopes/scope/projects/targets/target/sessions.js
+2 -2
View File
@@ -5,7 +5,7 @@
import Controller from '@ember/controller';
import { inject as service } from '@ember/service';
import { A } from '@ember/array';
import sortBy from 'lodash/sortBy';
export default class ScopesScopeProjectsTargetsTargetSessionsController extends Controller {
// =services
@@ -34,7 +34,7 @@ export default class ScopesScopeProjectsTargetsTargetSessionsController extends
);
// Sort sessions
const sortedSessions = A(filteredSessions).sortBy('created_time').reverse();
const sortedSessions = sortBy(filteredSessions, 'created_time').reverse();
return sortedSessions;
}
ui/desktop/package.json
+2 -1
View File
@@ -110,7 +110,8 @@
"stylelint": "^15.10.1",
"stylelint-config-prettier-scss": "^0.0.1",
"stylelint-config-standard-scss": "^7.0.1",
"webpack": "^5.76.0"
"webpack": "^5.76.0",
"lodash": "4.17.21"
},
"engines": {
"node": "12.* || 14.* || 16.*"
yarn.lock
+27 -2
View File
@@ -9436,7 +9436,17 @@ browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4
node-releases "^2.0.12"
update-browserslist-db "^1.0.11"
browserslist@^4.16.5, browserslist@^4.21.9:
browserslist@^4.16.5:
version "4.21.10"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
dependencies:
caniuse-lite "^1.0.30001517"
electron-to-chromium "^1.4.477"
node-releases "^2.0.13"
update-browserslist-db "^1.0.11"
browserslist@^4.21.9:
version "4.21.9"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635"
integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==
@@ -9754,6 +9764,11 @@ caniuse-lite@^1.0.30001503:
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001506.tgz#35bd814b310a487970c585430e9e80ee23faf14b"
integrity sha512-6XNEcpygZMCKaufIcgpQNZNf00GEqc7VQON+9Rd0K1bMYo8xhMZRAo5zpbnbMNizi4YNgIDAFrdykWsvY3H4Hw==
caniuse-lite@^1.0.30001517:
version "1.0.30001519"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz#3e7b8b8a7077e78b0eb054d69e6edf5c7df35601"
integrity sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==
capture-exit@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -11628,6 +11643,11 @@ electron-to-chromium@^1.4.431:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.438.tgz#425f0d51862d36f90817d6dfb7fa2a53ff6a0a73"
integrity sha512-x94U0FhphEsHsOloCvlsujHCvoir0ZQ73ZAs/QN4PLx98uNvyEU79F75rq1db75Bx/atvuh7KPeuxelh+xfYJw==
electron-to-chromium@^1.4.477:
version "1.4.489"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.489.tgz#840ebe32def1ab7b3a49e876ff84c070f76154ed"
integrity sha512-QNx+cirm4ENixfdSk9rp/3HKpjlxHFsmDoHtU1IiXdkJcpkKrd/o20LT5h1f3Qz+yfTMb4Ji3YDT/IvJkNfEkA==
element-resize-detector@^1.2.2:
version "1.2.3"
resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.3.tgz#5078d9b99398fe4c589f8c8df94ff99e5d413ff3"
@@ -18754,7 +18774,7 @@ lodash.values@^4.3.0:
resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
integrity sha512-r0RwvdCv8id9TUblb/O7rYPwVy6lerCbcawrfdo9iC/1t1wsNMJknO79WNBgwkH0hIeJ08jmvvESbFpNb4jH0Q==
lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0:
lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -20019,6 +20039,11 @@ node-releases@^2.0.12:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
integrity sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==
node-releases@^2.0.13:
version "2.0.13"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
node-watch@0.7.3:
version "0.7.3"
resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.3.tgz#6d4db88e39c8d09d3ea61d6568d80e5975abc7ab"