From f1bfd98e9d19e4f550e2364d0846eb02410e1c6b Mon Sep 17 00:00:00 2001 From: Mutugi <48474421+Mutugiii@users.noreply.github.com> Date: Tue, 21 May 2024 22:10:50 +0300 Subject: [PATCH] all: less imports is more (fixes #7460) (#7462) Co-authored-by: dogi --- package.json | 6 +++--- src/app/configuration/configuration-guard.service.ts | 4 ++-- src/app/configuration/configuration.component.ts | 4 +--- src/app/courses/courses-router.module.ts | 1 - src/app/courses/courses.component.ts | 4 ++-- src/app/courses/courses.service.ts | 4 ++-- .../progress-courses/courses-progress-leader.component.ts | 2 +- .../progress-courses/courses-progress-learner.component.ts | 2 +- src/app/exams/exams-add.component.ts | 2 +- src/app/exams/exams-preview.component.ts | 2 +- .../certifications/certifications-view.component.ts | 3 +-- src/app/manager-dashboard/manager-fetch.component.ts | 2 ++ src/app/manager-dashboard/manager-sync.component.ts | 2 +- .../manager-dashboard/reports/reports-detail.component.ts | 2 +- .../manager-dashboard/reports/reports-pending.component.ts | 5 +---- src/app/manager-dashboard/reports/reports.service.ts | 2 +- .../manager-dashboard/requests/requests-table.component.ts | 1 - src/app/meetups/meetups.component.ts | 4 ---- src/app/meetups/meetups.service.ts | 6 ++---- src/app/notifications/notifications.component.ts | 4 +--- 20 files changed, 24 insertions(+), 38 deletions(-) diff --git a/package.json b/package.json index f1b25cb6c5..f5b97ac8b5 100755 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "planet", "license": "AGPL-3.0", - "version": "0.14.32", + "version": "0.14.33", "myplanet": { - "latest": "v0.15.27", - "min": "v0.14.27" + "latest": "v0.15.34", + "min": "v0.14.34" }, "scripts": { "ng": "ng", diff --git a/src/app/configuration/configuration-guard.service.ts b/src/app/configuration/configuration-guard.service.ts index 7f3a244ba3..5598c25795 100644 --- a/src/app/configuration/configuration-guard.service.ts +++ b/src/app/configuration/configuration-guard.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; +import { Router } from '@angular/router'; import { CouchService } from '../shared/couchdb.service'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -12,7 +12,7 @@ export class ConfigurationGuard { private couchService: CouchService ) {} - canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + canActivate(): Observable { return this.couchService.findAll('configurations').pipe(map((data: any[]) => { if (data.length > 0) { this.router.navigate([ '/login' ]); diff --git a/src/app/configuration/configuration.component.ts b/src/app/configuration/configuration.component.ts index f256de8bf4..e0cd3ff5eb 100644 --- a/src/app/configuration/configuration.component.ts +++ b/src/app/configuration/configuration.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { CouchService } from '../shared/couchdb.service'; import { ValidatorService } from '../validators/validator.service'; import { PlanetMessageService } from '../shared/planet-message.service'; @@ -7,10 +7,8 @@ import { CustomValidators } from '../validators/custom-validators'; import { findDocuments } from '../shared/mangoQueries'; import { MatStepper } from '@angular/material/stepper'; import { Router, ActivatedRoute } from '@angular/router'; -import { Observable, forkJoin } from 'rxjs'; import { environment } from '../../environments/environment'; import { finalize } from 'rxjs/operators'; -import { debug } from '../debug-operator'; import { ConfigurationService } from './configuration.service'; import { StateService } from '../shared/state.service'; diff --git a/src/app/courses/courses-router.module.ts b/src/app/courses/courses-router.module.ts index cfdbe08862..f5ed9ea677 100644 --- a/src/app/courses/courses-router.module.ts +++ b/src/app/courses/courses-router.module.ts @@ -8,7 +8,6 @@ import { ExamsAddComponent } from '../exams/exams-add.component'; import { CoursesStepViewComponent } from './step-view-courses/courses-step-view.component'; import { ExamsViewComponent } from '../exams/exams-view.component'; import { CoursesProgressLeaderComponent } from './progress-courses/courses-progress-leader.component'; -import { CoursesProgressLearnerComponent } from './progress-courses/courses-progress-learner.component'; import { CoursesEnrollComponent } from './enroll-courses/courses-enroll.component'; const routes: Routes = [ diff --git a/src/app/courses/courses.component.ts b/src/app/courses/courses.component.ts index d478da71a5..6e5540d9f2 100644 --- a/src/app/courses/courses.component.ts +++ b/src/app/courses/courses.component.ts @@ -424,7 +424,7 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes this.dialogsListService.getListAndColumns('communityregistrationrequests', { 'registrationRequest': 'accepted' }) .pipe(takeUntil(this.onDestroy$)) .subscribe((planet) => { - const data = { okClick: this.sendCourse('courses').bind(this), + const data = { okClick: this.sendCourse().bind(this), filterPredicate: filterSpecificFields([ 'name' ]), allowMulti: true, ...planet }; @@ -434,7 +434,7 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes }); } - sendCourse(db: string) { + sendCourse() { return (selected: any) => { const coursesToSend = this.selection.selected.map(id => findByIdInArray(this.courses.data, id)); this.syncService.createChildPullDoc(coursesToSend, 'courses', selected).subscribe(() => { diff --git a/src/app/courses/courses.service.ts b/src/app/courses/courses.service.ts index 4ce647f08f..072e656893 100644 --- a/src/app/courses/courses.service.ts +++ b/src/app/courses/courses.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; import { CouchService } from '../shared/couchdb.service'; -import { Subject, forkJoin, of, combineLatest, zip } from 'rxjs'; +import { Subject, forkJoin, of } from 'rxjs'; import { UserService } from '../shared/user.service'; import { findDocuments, inSelector } from '../shared/mangoQueries'; -import { switchMap, map, startWith, skip, debounceTime, filter, take } from 'rxjs/operators'; +import { switchMap, map, filter, take } from 'rxjs/operators'; import { RatingService } from '../shared/forms/rating.service'; import { PlanetMessageService } from '../shared/planet-message.service'; import { StateService } from '../shared/state.service'; diff --git a/src/app/courses/progress-courses/courses-progress-leader.component.ts b/src/app/courses/progress-courses/courses-progress-leader.component.ts index a4b78dffba..8ab04286f6 100644 --- a/src/app/courses/progress-courses/courses-progress-leader.component.ts +++ b/src/app/courses/progress-courses/courses-progress-leader.component.ts @@ -6,7 +6,7 @@ import { takeUntil } from 'rxjs/operators'; import { CoursesService } from '../courses.service'; import { SubmissionsService } from '../../submissions/submissions.service'; import { CsvService } from '../../shared/csv.service'; -import { dedupeShelfReduce, dedupeObjectArray } from '../../shared/utils'; +import { dedupeObjectArray } from '../../shared/utils'; import { DialogsLoadingService } from '../../shared/dialogs/dialogs-loading.service'; import { findDocuments } from '../../shared/mangoQueries'; import { UserProfileDialogComponent } from '../../users/users-profile/users-profile-dialog.component'; diff --git a/src/app/courses/progress-courses/courses-progress-learner.component.ts b/src/app/courses/progress-courses/courses-progress-learner.component.ts index 9c5bb8e32a..9c59bab079 100644 --- a/src/app/courses/progress-courses/courses-progress-learner.component.ts +++ b/src/app/courses/progress-courses/courses-progress-learner.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; -import { Router, ActivatedRoute, ParamMap } from '@angular/router'; +import { Router, ActivatedRoute } from '@angular/router'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { CoursesService } from '../courses.service'; diff --git a/src/app/exams/exams-add.component.ts b/src/app/exams/exams-add.component.ts index 5015c30652..d3f786937e 100644 --- a/src/app/exams/exams-add.component.ts +++ b/src/app/exams/exams-add.component.ts @@ -6,7 +6,7 @@ import { Validators } from '@angular/forms'; import { Router, ActivatedRoute } from '@angular/router'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { MatDialog } from '@angular/material/dialog'; import { CouchService } from '../shared/couchdb.service'; import { ValidatorService } from '../validators/validator.service'; diff --git a/src/app/exams/exams-preview.component.ts b/src/app/exams/exams-preview.component.ts index 0c3cc9c8d0..81c103a75c 100644 --- a/src/app/exams/exams-preview.component.ts +++ b/src/app/exams/exams-preview.component.ts @@ -1,4 +1,4 @@ -import { Component, Inject, ViewChild } from '@angular/core'; +import { Component, Inject } from '@angular/core'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ diff --git a/src/app/manager-dashboard/certifications/certifications-view.component.ts b/src/app/manager-dashboard/certifications/certifications-view.component.ts index a3a6c90236..0e7e18b212 100644 --- a/src/app/manager-dashboard/certifications/certifications-view.component.ts +++ b/src/app/manager-dashboard/certifications/certifications-view.component.ts @@ -1,12 +1,11 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; import { Router, ActivatedRoute, ParamMap } from '@angular/router'; import { Subject, combineLatest } from 'rxjs'; -import { switchMap, takeUntil, debounceTime, auditTime } from 'rxjs/operators'; +import { switchMap, takeUntil, auditTime } from 'rxjs/operators'; import { CertificationsService } from './certifications.service'; import { TableState } from '../../users/users-table.component'; import { CoursesService } from '../../courses/courses.service'; import { UsersService } from '../../users/users.service'; -import { dedupeShelfReduce } from '../../shared/utils'; @Component({ templateUrl: './certifications-view.component.html' diff --git a/src/app/manager-dashboard/manager-fetch.component.ts b/src/app/manager-dashboard/manager-fetch.component.ts index 18ac0b8462..6d02ce7757 100644 --- a/src/app/manager-dashboard/manager-fetch.component.ts +++ b/src/app/manager-dashboard/manager-fetch.component.ts @@ -81,6 +81,8 @@ export class ManagerFetchComponent implements OnInit, AfterViewInit { } getPushedItem() { + console.log('Getting pushed list'); + const itemsToPull = this.selection.selected.map(id => findByIdInArray(this.pushedItems.data, id)); const deleteItems = itemsToPull.map(sentItem => ({ _id: sentItem._id, _rev: sentItem._rev, _deleted: true })); this.syncService.replicatorsArrayWithTags(itemsToPull, 'pull', 'parent').pipe(switchMap((replicators) => diff --git a/src/app/manager-dashboard/manager-sync.component.ts b/src/app/manager-dashboard/manager-sync.component.ts index 7e9bf68714..af94701713 100644 --- a/src/app/manager-dashboard/manager-sync.component.ts +++ b/src/app/manager-dashboard/manager-sync.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { CouchService } from '../shared/couchdb.service'; import { DialogsLoadingService } from '../shared/dialogs/dialogs-loading.service'; -import { forkJoin, of } from 'rxjs'; +import { forkJoin } from 'rxjs'; @Component({ templateUrl: './manager-sync.component.html' diff --git a/src/app/manager-dashboard/reports/reports-detail.component.ts b/src/app/manager-dashboard/reports/reports-detail.component.ts index fd9d63779b..555dfba8fe 100644 --- a/src/app/manager-dashboard/reports/reports-detail.component.ts +++ b/src/app/manager-dashboard/reports/reports-detail.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy, ViewEncapsulation, HostBinding, ViewChild import { ActivatedRoute, ParamMap, Router } from '@angular/router'; import { FormGroup, FormBuilder } from '@angular/forms'; import { combineLatest, Subject, of } from 'rxjs'; -import { map, takeUntil, take } from 'rxjs/operators'; +import { takeUntil, take } from 'rxjs/operators'; import { ReportsService } from './reports.service'; import { StateService } from '../../shared/state.service'; import { Chart } from 'chart.js'; diff --git a/src/app/manager-dashboard/reports/reports-pending.component.ts b/src/app/manager-dashboard/reports/reports-pending.component.ts index d6f4b10204..3defd420cf 100644 --- a/src/app/manager-dashboard/reports/reports-pending.component.ts +++ b/src/app/manager-dashboard/reports/reports-pending.component.ts @@ -1,10 +1,8 @@ import { Component, OnInit } from '@angular/core'; import { CouchService } from '../../shared/couchdb.service'; -import { forkJoin, Subject } from 'rxjs'; -import { findDocuments } from '../../shared/mangoQueries'; +import { forkJoin } from 'rxjs'; import { StateService } from '../../shared/state.service'; import { PlanetMessageService } from '../../shared/planet-message.service'; -import { ReportsService } from './reports.service'; import { ManagerService } from '../manager.service'; import { attachNamesToPlanets } from './reports.utils'; @@ -25,7 +23,6 @@ export class ReportsPendingComponent implements OnInit { private couchService: CouchService, private stateService: StateService, private planetMessageService: PlanetMessageService, - private reportsService: ReportsService, private managerService: ManagerService ) {} diff --git a/src/app/manager-dashboard/reports/reports.service.ts b/src/app/manager-dashboard/reports/reports.service.ts index 8affb406d5..6d0b54e61d 100644 --- a/src/app/manager-dashboard/reports/reports.service.ts +++ b/src/app/manager-dashboard/reports/reports.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { forkJoin, Observable } from 'rxjs'; +import { forkJoin } from 'rxjs'; import { map, take } from 'rxjs/operators'; import { CouchService } from '../../shared/couchdb.service'; import { findDocuments } from '../../shared/mangoQueries'; diff --git a/src/app/manager-dashboard/requests/requests-table.component.ts b/src/app/manager-dashboard/requests/requests-table.component.ts index 0d5bcf7b0c..5274e2d955 100644 --- a/src/app/manager-dashboard/requests/requests-table.component.ts +++ b/src/app/manager-dashboard/requests/requests-table.component.ts @@ -8,7 +8,6 @@ import { MatTableDataSource } from '@angular/material/table'; import { switchMap, takeUntil, finalize } from 'rxjs/operators'; import { forkJoin, of, Subject } from 'rxjs'; import { filterSpecificFields, sortNumberOrString } from '../../shared/table-helpers'; -import { DialogsViewComponent } from '../../shared/dialogs/dialogs-view.component'; import { DialogsListService } from '../../shared/dialogs/dialogs-list.service'; import { DialogsListComponent } from '../../shared/dialogs/dialogs-list.component'; import { StateService } from '../../shared/state.service'; diff --git a/src/app/meetups/meetups.component.ts b/src/app/meetups/meetups.component.ts index e42f05bfd2..3bc929eee7 100644 --- a/src/app/meetups/meetups.component.ts +++ b/src/app/meetups/meetups.component.ts @@ -1,10 +1,8 @@ import { Component, OnInit, ViewChild, AfterViewInit, OnDestroy } from '@angular/core'; import { CouchService } from '../shared/couchdb.service'; -import { MatDialog } from '@angular/material/dialog'; import { MatPaginator, PageEvent } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; -import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component'; import { PlanetMessageService } from '../shared/planet-message.service'; import { filterSpecificFields, selectedOutOfFilter, composeFilterFunctions, filterSpecificFieldsByWord } from '../shared/table-helpers'; import { SelectionModel } from '@angular/cdk/collections'; @@ -13,7 +11,6 @@ import { UserService } from '../shared/user.service'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { MeetupService } from './meetups.service'; -import { debug } from '../debug-operator'; import { StateService } from '../shared/state.service'; import { DialogsLoadingService } from '../shared/dialogs/dialogs-loading.service'; import { findByIdInArray } from '../shared/utils'; @@ -54,7 +51,6 @@ export class MeetupsComponent implements OnInit, AfterViewInit, OnDestroy { constructor( private couchService: CouchService, - private dialog: MatDialog, private planetMessageService: PlanetMessageService, private router: Router, private route: ActivatedRoute, diff --git a/src/app/meetups/meetups.service.ts b/src/app/meetups/meetups.service.ts index 91bc1b54ed..d71c0333ab 100644 --- a/src/app/meetups/meetups.service.ts +++ b/src/app/meetups/meetups.service.ts @@ -1,11 +1,9 @@ -import { OnDestroy } from '@angular/core'; import { Injectable } from '@angular/core'; import { CouchService } from '../shared/couchdb.service'; import { findDocuments } from '../shared/mangoQueries'; import { UserService } from '../shared/user.service'; -import { Subject, of, forkJoin } from 'rxjs'; -import { catchError, map } from 'rxjs/operators'; -import { dedupeShelfReduce } from '../shared/utils'; +import { Subject } from 'rxjs'; +import { map } from 'rxjs/operators'; import { PlanetMessageService } from '../shared/planet-message.service'; import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component'; diff --git a/src/app/notifications/notifications.component.ts b/src/app/notifications/notifications.component.ts index d3922f90d8..9752049244 100644 --- a/src/app/notifications/notifications.component.ts +++ b/src/app/notifications/notifications.component.ts @@ -6,9 +6,8 @@ import { filterDropdowns } from '../shared/table-helpers'; import { takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; -import { MatPaginator, PageEvent } from '@angular/material/paginator'; +import { MatPaginator } from '@angular/material/paginator'; import { MatTableDataSource } from '@angular/material/table'; -import { PlanetMessageService } from '../shared/planet-message.service'; import { NotificationsService } from './notifications.service'; @Component({ @@ -27,7 +26,6 @@ export class NotificationsComponent implements OnInit, AfterViewInit { constructor( private couchService: CouchService, private userService: UserService, - private planetMessageService: PlanetMessageService, private notificationsService: NotificationsService ) { this.userService.notificationStateChange$.pipe(takeUntil(this.onDestroy$)).subscribe(() => {