From b7a2edd95e9e2541833f7c9f5f41ca4c85c76c29 Mon Sep 17 00:00:00 2001 From: Jane Sandberg Date: Fri, 14 Aug 2020 18:05:13 -0700 Subject: [PATCH] LP1849212: linting and other cleanup Signed-off-by: Jane Sandberg --- .../course-associate-material.component.html | 2 +- .../course-reserves/course-list.component.html | 16 +++--- .../local/course-reserves/course-list.component.ts | 64 ++++++++++------------ .../local/course-reserves/course-page.component.ts | 26 ++------- .../admin/local/course-reserves/routing.module.ts | 2 +- .../app/staff/catalog/result/record.component.ts | 2 +- Open-ILS/src/eg2/src/app/staff/common.module.ts | 2 +- .../src/app/staff/share/marc-edit/marcrecord.ts | 2 +- 8 files changed, 46 insertions(+), 70 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html index fb6eb19616..c7f6f2036e 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html @@ -6,7 +6,7 @@ - +
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html index aa4633eedf..54d0c7d420 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.html @@ -1,20 +1,20 @@ - - - - - - + + + + + +
- + label="Create {{tableName}}" (onClick)="createNew()" i18n-label> diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts index 631c19fbe5..bc439a4018 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-list.component.ts @@ -1,11 +1,8 @@ import {Component, Input, ViewChild, OnInit} from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; +import {Router} from '@angular/router'; import {IdlObject} from '@eg/core/idl.service'; import {PcrudService} from '@eg/core/pcrud.service'; -import {AuthService} from '@eg/core/auth.service'; import {CourseService} from '@eg/staff/share/course.service'; -import {NetService} from '@eg/core/net.service'; -import {OrgService} from '@eg/core/org.service'; import {GridComponent} from '@eg/share/grid/grid.component'; import {Pager} from '@eg/share/util/pager'; import {GridDataSource, GridColumn} from '@eg/share/grid/grid'; @@ -24,8 +21,8 @@ import {CourseAssociateUsersComponent templateUrl: './course-list.component.html' }) -export class CourseListComponent implements OnInit { - +export class CourseListComponent implements OnInit { + @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; @ViewChild('grid', { static: true }) grid: GridComponent; @ViewChild('successString', { static: true }) successString: StringComponent; @@ -41,32 +38,28 @@ export class CourseListComponent implements OnInit { @ViewChild('courseUserDialog', {static: true}) private courseUserDialog: CourseAssociateUsersComponent; - @Input() sort_field: string; - @Input() idl_class = "acmc"; + @Input() sortField: string; + @Input() idlClass = 'acmc'; @Input() dialog_size: 'sm' | 'lg' = 'lg'; - @Input() table_name = "Course"; + @Input() tableName = 'Course'; grid_source: GridDataSource = new GridDataSource(); currentMaterials: any[] = []; search_value = ''; constructor( - private auth: AuthService, private courseSvc: CourseService, private locale: LocaleService, - private net: NetService, - private org: OrgService, private pcrud: PcrudService, - private route: ActivatedRoute, private router: Router, private toast: ToastService - ){} + ) {} ngOnInit() { this.getSource(); - this.grid.onRowActivate.subscribe((course:IdlObject) => { - let idToEdit = course.id(); + this.grid.onRowActivate.subscribe((course: IdlObject) => { + const idToEdit = course.id(); this.navigateToCoursePage(idToEdit); - }) + }); } /** @@ -77,31 +70,31 @@ export class CourseListComponent implements OnInit { const orderBy: any = {}; if (sort.length) { // Sort specified from grid - orderBy[this.idl_class] = sort[0].name + ' ' + sort[0].dir; - } else if (this.sort_field) { + orderBy[this.idlClass] = sort[0].name + ' ' + sort[0].dir; + } else if (this.sortField) { // Default sort field - orderBy[this.idl_class] = this.sort_field; + orderBy[this.idlClass] = this.sortField; } const searchOps = { offset: pager.offset, limit: pager.limit, order_by: orderBy }; - return this.pcrud.retrieveAll(this.idl_class, searchOps, {fleshSelectors: true}) + return this.pcrud.retrieveAll(this.idlClass, searchOps, {fleshSelectors: true}); }; } navigateToCoursePage(id_arr: IdlObject[]) { - if (typeof id_arr == 'number') id_arr = [id_arr]; - let urls = []; + if (typeof id_arr === 'number') { id_arr = [id_arr]; } + const urls = []; id_arr.forEach(id => {console.log(this.router.url); urls.push([this.locale.currentLocaleCode() + this.router.url + '/' + id]); }); - if (id_arr.length == 1) { + if (id_arr.length === 1) { this.router.navigate([this.router.url + '/' + id_arr[0]]); } else { urls.forEach(url => { - window.open(url) + window.open(url); }); } } @@ -127,9 +120,9 @@ export class CourseListComponent implements OnInit { editSelected(fields: IdlObject[]) { // Edit each IDL thing one at a time - let course_ids = []; + const course_ids = []; fields.forEach(field => { - if (typeof field['id'] == 'function') { + if (typeof field['id'] === 'function') { course_ids.push(field.id()); } else { course_ids.push(field['id']); @@ -140,9 +133,8 @@ export class CourseListComponent implements OnInit { archiveSelected(course: IdlObject[]) { this.courseSvc.disassociateMaterials(course).then(res => { - course.forEach(course => { - console.log(course); - course.is_archived(true); + course.forEach(courseToArchive => { + courseToArchive.is_archived(true); }); this.pcrud.update(course).subscribe( val => { @@ -159,12 +151,12 @@ export class CourseListComponent implements OnInit { }); } - deleteSelected(idl_object: IdlObject[]) { - this.courseSvc.disassociateMaterials(idl_object).then(res => { - idl_object.forEach(idl_object => { - idl_object.isdeleted(true) + deleteSelected(idlObject: IdlObject[]) { + this.courseSvc.disassociateMaterials(idlObject).then(res => { + idlObject.forEach(object => { + object.isdeleted(true); }); - this.pcrud.autoApply(idl_object).subscribe( + this.pcrud.autoApply(idlObject).subscribe( val => { console.debug('deleted: ' + val); this.deleteSuccessString.current() @@ -177,6 +169,6 @@ export class CourseListComponent implements OnInit { () => this.grid.reload() ); }); - }; + } } diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts index 6818a11f8d..df7a41a0b9 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-page.component.ts @@ -1,19 +1,8 @@ import {Component, Input, ViewChild, OnInit, TemplateRef} from '@angular/core'; -import {Router, ActivatedRoute} from '@angular/router'; -import {Observable, Observer, of} from 'rxjs'; -import {DialogComponent} from '@eg/share/dialog/dialog.component'; -import {AuthService} from '@eg/core/auth.service'; -import {NetService} from '@eg/core/net.service'; -import {EventService} from '@eg/core/event.service'; -import {OrgService} from '@eg/core/org.service'; +import {ActivatedRoute} from '@angular/router'; import {PcrudService} from '@eg/core/pcrud.service'; -import {Pager} from '@eg/share/util/pager'; -import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; -import {GridDataSource} from '@eg/share/grid/grid'; -import {GridComponent} from '@eg/share/grid/grid.component'; import {IdlObject, IdlService} from '@eg/core/idl.service'; import {StringComponent} from '@eg/share/string/string.component'; -import {StaffBannerComponent} from '@eg/staff/share/staff-banner.component'; import {ToastService} from '@eg/share/toast/toast.service'; import {CourseService} from '@eg/staff/share/course.service'; import {CourseAssociateUsersComponent} from './course-associate-users.component'; @@ -33,7 +22,7 @@ export class CoursePageComponent implements OnInit { private courseMaterialDialog: CourseAssociateMaterialComponent; @ViewChild('courseUserDialog', {static: true}) private courseUserDialog: CourseAssociateUsersComponent; - + // Edit Tab @ViewChild('archiveFailedString', { static: true }) archiveFailedString: StringComponent; @@ -43,12 +32,7 @@ export class CoursePageComponent implements OnInit { // Materials Tab constructor( - private auth: AuthService, private course: CourseService, - private event: EventService, - private idl: IdlService, - private net: NetService, - private org: OrgService, private pcrud: PcrudService, private route: ActivatedRoute, private toast: ToastService @@ -56,7 +40,7 @@ export class CoursePageComponent implements OnInit { } ngOnInit() { - this.courseId = parseInt(this.route.snapshot.paramMap.get('id')); + this.courseId = +this.route.snapshot.paramMap.get('id'); this.course.getCourses([this.courseId]).then(course => { this.currentCourse = course[0]; }); @@ -78,5 +62,5 @@ export class CoursePageComponent implements OnInit { } // Materials Tab - -} \ No newline at end of file + +} diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts index 7c735dd2dd..fcd9cd5a75 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/routing.module.ts @@ -16,4 +16,4 @@ const routes: Routes = [{ exports: [RouterModule] }) -export class CourseReservesRoutingModule {} \ No newline at end of file +export class CourseReservesRoutingModule {} diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts index 31f7d02588..aa7c4ec4f6 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts @@ -48,7 +48,7 @@ export class ResultRecordComponent implements OnInit, OnDestroy { ngOnInit() { this.searchContext = this.staffCat.searchContext; this.summary.getHoldCount(); - this.loadCourseInformation(this.summary.id) + this.loadCourseInformation(this.summary.id); this.isRecordSelected = this.basket.hasRecordId(this.summary.id); // Watch for basket changes caused by other components diff --git a/Open-ILS/src/eg2/src/app/staff/common.module.ts b/Open-ILS/src/eg2/src/app/staff/common.module.ts index 70bcbade64..302524744e 100644 --- a/Open-ILS/src/eg2/src/app/staff/common.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/common.module.ts @@ -17,7 +17,7 @@ import {DatetimeValidatorDirective} from '@eg/share/validators/datetime_validato import {MultiSelectComponent} from '@eg/share/multi-select/multi-select.component'; import {NotBeforeMomentValidatorDirective} from '@eg/share/validators/not_before_moment_validator.directive'; import {PatronBarcodeValidatorDirective} from '@eg/share/validators/patron_barcode_validator.directive'; -import {CourseService} from './share/course.service' +import {CourseService} from './share/course.service'; /** * Imports the EG common modules and adds modules common to all staff UI's. diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/marcrecord.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/marcrecord.ts index 97686fc45e..a8e2e51684 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/marcrecord.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/marcrecord.ts @@ -26,10 +26,10 @@ export interface MarcField { // Fields are immutable when it comes to controlfield vs. // data field. Stamp the value when stamping field IDs. isCtrlField: boolean; + indicator?: (ind: number) => any; // Pass-through to marcrecord.js isControlfield(): boolean; - indicator?: (ind: number) => any; deleteExactSubfields(...subfield: MarcSubfield[]): number; } -- 2.11.0