Skip to content

Commit cdefe3e

Browse files
DawnkaiMaciej Kleban
authored andcommitted
Fix lint errors
1 parent 32bd535 commit cdefe3e

21 files changed

Lines changed: 125 additions & 102 deletions

src/app/admin/admin-edit-cms-metadata/admin-edit-cms-metadata.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import {
66
} from '@angular/core/testing';
77
import { FormsModule } from '@angular/forms';
88
import { By } from '@angular/platform-browser';
9+
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
10+
import { NotificationsServiceStub } from '@dspace/core/testing/notifications-service.stub';
11+
import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
912
import {
1013
TranslateLoader,
1114
TranslateModule,
@@ -16,9 +19,6 @@ import { environment } from '../../../environments/environment.test';
1619
import { SiteDataService } from '../../core/data/site-data.service';
1720
import { Site } from '../../core/shared/site.model';
1821
import { AdminEditCmsMetadataComponent } from './admin-edit-cms-metadata.component';
19-
import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
20-
import { NotificationsServiceStub } from '@dspace/core/testing/notifications-service.stub';
21-
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
2222

2323
describe('AdminEditCmsMetadataComponent', () => {
2424

src/app/admin/admin-edit-cms-metadata/admin-edit-cms-metadata.component.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import {
22
AsyncPipe,
3-
NgForOf,
4-
NgIf,
53
NgTemplateOutlet,
64
} from '@angular/common';
75
import {
86
Component,
97
OnInit,
108
} from '@angular/core';
119
import { FormsModule } from '@angular/forms';
10+
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
1211
import {
1312
TranslateModule,
1413
TranslateService,
@@ -21,7 +20,6 @@ import { environment } from '../../../environments/environment';
2120
import { SiteDataService } from '../../core/data/site-data.service';
2221
import { getFirstCompletedRemoteData } from '../../core/shared/operators';
2322
import { Site } from '../../core/shared/site.model';
24-
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
2523

2624
/**
2725
* Component representing the page to edit cms metadata for site.
@@ -31,13 +29,12 @@ import { NotificationsService } from '@dspace/core/notification-system/notificat
3129
templateUrl: './admin-edit-cms-metadata.component.html',
3230
styleUrls: ['./admin-edit-cms-metadata.component.scss'],
3331
imports: [
34-
FormsModule,
35-
TranslateModule,
3632
AsyncPipe,
37-
NgTemplateOutlet,
3833
BtnDisabledDirective,
34+
FormsModule,
35+
NgTemplateOutlet,
36+
TranslateModule,
3937
],
40-
standalone: true,
4138
})
4239
export class AdminEditCmsMetadataComponent implements OnInit {
4340
/**

src/app/admin/admin-edit-user-agreement/admin-edit-user-agreement.component.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
import { CommonModule } from '@angular/common';
22
import { NO_ERRORS_SCHEMA } from '@angular/core';
33
import {
4-
waitForAsync,
54
ComponentFixture,
65
inject,
76
TestBed,
7+
waitForAsync,
88
} from '@angular/core/testing';
99
import {
1010
FormsModule,
1111
ReactiveFormsModule,
1212
} from '@angular/forms';
1313
import { BrowserModule } from '@angular/platform-browser';
1414
import { RouterTestingModule } from '@angular/router/testing';
15+
import { APP_DATA_SERVICES_MAP } from '@dspace/core/data-services-map-type';
16+
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
17+
import { ResourceType } from '@dspace/core/shared/resource-type';
18+
import { NotificationsServiceStub } from '@dspace/core/testing/notifications-service.stub';
19+
import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
1520
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
21+
import { provideMockStore } from '@ngrx/store/testing';
1622
import {
1723
TranslateLoader,
1824
TranslateModule,
@@ -27,12 +33,6 @@ import { SiteDataService } from '../../core/data/site-data.service';
2733
import { Site } from '../../core/shared/site.model';
2834
import { AlertComponent } from '../../shared/alert/alert.component';
2935
import { AdminEditUserAgreementComponent } from './admin-edit-user-agreement.component';
30-
import { NotificationsServiceStub } from '@dspace/core/testing/notifications-service.stub';
31-
import { TranslateLoaderMock } from '@dspace/core/testing/translate-loader.mock';
32-
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
33-
import { provideMockStore } from '@ngrx/store/testing';
34-
import { APP_DATA_SERVICES_MAP } from '@dspace/core/data-services-map-type';
35-
import { ResourceType } from '@dspace/core/shared/resource-type';
3636

3737
const TEST_MODEL = new ResourceType('testmodel');
3838

@@ -84,8 +84,8 @@ describe('AdminEditUserAgreementComponent', () => {
8484
provideMockStore({
8585
initialState: {
8686
index: {
87-
}
88-
}
87+
},
88+
},
8989
}),
9090
{ provide: APP_DATA_SERVICES_MAP, useValue: mockDataServiceMap },
9191
{ provide: NotificationsService, useValue: notificationService },

src/app/admin/admin-edit-user-agreement/admin-edit-user-agreement.component.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
import {
2-
KeyValuePipe,
3-
NgForOf,
4-
} from '@angular/common';
1+
import { KeyValuePipe } from '@angular/common';
52
import {
63
Component,
74
OnDestroy,
85
OnInit,
96
} from '@angular/core';
107
import { FormsModule } from '@angular/forms';
8+
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
119
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
1210
import {
1311
TranslateModule,
@@ -22,7 +20,6 @@ import { SiteDataService } from '../../core/data/site-data.service';
2220
import { getFirstCompletedRemoteData } from '../../core/shared/operators';
2321
import { Site } from '../../core/shared/site.model';
2422
import { AlertComponent } from '../../shared/alert/alert.component';
25-
import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
2623

2724
/**
2825
* Component that represents the user agreement edit page for administrators.
@@ -32,11 +29,10 @@ import { NotificationsService } from '@dspace/core/notification-system/notificat
3229
templateUrl: './admin-edit-user-agreement.component.html',
3330
imports: [
3431
AlertComponent,
35-
TranslateModule,
36-
KeyValuePipe,
3732
FormsModule,
33+
KeyValuePipe,
34+
TranslateModule,
3835
],
39-
standalone: true,
4036
})
4137
export class AdminEditUserAgreementComponent implements OnInit, OnDestroy {
4238

src/app/admin/admin-routes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { Route } from '@angular/router';
22
import { i18nBreadcrumbResolver } from '@dspace/core/breadcrumbs/i18n-breadcrumb.resolver';
33

44
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
5+
import { AdminEditCmsMetadataComponent } from './admin-edit-cms-metadata/admin-edit-cms-metadata.component';
6+
import { AdminEditUserAgreementComponent } from './admin-edit-user-agreement/admin-edit-user-agreement.component';
57
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
68
import { ThemedMetadataImportPageComponent } from './admin-import-metadata-page/themed-metadata-import-page.component';
79
import {
@@ -13,8 +15,6 @@ import {
1315
} from './admin-routing-paths';
1416
import { ThemedAdminSearchPageComponent } from './admin-search-page/themed-admin-search-page.component';
1517
import { ThemedAdminWorkflowPageComponent } from './admin-workflow-page/themed-admin-workflow-page.component';
16-
import { AdminEditCmsMetadataComponent } from './admin-edit-cms-metadata/admin-edit-cms-metadata.component';
17-
import { AdminEditUserAgreementComponent } from './admin-edit-user-agreement/admin-edit-user-agreement.component';
1818

1919
export const ROUTES: Route[] = [
2020
{

src/app/app.menus.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import { CurationMenuProvider } from './shared/menu/providers/curation.menu';
2121
import { DSpaceObjectEditMenuProvider } from './shared/menu/providers/dso-edit.menu';
2222
import { DsoOptionMenuProvider } from './shared/menu/providers/dso-option.menu';
2323
import { EditMenuProvider } from './shared/menu/providers/edit.menu';
24+
import { EditCMSMetadataMenuProvider } from './shared/menu/providers/edit-cms-metadata.menu';
25+
import { EditUserAgreementMenuProvider } from './shared/menu/providers/edit-user-agreement.menu';
2426
import { ExportMenuProvider } from './shared/menu/providers/export.menu';
2527
import { HealthMenuProvider } from './shared/menu/providers/health.menu';
2628
import { ImportMenuProvider } from './shared/menu/providers/import.menu';
@@ -35,8 +37,6 @@ import { StatisticsMenuProvider } from './shared/menu/providers/statistics.menu'
3537
import { SystemWideAlertMenuProvider } from './shared/menu/providers/system-wide-alert.menu';
3638
import { WithdrawnReinstateItemMenuProvider } from './shared/menu/providers/withdrawn-reinstate-item.menu';
3739
import { WorkflowMenuProvider } from './shared/menu/providers/workflow.menu';
38-
import { EditCMSMetadataMenuProvider } from './shared/menu/providers/edit-cms-metadata.menu';
39-
import { EditUserAgreementMenuProvider } from './shared/menu/providers/edit-user-agreement.menu';
4040

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

src/app/core/data/site-data.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import { Site } from '../shared/site.model';
1111
import { createPaginatedList } from '../testing/utils.test';
1212
import { createSuccessfulRemoteDataObject } from '../utilities/remote-data.utils';
1313
import { testFindAllDataImplementation } from './base/find-all-data.spec';
14+
import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
1415
import { FindListOptions } from './find-list-options.model';
1516
import { RequestService } from './request.service';
1617
import { SiteDataService } from './site-data.service';
17-
import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
1818

1919
describe('SiteDataService', () => {
2020
let scheduler: TestScheduler;

src/app/core/data/site-data.service.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Injectable } from '@angular/core';
22
import { FollowLinkConfig } from '@dspace/core/shared/follow-link-config.model';
3+
import { Operation } from 'fast-json-patch/module/core';
34
import { Observable } from 'rxjs';
45
import { map } from 'rxjs/operators';
56

@@ -13,15 +14,16 @@ import {
1314
FindAllData,
1415
FindAllDataImpl,
1516
} from './base/find-all-data';
17+
import { constructIdEndpointDefault } from './base/identifiable-data.service';
18+
import {
19+
PatchData,
20+
PatchDataImpl,
21+
} from './base/patch-data';
22+
import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
1623
import { FindListOptions } from './find-list-options.model';
1724
import { PaginatedList } from './paginated-list.model';
1825
import { RemoteData } from './remote-data';
1926
import { RequestService } from './request.service';
20-
import { Operation } from 'fast-json-patch/module/core';
21-
import { PatchData, PatchDataImpl } from './base/patch-data';
22-
import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
23-
24-
import { constructIdEndpointDefault } from './base/identifiable-data.service';
2527

2628
/**
2729
* Service responsible for handling requests related to the Site object

src/app/footer/footer.component.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ import { ActivatedRoute } from '@angular/router';
1010
import { APP_CONFIG } from '@dspace/config/app-config.interface';
1111
import { NotifyInfoService } from '@dspace/core/coar-notify/notify-info/notify-info.service';
1212
import { AuthorizationDataService } from '@dspace/core/data/feature-authorization/authorization-data.service';
13+
import { APP_DATA_SERVICES_MAP } from '@dspace/core/data-services-map-type';
14+
import { LocaleService } from '@dspace/core/locale/locale.service';
15+
import { ResourceType } from '@dspace/core/shared/resource-type';
1316
import { ActivatedRouteStub } from '@dspace/core/testing/active-router.stub';
1417
import { AuthorizationDataServiceStub } from '@dspace/core/testing/authorization-service.stub';
18+
import { provideMockStore } from '@ngrx/store/testing';
1519
import { TranslateModule } from '@ngx-translate/core';
1620
import { of } from 'rxjs';
1721

1822
import { environment } from '../../environments/environment.test';
1923
import { FooterComponent } from './footer.component';
20-
import { provideMockStore } from '@ngrx/store/testing';
21-
import { APP_DATA_SERVICES_MAP } from '@dspace/core/data-services-map-type';
22-
import { ResourceType } from '@dspace/core/shared/resource-type';
23-
import { LocaleService } from '@dspace/core/locale/locale.service';
2424

2525
let comp: FooterComponent;
2626
let fixture: ComponentFixture<FooterComponent>;
@@ -29,8 +29,8 @@ let localeService: any;
2929
const TEST_MODEL = new ResourceType('testmodel');
3030
const languageList = ['en;q=1', 'de;q=0.8'];
3131
const mockLocaleService = jasmine.createSpyObj('LocaleService', {
32-
getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
33-
getLanguageCodeList: of(languageList),
32+
getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
33+
getLanguageCodeList: of(languageList),
3434
});
3535

3636
let notifyInfoService = {
@@ -52,8 +52,8 @@ describe('Footer component', () => {
5252
provideMockStore({
5353
initialState: {
5454
index: {
55-
}
56-
}
55+
},
56+
},
5757
}),
5858
{ provide: LocaleService, useValue: mockLocaleService },
5959
{ provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },

src/app/footer/footer.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { NotifyInfoService } from '@dspace/core/coar-notify/notify-info/notify-i
1717
import { OrejimeService } from '@dspace/core/cookies/orejime.service';
1818
import { AuthorizationDataService } from '@dspace/core/data/feature-authorization/authorization-data.service';
1919
import { FeatureID } from '@dspace/core/data/feature-authorization/feature-id';
20+
import { SiteDataService } from '@dspace/core/data/site-data.service';
2021
import { LocaleService } from '@dspace/core/locale/locale.service';
2122
import { hasValue } from '@dspace/shared/utils/empty.util';
2223
import { TranslateModule } from '@ngx-translate/core';
@@ -27,8 +28,8 @@ import {
2728
of,
2829
take,
2930
} from 'rxjs';
31+
3032
import { MarkdownViewerComponent } from '../shared/markdown-viewer/markdown-viewer.component';
31-
import { SiteDataService } from '@dspace/core/data/site-data.service';
3233

3334
@Component({
3435
selector: 'ds-base-footer',
@@ -37,9 +38,9 @@ import { SiteDataService } from '@dspace/core/data/site-data.service';
3738
imports: [
3839
AsyncPipe,
3940
DatePipe,
41+
MarkdownViewerComponent,
4042
RouterLink,
4143
TranslateModule,
42-
MarkdownViewerComponent
4344
],
4445
})
4546
export class FooterComponent implements OnInit {
@@ -75,7 +76,7 @@ export class FooterComponent implements OnInit {
7576

7677
this.footerMetadataValue$ = combineLatest({
7778
site$: this.siteService.find().pipe(
78-
take(1)
79+
take(1),
7980
),
8081
language$: this.locale.getCurrentLanguageCode(),
8182
}).pipe(

0 commit comments

Comments
 (0)