Skip to content

Commit f625a4b

Browse files
author
Andrea Barbasso
committed
[DSC-2676] fix lint
1 parent b04c8ae commit f625a4b

8 files changed

Lines changed: 40 additions & 24 deletions

File tree

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"test:lint": "npm run build:lint && npm run test:lint:nobuild",
2929
"test:lint:nobuild": "jasmine --config=lint/jasmine.json",
3030
"lint": "npm run build:lint && npm run lint:nobuild",
31-
"lint:nobuild": "npm run ng-high-memory --lint",
32-
"lint-fix": "npm run build:lint && npm run ng-high-memory --lint --fix=true",
31+
"lint:nobuild": "npm run ng-high-memory -- lint",
32+
"lint-fix": "npm run build:lint && npm run ng-high-memory -- lint --fix=true",
3333
"docs:lint": "ts-node --project ./lint/tsconfig.json ./lint/generate-docs.ts",
3434
"e2e": "cross-env NODE_ENV=production ng e2e",
3535
"clean:dev:config": "rimraf src/assets/config.json",

‎src/app/app.menus.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { MenuID } from './shared/menu/menu-id.model';
1010
import { MenuRoute } from './shared/menu/menu-route.model';
1111
import { AccessControlMenuProvider } from './shared/menu/providers/access-control.menu';
1212
import { AdminSearchMenuProvider } from './shared/menu/providers/admin-search.menu';
13-
import { BrowseMenuProvider } from './shared/menu/providers/browse.menu';
1413
import { CoarNotifyMenuProvider } from './shared/menu/providers/coar-notify.menu';
1514
import { SubscribeMenuProvider } from './shared/menu/providers/comcol-subscribe.menu';
1615
import { CommunityListMenuProvider } from './shared/menu/providers/community-list.menu';
@@ -19,23 +18,23 @@ import { CurationMenuProvider } from './shared/menu/providers/curation.menu';
1918
import { DSpaceObjectEditMenuProvider } from './shared/menu/providers/dso-edit.menu';
2019
import { DsoOptionMenuProvider } from './shared/menu/providers/dso-option.menu';
2120
import { EditMenuProvider } from './shared/menu/providers/edit.menu';
21+
import { ExploreMenuProvider } from './shared/menu/providers/explore.menu';
2222
import { ExportMenuProvider } from './shared/menu/providers/export.menu';
2323
import { HealthMenuProvider } from './shared/menu/providers/health.menu';
2424
import { ImportMenuProvider } from './shared/menu/providers/import.menu';
2525
import { ClaimMenuProvider } from './shared/menu/providers/item-claim.menu';
2626
import { OrcidMenuProvider } from './shared/menu/providers/item-orcid.menu';
2727
import { VersioningMenuProvider } from './shared/menu/providers/item-versioning.menu';
28+
import { MetadataCmsMenuProvider } from './shared/menu/providers/metadata-cms.menu';
2829
import { NewMenuProvider } from './shared/menu/providers/new.menu';
2930
import { NotificationsMenuProvider } from './shared/menu/providers/notifications.menu';
3031
import { ProcessesMenuProvider } from './shared/menu/providers/processes.menu';
3132
import { RegistriesMenuProvider } from './shared/menu/providers/registries.menu';
3233
import { StatisticsMenuProvider } from './shared/menu/providers/statistics.menu';
3334
import { SystemWideAlertMenuProvider } from './shared/menu/providers/system-wide-alert.menu';
35+
import { UserAgreementMenuProvider } from './shared/menu/providers/user-agreement.menu';
3436
import { WithdrawnReinstateItemMenuProvider } from './shared/menu/providers/withdrawn-reinstate-item.menu';
3537
import { WorkflowMenuProvider } from './shared/menu/providers/workflow.menu';
36-
import { ExploreMenuProvider } from './shared/menu/providers/explore.menu';
37-
import { UserAgreementMenuProvider } from './shared/menu/providers/user-agreement.menu';
38-
import { MetadataCmsMenuProvider } from './shared/menu/providers/metadata-cms.menu';
3938

