From: Galen Charlton Date: Wed, 11 Mar 2020 18:59:23 +0000 (-0400) Subject: make ng lint happier X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e437c759c229030242044fae535e0238f9c864be;p=working%2FEvergreen.git make ng lint happier Signed-off-by: Galen Charlton --- diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.ts index 26219c9573..38e5a944be 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search-form.component.ts @@ -29,7 +29,7 @@ export class AcqProviderSearchFormComponent implements OnInit, AfterViewInit { providerPhone = ''; providerCurrencyType = ''; providerSAN = ''; - providerEDIDefault = null + providerEDIDefault = null; providerURL = ''; providerIsActive = true; @@ -59,7 +59,7 @@ export class AcqProviderSearchFormComponent implements OnInit, AfterViewInit { this.providerPhone = ''; this.providerCurrencyType = ''; this.providerSAN = ''; - this.providerEDIDefault = null + this.providerEDIDefault = null; this.providerURL = ''; this.providerIsActive = true; } @@ -80,11 +80,16 @@ export class AcqProviderSearchFormComponent implements OnInit, AfterViewInit { searchTerms.push({ classes: ['acqpc'], fields: ['name'], op: 'ilike', value: this.contactName }); } if (this.providerEmail) { - searchTerms.push({ classes: ['acqpro','acqpc'], fields: ['email','email'], op: 'ilike', value: this.providerEmail }); + searchTerms.push({ classes: ['acqpro', 'acqpc'], fields: ['email', 'email'], op: 'ilike', value: this.providerEmail }); } if (this.providerPhone) { // this requires the flesh hash to contain: { ... join: { acqpc: { type: 'left' } } ... } - searchTerms.push({ classes: ['acqpc','acqpro','acqpro'], fields: ['phone','phone','fax_phone'], op: 'ilike', value: this.providerPhone }); + searchTerms.push({ + classes: ['acqpc', 'acqpro', 'acqpro'], + fields: ['phone', 'phone', 'fax_phone'], + op: 'ilike', + value: this.providerPhone, + }); } if (this.providerCurrencyType) { searchTerms.push({ classes: ['acqpro'], fields: ['currency_type'], op: 'ilike', value: this.providerCurrencyType }); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search.service.ts index 9caa859ebe..c00a2617c5 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider-search.service.ts @@ -38,19 +38,19 @@ export class AcqProviderSearchService { } generateSearchJoins(): any { - let joinPart = new Object(); + const joinPart = new Object(); let class_list = new Array(); // get all the classes used - this._terms.forEach(term => {class_list = class_list.concat(term.classes)}) + this._terms.forEach(term => { class_list = class_list.concat(term.classes); }); // filter out acqpro, empty names, and make unique - class_list = class_list.filter((x, i, a) => x && x !== 'acqpro' && a.indexOf(x) == i); + class_list = class_list.filter((x, i, a) => x && x !== 'acqpro' && a.indexOf(x) === i); // build a join clause for use in the "opts" part of a pcrud query - class_list.forEach(cls => { joinPart[cls] = {type : 'left' } }) + class_list.forEach(cls => { joinPart[cls] = {type : 'left' }; }); - if (Object.keys(joinPart).length == 0) return null; + if (Object.keys(joinPart).length === 0) { return null; } return joinPart; } @@ -68,10 +68,10 @@ export class AcqProviderSearchService { // not const because we may want an array let query_obj = new Object(); - let query_arr = new Array(); + const query_arr = new Array(); let op = term.op; - if (!op) { op = '=' }; // just in case + if (!op) { op = '='; } // just in case let val = term.value; if (op === 'ilike') { @@ -79,17 +79,17 @@ export class AcqProviderSearchService { } let isOR = false; - term.fields.forEach( (field,ind) => { + term.fields.forEach( (field, ind) => { const curr_cls = term.classes[ind]; - if (ind == 1) { + if (ind === 1) { // we're OR'ing in other classes/fields // and this is the first so restructure const first_cls = term.classes[0]; isOR = true; let tmp = new Object(); if (first_cls) { - tmp['+'+first_cls] = query_obj; + tmp['+' + first_cls] = query_obj; } else { tmp = query_obj; } @@ -99,19 +99,19 @@ export class AcqProviderSearchService { if (curr_cls) { if (isOR) { - let tmp = new Object(); - tmp['+'+curr_cls] = new Object(); - tmp['+'+curr_cls][field] = new Object(); - tmp['+'+curr_cls][field][op] = val; + const tmp = new Object(); + tmp['+' + curr_cls] = new Object(); + tmp['+' + curr_cls][field] = new Object(); + tmp['+' + curr_cls][field][op] = val; query_arr.push(tmp); } else { - query_obj['+'+curr_cls] = new Object(); - query_obj['+'+curr_cls][field] = new Object(); - query_obj['+'+curr_cls][field][op] = val; + query_obj['+' + curr_cls] = new Object(); + query_obj['+' + curr_cls][field] = new Object(); + query_obj['+' + curr_cls][field][op] = val; } } else { if (isOR) { - let tmp = new Object(); + const tmp = new Object(); tmp[field] = new Object(); tmp[field][op] = val; query_arr.push(tmp); @@ -123,7 +123,7 @@ export class AcqProviderSearchService { }); - if (isOR) { query_obj = {'-or':query_arr} } + if (isOR) { query_obj = {'-or': query_arr}; } query.push(query_obj); }); @@ -158,7 +158,7 @@ export class AcqProviderSearchService { const query = this.generateSearch(gridSource.filters); const opts = {}; - if (joins) opts['join'] = joins; + if (joins) { opts['join'] = joins; } opts['offset'] = pager.offset; opts['limit'] = pager.limit; opts['au_by_id'] = true;