From 3c48df6fe5fcf65284d792e8788bec45d307bab6 Mon Sep 17 00:00:00 2001 From: Kim Shepherd Date: Wed, 23 Nov 2022 13:36:55 +1300 Subject: [PATCH] [TLC-380] Lint fixes --- .../core/browse/browse-link-data.service.ts | 2 +- src/app/core/browse/browse.service.ts | 3 +- .../metadata-values.component.ts | 2 +- .../item-page-field.component.spec.ts | 24 ++++++------- ...a-representation-list-element.component.ts | 2 +- .../testing/browse-link-data-service.stub.ts | 36 +++++++++---------- 6 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/app/core/browse/browse-link-data.service.ts b/src/app/core/browse/browse-link-data.service.ts index 0f4820bb19..d1790101e3 100644 --- a/src/app/core/browse/browse-link-data.service.ts +++ b/src/app/core/browse/browse-link-data.service.ts @@ -55,7 +55,7 @@ export class BrowseLinkDataService extends IdentifiableDataService { searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(metadataKey)); - }) + }); return this.getBrowseLinks().pipe( getRemoteDataPayload(), getPaginatedListPayload(), diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts index fd8e68430d..e17cc5e830 100644 --- a/src/app/core/browse/browse.service.ts +++ b/src/app/core/browse/browse.service.ts @@ -229,7 +229,6 @@ export class BrowseService { * @param linkPath */ getBrowseURLFor(metadataKey: string, linkPath: string): Observable { - console.log("Looking for " + metadataKey + " in link path " + linkPath); const searchKeyArray = BrowseService.toSearchKeyArray(metadataKey); return this.getBrowseDefinitions().pipe( getRemoteDataPayload(), @@ -261,7 +260,7 @@ export class BrowseService { let searchKeyArray: string[] = []; metadataKeys.forEach((metadataKey) => { searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(metadataKey)); - }) + }); return this.getBrowseDefinitions().pipe( getRemoteDataPayload(), getPaginatedListPayload(), diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts index 5b7e937d95..2ef160e74e 100644 --- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts +++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts @@ -71,7 +71,7 @@ export class MetadataValuesComponent implements OnChanges { */ hasLink(value): boolean { if (hasValue(this.urlRegex)) { - const pattern: RegExp = new RegExp(this.urlRegex); + const pattern = new RegExp(this.urlRegex); return pattern.test(value.value); } return false; diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts index 48d5a0f29e..5834a026eb 100644 --- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts +++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts @@ -135,37 +135,37 @@ describe('ItemPageFieldComponent', () => { }); - describe("test rendering of configured browse links", () => { + describe('test rendering of configured browse links', () => { beforeEach(() => { fixture.detectChanges(); }); it('should have a browse link', () => { expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockValue); - }) + }); }); - describe("test rendering of configured regex-based links", () => { + describe('test rendering of configured regex-based links', () => { beforeEach(() => { - comp.urlRegex = '^test' + comp.urlRegex = '^test'; fixture.detectChanges(); }); beforeEach(waitForAsync(() => { it('should have a rendered (non-browse) link since the value matches ^test', () => { expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link')).nativeElement.innerHTML).toContain(mockValue); - }) - })) + }); + })); }); - describe("test skipping of configured links that do NOT match regex", () => { + describe('test skipping of configured links that do NOT match regex', () => { beforeEach(() => { - comp.urlRegex = '^nope' + comp.urlRegex = '^nope'; fixture.detectChanges(); }); beforeEach(waitForAsync(() => { it('should NOT have a rendered (non-browse) link since the value matches ^test', () => { - expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link'))).toBeNull() - }) - })) + expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link'))).toBeNull(); + }); + })); }); @@ -181,6 +181,6 @@ export function mockItemWithMetadataFieldsAndValue(fields: string[], value: stri language: 'en_US', value: value }] as MetadataValue[]; - }) + }); return item; } diff --git a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts index a51232d1f6..2b9fbab4ee 100644 --- a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts +++ b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts @@ -16,7 +16,7 @@ export class MetadataRepresentationListElementComponent { isLink(): boolean { // Match any http:// or https:// - const linkPattern: RegExp = /^https?\/\//; + const linkPattern = /^https?\/\//; return linkPattern.test(this.metadataRepresentation.getValue()); } diff --git a/src/app/shared/testing/browse-link-data-service.stub.ts b/src/app/shared/testing/browse-link-data-service.stub.ts index c3eb806791..4deff2bf05 100644 --- a/src/app/shared/testing/browse-link-data-service.stub.ts +++ b/src/app/shared/testing/browse-link-data-service.stub.ts @@ -15,24 +15,24 @@ import { PageInfo } from '../../core/shared/page-info.model'; // This data is in post-serialized form (metadata -> metadataKeys) export const mockData: BrowseDefinition[] = [ Object.assign(new BrowseDefinition, { - "id" : "dateissued", - "metadataBrowse" : false, - "dataType" : "date", - "sortOptions" : EMPTY, - "order" : "ASC", - "type" : "browse", - "metadataKeys" : [ "dc.date.issued" ], - "_links" : EMPTY + 'id' : 'dateissued', + 'metadataBrowse' : false, + 'dataType' : 'date', + 'sortOptions' : EMPTY, + 'order' : 'ASC', + 'type' : 'browse', + 'metadataKeys' : [ 'dc.date.issued' ], + '_links' : EMPTY }), Object.assign(new BrowseDefinition, { - "id" : "author", - "metadataBrowse" : true, - "dataType" : "text", - "sortOptions" : EMPTY, - "order" : "ASC", - "type" : "browse", - "metadataKeys" : [ "dc.contributor.*", "dc.creator" ], - "_links" : EMPTY + 'id' : 'author', + 'metadataBrowse' : true, + 'dataType' : 'text', + 'sortOptions' : EMPTY, + 'order' : 'ASC', + 'type' : 'browse', + 'metadataKeys' : [ 'dc.contributor.*', 'dc.creator' ], + '_links' : EMPTY }) ]; @@ -53,7 +53,7 @@ export const browseLinkDataServiceStub: any = { let searchKeyArray: string[] = []; metadataKeys.forEach((metadataKey) => { searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(metadataKey)); - }) + }); return this.getBrowseLinks().pipe( getRemoteDataPayload(), getPaginatedListPayload(), @@ -74,4 +74,4 @@ export const browseLinkDataServiceStub: any = { distinctUntilChanged() ); } -} +};