Skip to content

Commit 560f0ed

Browse files
Mattia VianelliMattia Vianelli
Mattia Vianelli
authored and
Mattia Vianelli
committed
DSC-2764 Lint fix
1 parent 38332e8 commit 560f0ed

5 files changed

Lines changed: 18 additions & 91 deletions

File tree

‎src/app/lucky-search/search/lucky-search.component.spec.ts‎

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
1-
import {ComponentFixture, TestBed} from '@angular/core/testing';
2-
3-
import {LuckySearchComponent} from './lucky-search.component';
4-
import {LuckySearchService} from '../lucky-search.service';
5-
import {SearchConfigurationService} from '../../core/shared/search/search-configuration.service';
6-
import {Router, UrlTree} from '@angular/router';
7-
import {createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$} from '../../shared/remote-data.utils';
8-
import {createPaginatedList} from '../../shared/testing/utils.test';
9-
import {Item} from '../../core/shared/item.model';
10-
import {of as observableOf} from 'rxjs';
11-
import {PaginatedSearchOptions} from '../../shared/search/models/paginated-search-options.model';
12-
import {PaginationComponentOptions} from '../../shared/pagination/pagination-component-options.model';
13-
import {SortDirection, SortOptions} from '../../core/cache/models/sort-options.model';
14-
import {TranslateModule} from '@ngx-translate/core';
15-
import {By} from '@angular/platform-browser';
16-
import {SearchResult} from '../../shared/search/models/search-result.model';
17-
import {DSpaceObject} from '../../core/shared/dspace-object.model';
18-
import {BitstreamDataService, MetadataFilter} from '../../core/data/bitstream-data.service';
19-
import {Bitstream} from '../../core/shared/bitstream.model';
20-
import {RouterMock} from '../../shared/mocks/router.mock';
21-
import {MetadataMap, MetadataValue} from '../../core/shared/metadata.models';
22-
import {FileSizePipe} from '../../shared/utils/file-size-pipe';
23-
import {HardRedirectService} from '../../core/services/hard-redirect.service';
24-
import {getBitstreamDownloadRoute} from '../../app-routing-paths';
25-
import {PLATFORM_ID} from '@angular/core';
26-
import {NotificationsService} from '../../shared/notifications/notifications.service';
27-
import {NotificationsServiceStub} from '../../shared/testing/notifications-service.stub';
28-
import {APP_CONFIG} from '../../../config/app-config.interface';
291
import {
302
ChangeDetectionStrategy,
313
PLATFORM_ID,
@@ -42,6 +14,7 @@ import {
4214
import { TranslateModule } from '@ngx-translate/core';
4315
import { of as observableOf } from 'rxjs';
4416

17+
import { APP_CONFIG } from '../../../config/app-config.interface';
4518
import { getBitstreamDownloadRoute } from '../../app-routing-paths';
4619
import {
4720
SortDirection,
@@ -159,7 +132,7 @@ describe('LuckySearchComponent', () => {
159132
{ provide: HardRedirectService, useValue: hardRedirectService },
160133
{ provide: PLATFORM_ID, useValue: 'browser' },
161134
{ provide: NotificationsService, useValue: new NotificationsServiceStub() },
162-
{provide: APP_CONFIG, useValue: {}},
135+
{ provide: APP_CONFIG, useValue: {} },
163136
],
164137
}).overrideComponent(LuckySearchComponent, {
165138
remove: {
@@ -395,11 +368,11 @@ describe('LuckySearchComponent', () => {
395368
// @ts-ignore: Accessing private method for testing
396369
component.appConfig = {
397370
luckySearchRedirects: {
398-
default: 301
399-
}
371+
default: 301,
372+
},
400373
} as any;
401374
// @ts-ignore: Accessing private method for testing
402-
component.currentFilter = {identifier: 'unknown'};
375+
component.currentFilter = { identifier: 'unknown' };
403376

404377
// @ts-ignore: Accessing private method for testing
405378
const result = component.getRedirectCode();
@@ -410,10 +383,10 @@ describe('LuckySearchComponent', () => {
410383
it('should return 302 when default is not set and identifier is not found', () => {
411384
// @ts-ignore: Accessing private method for testing
412385
component.appConfig = {
413-
luckySearchRedirects: {}
386+
luckySearchRedirects: {},
414387
} as any;
415388
// @ts-ignore: Accessing private method for testing
416-
component.currentFilter = {identifier: 'unknown'};
389+
component.currentFilter = { identifier: 'unknown' };
417390

418391
// @ts-ignore: Accessing private method for testing
419392
const result = component.getRedirectCode();
@@ -425,11 +398,11 @@ describe('LuckySearchComponent', () => {
425398
component.appConfig = {
426399
luckySearchRedirects: {
427400
default: 302,
428-
'legacy-id': 301
429-
}
401+
'legacy-id': 301,
402+
},
430403
};
431404
// @ts-ignore: Accessing private method for testing
432-
component.currentFilter = {identifier: 'legacy-id'};
405+
component.currentFilter = { identifier: 'legacy-id' };
433406

434407
// @ts-ignore: Accessing private method for testing
435408
const result = component.getRedirectCode();

‎src/app/lucky-search/search/lucky-search.component.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ import {
3232
withLatestFrom,
3333
} from 'rxjs/operators';
3434

35+
import {
36+
APP_CONFIG,
37+
AppConfig,
38+
} from '../../../config/app-config.interface';
3539
import { getBitstreamDownloadRoute } from '../../app-routing-paths';
3640
import {
3741
BitstreamDataService,
@@ -66,7 +70,6 @@ import { TruncatableComponent } from '../../shared/truncatable/truncatable.compo
6670
import { TruncatablePartComponent } from '../../shared/truncatable/truncatable-part/truncatable-part.component';
6771
import { FileSizePipe } from '../../shared/utils/file-size-pipe';
6872
import { LuckySearchService } from '../lucky-search.service';
69-
import {APP_CONFIG, AppConfig} from '../../../config/app-config.interface';
7073

7174
@Component({
7275
selector: 'ds-lucky-search',

‎src/config/app-config.interface.ts‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import {
3737
LayoutConfig,
3838
} from './layout-config.interfaces';
3939
import { LoaderConfig } from './loader-config.interfaces';
40+
import { LuckySearchRedirectConfig } from './lucky-search-redirect-config';
4041
import { MarkdownConfig } from './markdown-config.interface';
4142
import { MediaViewerConfig } from './media-viewer-config.interface';
4243
import { MetaTagsConfig } from './meta-tags.config';
@@ -49,16 +50,6 @@ import { QualityAssuranceConfig } from './quality-assurance.config';
4950
import { FollowAuthorityMetadata } from './search-follow-metadata.interface';
5051
import { SearchConfig } from './search-page-config.interface';
5152
import { SearchResultConfig } from './search-result-config.interface';
52-
import {VirtualCollectionConfig} from './virtual-collection-config.interface';
53-
import {EpflUnpaywallMetadata} from './epfl-unpaywall-metadata';
54-
import { MiradorConfig } from './mirador-config.interfaces';
55-
import { LoaderConfig } from './loader-config.interfaces';
56-
import { MetaTagsConfig } from './meta-tags.config';
57-
import { MetadataLinkViewPopoverDataConfig } from './metadata-link-view-popoverdata-config.interface';
58-
import { IdentifierSubtypesConfig } from './identifier-subtypes-config.interface';
59-
import { DatadogRumConfig } from './datadog-rum-config.interfaces';
60-
import { LocationConfig } from './location-config.interface';
61-
import {LuckySearchRedirectConfig} from './lucky-search-redirect-config';
6253
import { ServerConfig } from './server-config.interface';
6354
import { SubmissionConfig } from './submission-config.interface';
6455
import { SuggestionConfig } from './suggestion-config.interfaces';
@@ -116,9 +107,6 @@ interface AppConfig extends Config {
116107
metadataLinkViewPopoverData: MetadataLinkViewPopoverDataConfig;
117108
identifierSubtypes: IdentifierSubtypesConfig[];
118109
datadogRum?: DatadogRumConfig;
119-
location: LocationConfig;
120-
epflUnpaywallMetadata: EpflUnpaywallMetadata;
121-
loader: LoaderConfig;
122110
permanentRedirectPaths?: string[];
123111
luckySearchRedirects?: LuckySearchRedirectConfig;
124112
}

‎src/config/default-app-config.ts‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import {
3737
SuggestionConfig,
3838
} from './layout-config.interfaces';
3939
import { LoaderConfig } from './loader-config.interfaces';
40+
import { LuckySearchRedirectConfig } from './lucky-search-redirect-config';
4041
import { MarkdownConfig } from './markdown-config.interface';
4142
import { MediaViewerConfig } from './media-viewer-config.interface';
4243
import { MetaTagsConfig } from './meta-tags.config';
@@ -53,36 +54,6 @@ import { ServerConfig } from './server-config.interface';
5354
import { SubmissionConfig } from './submission-config.interface';
5455
import { ThemeConfig } from './theme.config';
5556
import { UIServerConfig } from './ui-server-config.interface';
56-
import { BundleConfig } from './bundle-config.interface';
57-
import { ActuatorsConfig } from './actuators.config';
58-
import { InfoConfig } from './info-config.interface';
59-
import { CommunityListConfig } from './community-list-config.interface';
60-
import { HomeConfig } from './homepage-config.interface';
61-
import { MarkdownConfig } from './markdown-config.interface';
62-
import { FilterVocabularyConfig } from './filter-vocabulary-config';
63-
import { DiscoverySortConfig } from './discovery-sort.config';
64-
import { AddToAnyPluginConfig } from './add-to-any-plugin-config';
65-
import { CmsMetadata } from './cms-metadata';
66-
import { CrisLayoutConfig, LayoutConfig, SuggestionConfig } from './layout-config.interfaces';
67-
import { MetadataSecurityConfig } from './metadata-security-config';
68-
import { FollowAuthorityMetadata } from './search-follow-metadata.interface';
69-
import { MetricVisualizationConfig } from './metric-visualization-config.interfaces';
70-
import {
71-
AdvancedAttachmentElementType,
72-
AdvancedAttachmentRenderingConfig
73-
} from './advanced-attachment-rendering.config';
74-
import { AttachmentRenderingConfig } from './attachment-rendering.config';
75-
import { SearchResultConfig } from './search-result-config.interface';
76-
import { VirtualCollectionConfig } from './virtual-collection-config.interface';
77-
import { EpflUnpaywallMetadata } from './epfl-unpaywall-metadata';
78-
import { MiradorConfig } from './mirador-config.interfaces';
79-
import { LoaderConfig } from './loader-config.interfaces';
80-
import { MetaTagsConfig } from './meta-tags.config';
81-
import { MetadataLinkViewPopoverDataConfig } from './metadata-link-view-popoverdata-config.interface';
82-
import { IdentifierSubtypesConfig, IdentifierSubtypesIconPositionEnum } from './identifier-subtypes-config.interface';
83-
import { DatadogRumConfig } from './datadog-rum-config.interfaces';
84-
import { LocationConfig } from './location-config.interface';
85-
import {LuckySearchRedirectConfig} from './lucky-search-redirect-config';
8657

8758
export class DefaultAppConfig implements AppConfig {
8859
production = false;
@@ -1054,16 +1025,8 @@ export class DefaultAppConfig implements AppConfig {
10541025
defaultPrivacyLevel: 'mask-user-input',
10551026
};
10561027

1057-
location: LocationConfig = {
1058-
nominatimApi: {
1059-
searchEndpoint: 'https://nominatim.openstreetmap.org/search',
1060-
reverseSearchEndpoint: 'https://nominatim.openstreetmap.org/reverse',
1061-
statusEndpoint: 'https://nominatim.openstreetmap.org/status',
1062-
}
1063-
};
1064-
10651028
luckySearchRedirects: LuckySearchRedirectConfig = {
10661029
'legacy-id': 301,
1067-
default: 302
1030+
default: 302,
10681031
};
10691032
}

‎src/config/lucky-search-redirect-config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Config} from './config.interface';
1+
import { Config } from './config.interface';
22

33
export interface LuckySearchRedirectConfig extends Config {
44
[indexName: string]: number;

0 commit comments

Comments
 (0)