diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-07-30 10:54:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-30 14:24:54 +0530 |
commit | f4b4416ea52d564bc2dbe543a82084ed98843ccc (patch) | |
tree | 7ca6b23571c86458a6b799746c91a7191de02715 /src/stores/ServicesStore.js | |
parent | 5.6.1-nightly.8 [skip ci] (diff) | |
download | ferdium-app-f4b4416ea52d564bc2dbe543a82084ed98843ccc.tar.gz ferdium-app-f4b4416ea52d564bc2dbe543a82084ed98843ccc.tar.zst ferdium-app-f4b4416ea52d564bc2dbe543a82084ed98843ccc.zip |
chore: migrate from tslint to @typescript-eslint (#1706)
- update .eslintrc to work for .js and .ts
- update devDependencies
- lint properly both root /src and nested /packages
- update webhint recommended setting for tsconfig.json to shrink output
- Manage all eslint rules from the repo root
- escape single quotes in scripts to please windows build
Co-authored-by: Vijay A <avijayr@protonmail.com>
Diffstat (limited to 'src/stores/ServicesStore.js')
-rw-r--r-- | src/stores/ServicesStore.js | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index fa31dc292..fefcb5080 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -216,7 +216,7 @@ export default class ServicesStore extends Store { | |||
216 | } | 216 | } |
217 | 217 | ||
218 | @computed get enabled() { | 218 | @computed get enabled() { |
219 | return this.all.filter(service => service.isEnabled); | 219 | return this.all.filter((service) => service.isEnabled); |
220 | } | 220 | } |
221 | 221 | ||
222 | @computed get allDisplayed() { | 222 | @computed get allDisplayed() { |
@@ -229,7 +229,7 @@ export default class ServicesStore extends Store { | |||
229 | const { showDisabledServices } = this.stores.settings.all.app; | 229 | const { showDisabledServices } = this.stores.settings.all.app; |
230 | const { keepAllWorkspacesLoaded } = this.stores.workspaces.settings; | 230 | const { keepAllWorkspacesLoaded } = this.stores.workspaces.settings; |
231 | const services = this.allServicesRequest.execute().result || []; | 231 | const services = this.allServicesRequest.execute().result || []; |
232 | const filteredServices = showDisabledServices ? services : services.filter(service => service.isEnabled); | 232 | const filteredServices = showDisabledServices ? services : services.filter((service) => service.isEnabled); |
233 | 233 | ||
234 | let displayedServices; | 234 | let displayedServices; |
235 | if (keepAllWorkspacesLoaded) { | 235 | if (keepAllWorkspacesLoaded) { |
@@ -244,8 +244,8 @@ export default class ServicesStore extends Store { | |||
244 | // Check if workspace needs to be kept loaded | 244 | // Check if workspace needs to be kept loaded |
245 | if (workspace.services.includes(KEEP_WS_LOADED_USID)) { | 245 | if (workspace.services.includes(KEEP_WS_LOADED_USID)) { |
246 | // Get services for workspace | 246 | // Get services for workspace |
247 | const serviceIDs = workspace.services.filter(i => i !== KEEP_WS_LOADED_USID); | 247 | const serviceIDs = workspace.services.filter((i) => i !== KEEP_WS_LOADED_USID); |
248 | const wsServices = filteredServices.filter(service => serviceIDs.includes(service.id)); | 248 | const wsServices = filteredServices.filter((service) => serviceIDs.includes(service.id)); |
249 | 249 | ||
250 | displayedServices = [ | 250 | displayedServices = [ |
251 | ...displayedServices, | 251 | ...displayedServices, |
@@ -262,11 +262,11 @@ export default class ServicesStore extends Store { | |||
262 | } | 262 | } |
263 | 263 | ||
264 | @computed get filtered() { | 264 | @computed get filtered() { |
265 | return this.all.filter(service => service.name.toLowerCase().includes(this.filterNeedle.toLowerCase())); | 265 | return this.all.filter((service) => service.name.toLowerCase().includes(this.filterNeedle.toLowerCase())); |
266 | } | 266 | } |
267 | 267 | ||
268 | @computed get active() { | 268 | @computed get active() { |
269 | return this.all.find(service => service.isActive); | 269 | return this.all.find((service) => service.isActive); |
270 | } | 270 | } |
271 | 271 | ||
272 | @computed get activeSettings() { | 272 | @computed get activeSettings() { |
@@ -284,7 +284,7 @@ export default class ServicesStore extends Store { | |||
284 | } | 284 | } |
285 | 285 | ||
286 | @computed get isTodosServiceAdded() { | 286 | @computed get isTodosServiceAdded() { |
287 | return this.allDisplayed.find(service => service.isTodosService && service.isEnabled) || false; | 287 | return this.allDisplayed.find((service) => service.isTodosService && service.isEnabled) || false; |
288 | } | 288 | } |
289 | 289 | ||
290 | @computed get isTodosServiceActive() { | 290 | @computed get isTodosServiceActive() { |
@@ -292,7 +292,7 @@ export default class ServicesStore extends Store { | |||
292 | } | 292 | } |
293 | 293 | ||
294 | one(id) { | 294 | one(id) { |
295 | return this.all.find(service => service.id === id); | 295 | return this.all.find((service) => service.id === id); |
296 | } | 296 | } |
297 | 297 | ||
298 | async _showAddServiceInterface({ recipeId }) { | 298 | async _showAddServiceInterface({ recipeId }) { |
@@ -400,7 +400,7 @@ export default class ServicesStore extends Store { | |||
400 | newData.iconUrl = data.customIconUrl; | 400 | newData.iconUrl = data.customIconUrl; |
401 | } | 401 | } |
402 | 402 | ||
403 | Object.assign(result.find(c => c.id === serviceId), newData); | 403 | Object.assign(result.find((c) => c.id === serviceId), newData); |
404 | }); | 404 | }); |
405 | 405 | ||
406 | await request._promise; | 406 | await request._promise; |
@@ -434,7 +434,7 @@ export default class ServicesStore extends Store { | |||
434 | } | 434 | } |
435 | 435 | ||
436 | this.allServicesRequest.patch((result) => { | 436 | this.allServicesRequest.patch((result) => { |
437 | remove(result, c => c.id === serviceId); | 437 | remove(result, (c) => c.id === serviceId); |
438 | }); | 438 | }); |
439 | 439 | ||
440 | await request._promise; | 440 | await request._promise; |
@@ -493,7 +493,7 @@ export default class ServicesStore extends Store { | |||
493 | } | 493 | } |
494 | 494 | ||
495 | // Update list of last used services | 495 | // Update list of last used services |
496 | this.lastUsedServices = this.lastUsedServices.filter(id => id !== serviceId); | 496 | this.lastUsedServices = this.lastUsedServices.filter((id) => id !== serviceId); |
497 | this.lastUsedServices.unshift(serviceId); | 497 | this.lastUsedServices.unshift(serviceId); |
498 | 498 | ||
499 | this._focusActiveService(); | 499 | this._focusActiveService(); |
@@ -505,7 +505,7 @@ export default class ServicesStore extends Store { | |||
505 | } | 505 | } |
506 | 506 | ||
507 | @action _setActiveNext() { | 507 | @action _setActiveNext() { |
508 | const nextIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), 1, this.allDisplayed.length); | 508 | const nextIndex = this._wrapIndex(this.allDisplayed.findIndex((service) => service.isActive), 1, this.allDisplayed.length); |
509 | 509 | ||
510 | // TODO: simplify this; | 510 | // TODO: simplify this; |
511 | this.all.forEach((s, index) => { | 511 | this.all.forEach((s, index) => { |
@@ -515,7 +515,7 @@ export default class ServicesStore extends Store { | |||
515 | } | 515 | } |
516 | 516 | ||
517 | @action _setActivePrev() { | 517 | @action _setActivePrev() { |
518 | const prevIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), -1, this.allDisplayed.length); | 518 | const prevIndex = this._wrapIndex(this.allDisplayed.findIndex((service) => service.isActive), -1, this.allDisplayed.length); |
519 | 519 | ||
520 | // TODO: simplify this; | 520 | // TODO: simplify this; |
521 | this.all.forEach((s, index) => { | 521 | this.all.forEach((s, index) => { |
@@ -689,7 +689,7 @@ export default class ServicesStore extends Store { | |||
689 | } | 689 | } |
690 | 690 | ||
691 | @action _sendIPCMessageToAllServices({ channel, args }) { | 691 | @action _sendIPCMessageToAllServices({ channel, args }) { |
692 | this.all.forEach(s => this.actions.service.sendIPCMessage({ | 692 | this.all.forEach((s) => this.actions.service.sendIPCMessage({ |
693 | serviceId: s.id, | 693 | serviceId: s.id, |
694 | channel, | 694 | channel, |
695 | args, | 695 | args, |
@@ -740,7 +740,7 @@ export default class ServicesStore extends Store { | |||
740 | } | 740 | } |
741 | 741 | ||
742 | @action _reloadAll() { | 742 | @action _reloadAll() { |
743 | this.enabled.forEach(s => this._reload({ | 743 | this.enabled.forEach((s) => this._reload({ |
744 | serviceId: s.id, | 744 | serviceId: s.id, |
745 | })); | 745 | })); |
746 | } | 746 | } |
@@ -859,7 +859,7 @@ export default class ServicesStore extends Store { | |||
859 | }; | 859 | }; |
860 | 860 | ||
861 | if (!serviceId) { | 861 | if (!serviceId) { |
862 | this.allDisplayed.forEach(service => resetTimer(service)); | 862 | this.allDisplayed.forEach((service) => resetTimer(service)); |
863 | } else { | 863 | } else { |
864 | const service = this.one(serviceId); | 864 | const service = this.one(serviceId); |
865 | if (service) { | 865 | if (service) { |
@@ -893,7 +893,7 @@ export default class ServicesStore extends Store { | |||
893 | _mapActiveServiceToServiceModelReaction() { | 893 | _mapActiveServiceToServiceModelReaction() { |
894 | const { activeService } = this.stores.settings.all.service; | 894 | const { activeService } = this.stores.settings.all.service; |
895 | if (this.allDisplayed.length) { | 895 | if (this.allDisplayed.length) { |
896 | this.allDisplayed.map(service => Object.assign(service, { | 896 | this.allDisplayed.map((service) => Object.assign(service, { |
897 | isActive: activeService ? activeService === service.id : this.allDisplayed[0].id === service.id, | 897 | isActive: activeService ? activeService === service.id : this.allDisplayed[0].id === service.id, |
898 | })); | 898 | })); |
899 | } | 899 | } |
@@ -904,13 +904,13 @@ export default class ServicesStore extends Store { | |||
904 | const { showMessageBadgesEvenWhenMuted } = this.stores.ui; | 904 | const { showMessageBadgesEvenWhenMuted } = this.stores.ui; |
905 | 905 | ||
906 | const unreadDirectMessageCount = this.allDisplayed | 906 | const unreadDirectMessageCount = this.allDisplayed |
907 | .filter(s => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled) | 907 | .filter((s) => (showMessageBadgeWhenMuted || s.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled) |
908 | .map(s => s.unreadDirectMessageCount) | 908 | .map((s) => s.unreadDirectMessageCount) |
909 | .reduce((a, b) => a + b, 0); | 909 | .reduce((a, b) => a + b, 0); |
910 | 910 | ||
911 | const unreadIndirectMessageCount = this.allDisplayed | 911 | const unreadIndirectMessageCount = this.allDisplayed |
912 | .filter(s => (showMessageBadgeWhenMuted && showMessageBadgesEvenWhenMuted) && (s.isBadgeEnabled && s.isIndirectMessageBadgeEnabled)) | 912 | .filter((s) => (showMessageBadgeWhenMuted && showMessageBadgesEvenWhenMuted) && (s.isBadgeEnabled && s.isIndirectMessageBadgeEnabled)) |
913 | .map(s => s.unreadIndirectMessageCount) | 913 | .map((s) => s.unreadIndirectMessageCount) |
914 | .reduce((a, b) => a + b, 0); | 914 | .reduce((a, b) => a + b, 0); |
915 | 915 | ||
916 | // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases | 916 | // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases |
@@ -975,7 +975,7 @@ export default class ServicesStore extends Store { | |||
975 | return; | 975 | return; |
976 | } | 976 | } |
977 | 977 | ||
978 | if (this.allDisplayed.findIndex(service => service.isActive) === -1 && this.allDisplayed.length !== 0) { | 978 | if (this.allDisplayed.findIndex((service) => service.isActive) === -1 && this.allDisplayed.length !== 0) { |
979 | debug('No active service found, setting active service to index 0'); | 979 | debug('No active service found, setting active service to index 0'); |
980 | 980 | ||
981 | this._setActive({ serviceId: this.allDisplayed[0].id }); | 981 | this._setActive({ serviceId: this.allDisplayed[0].id }); |