4039
/**
4140
* Represents and builds the menu structure for the three available menus (public navbar, admin sidebar and the dso edit

‎src/app/shared/menu/providers/explore.menu.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
import { TestBed } from '@angular/core/testing';
1010

1111
import { APP_CONFIG } from '../../../../config/app-config.interface';
12+
import { environment } from '../../../../environments/environment';
13+
import { SectionDataService } from '../../../core/layout/section-data.service';
1214
import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
1315
import { createPaginatedList } from '../../testing/utils.test';
1416
import { ExploreMenuProvider } from './explore.menu';
15-
import { environment } from '../../../../environments/environment';
16-
import { SectionDataService } from '../../../core/layout/section-data.service';
1717

1818
describe('ExploreMenuProvider', () => {
1919

2020
let provider: ExploreMenuProvider;
2121
let sectionDataServiceStub = {
2222
findVisibleSections: () => createSuccessfulRemoteDataObject$(createPaginatedList([])),
23-
}
23+
};
2424

2525
beforeEach(() => {
2626
TestBed.configureTestingModule({

‎src/app/shared/menu/providers/explore.menu.ts‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ import { map } from 'rxjs/operators';
1212

1313
import { PaginatedList } from '../../../core/data/paginated-list.model';
1414
import { RemoteData } from '../../../core/data/remote-data';
15+
import { Section } from '../../../core/layout/models/section.model';
16+
import { SectionDataService } from '../../../core/layout/section-data.service';
1517
import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
1618
import { MenuItemType } from '../menu-item-type.model';
17-
import { AbstractMenuProvider, PartialMenuSection } from '../menu-provider.model';
18-
import { SectionDataService } from '../../../core/layout/section-data.service';
19-
import { Section } from '../../../core/layout/models/section.model';
19+
import {
20+
AbstractMenuProvider,
21+
PartialMenuSection,
22+
} from '../menu-provider.model';
2023

2124
/**
2225
* Menu provider to create the explore menu sections in the public navbar

‎src/app/shared/menu/providers/metadata-cms.menu.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
*/
88

99
import { TestBed } from '@angular/core/testing';
10-
import { MetadataCmsMenuProvider } from './metadata-cms.menu';
11-
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
1210
import { of } from 'rxjs';
11+
1312
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
13+
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
14+
import { MetadataCmsMenuProvider } from './metadata-cms.menu';
1415

1516
describe('MetadataCmsMenuProvider', () => {
1617

‎src/app/shared/menu/providers/metadata-cms.menu.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@
77
*/
88

99
import { Injectable } from '@angular/core';
10-
import { combineLatest, Observable } from 'rxjs';
10+
import {
11+
combineLatest,
12+
Observable,
13+
} from 'rxjs';
1114
import { map } from 'rxjs/operators';
1215

13-
import { MenuItemType } from '../menu-item-type.model';
14-
import { AbstractMenuProvider, PartialMenuSection } from '../menu-provider.model';
15-
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
1616
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
17+
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
18+
import { MenuItemType } from '../menu-item-type.model';
19+
import {
20+
AbstractMenuProvider,
21+
PartialMenuSection,
22+
} from '../menu-provider.model';
1723

1824
/**
1925
* Menu provider to create the user agreement menu sections in the public navbar

‎src/app/shared/menu/providers/user-agreement.menu.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
*/
88

99
import { TestBed } from '@angular/core/testing';
10-
import { UserAgreementMenuProvider } from './user-agreement.menu';
11-
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
1210
import { of } from 'rxjs';
11+
1312
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
13+
import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
14+
import { UserAgreementMenuProvider } from './user-agreement.menu';
1415

1516
describe('UserAgreementMenuProvider', () => {
1617

‎src/app/shared/menu/providers/user-agreement.menu.ts‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@
77
*/
88

99
import { Injectable } from '@angular/core';
10-
import { combineLatest, Observable } from 'rxjs';
10+
import {
11+
combineLatest,
12+
Observable,
13+
} from 'rxjs';
1114
import { map } from 'rxjs/operators';
1215

13-
import { MenuItemType } from '../menu-item-type.model';
14-
import { AbstractMenuProvider, PartialMenuSection } from '../menu-provider.model';
15-
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
1616
import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
17+
import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
18+
import { MenuItemType } from '../menu-item-type.model';
19+
import {
20+
AbstractMenuProvider,
21+
PartialMenuSection,
22+
} from '../menu-provider.model';
1723

1824
/**
1925
* Menu provider to create the user agreement menu sections in the public navbar

0 commit comments

Comments
 (0)