Skip to content

Commit 5ad3caa

Browse files
committed
feat(registration-recent-activity): run lint fix
1 parent 03215af commit 5ad3caa

File tree

15 files changed

+60
-46
lines changed

15 files changed

+60
-46
lines changed

src/app/core/constants/environment.token.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { InjectionToken } from '@angular/core';
22

3-
import { environment } from 'src/environments/environment';
43
import { AppEnvironment } from '@shared/models/environment.model';
54

5+
import { environment } from 'src/environments/environment';
6+
67
export const ENVIRONMENT = new InjectionToken<AppEnvironment>('App Environment', {
78
providedIn: 'root',
89
factory: () => environment as AppEnvironment,

src/app/features/project/overview/components/recent-activity/recent-activity.component.spec.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
import { ComponentFixture, TestBed } from '@angular/core/testing';
21
import { provideStore, Store } from '@ngxs/store';
3-
import { ActivatedRoute } from '@angular/router';
4-
5-
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
6-
import { provideHttpClientTesting } from '@angular/common/http/testing';
72

83
import { TranslateService } from '@ngx-translate/core';
4+
95
import { of } from 'rxjs';
106

11-
import { RecentActivityComponent } from './recent-activity.component';
7+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
8+
import { provideHttpClientTesting } from '@angular/common/http/testing';
9+
import { ComponentFixture, TestBed } from '@angular/core/testing';
10+
import { ActivatedRoute } from '@angular/router';
11+
1212
import { ActivityLogDisplayService } from '@shared/services';
1313
import { GetActivityLogs } from '@shared/stores/activity-logs';
1414
import { ActivityLogsState } from '@shared/stores/activity-logs/activity-logs.state';
1515

16+
import { RecentActivityComponent } from './recent-activity.component';
17+
1618
describe('RecentActivityComponent', () => {
1719
let fixture: ComponentFixture<RecentActivityComponent>;
1820
let store: Store;

src/app/features/project/overview/project-overview.component.spec.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
import { ComponentFixture, TestBed } from '@angular/core/testing';
2-
import { RouterTestingModule } from '@angular/router/testing';
31
import { provideStore, Store } from '@ngxs/store';
4-
import { ActivatedRoute } from '@angular/router';
2+
3+
import { TranslateService } from '@ngx-translate/core';
4+
5+
import { DialogService } from 'primeng/dynamicdialog';
6+
57
import { of } from 'rxjs';
68

79
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
810
import { provideHttpClientTesting } from '@angular/common/http/testing';
11+
import { ComponentFixture, TestBed } from '@angular/core/testing';
12+
import { ActivatedRoute } from '@angular/router';
13+
import { RouterTestingModule } from '@angular/router/testing';
914

10-
import { ProjectOverviewComponent } from './project-overview.component';
15+
import { DataciteService, ToastService } from '@osf/shared/services';
1116
import { GetActivityLogs } from '@shared/stores/activity-logs';
1217

13-
import { DataciteService } from '@osf/shared/services';
14-
import { DialogService } from 'primeng/dynamicdialog';
15-
import { TranslateService } from '@ngx-translate/core';
16-
import { ToastService } from '@osf/shared/services';
18+
import { ProjectOverviewComponent } from './project-overview.component';
1719

1820
describe('ProjectOverviewComponent', () => {
1921
let fixture: ComponentFixture<ProjectOverviewComponent>;

src/app/features/registry/pages/recent-activity/registration-recent-activity.component.spec.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
2-
import { provideHttpClientTesting } from '@angular/common/http/testing';
1+
import { provideStore, Store } from '@ngxs/store';
2+
33
import { TranslateService } from '@ngx-translate/core';
4-
import { of } from 'rxjs';
5-
import { ActivityLogDisplayService } from '@shared/services';
64

7-
import { provideStore, Store } from '@ngxs/store';
5+
import { of } from 'rxjs';
86

7+
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
8+
import { provideHttpClientTesting } from '@angular/common/http/testing';
99
import { ComponentFixture, TestBed } from '@angular/core/testing';
1010
import { ActivatedRoute } from '@angular/router';
1111

12+
import { ActivityLogDisplayService } from '@shared/services';
1213
import { ClearActivityLogsStore, GetRegistrationActivityLogs } from '@shared/stores/activity-logs';
1314
import { ActivityLogsState } from '@shared/stores/activity-logs/activity-logs.state';
1415

src/app/features/registry/pages/recent-activity/registration-recent-activity.component.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@ import { createDispatchMap, select } from '@ngxs/store';
33
import { TranslatePipe } from '@ngx-translate/core';
44

55
import { PaginatorState } from 'primeng/paginator';
6+
import { Skeleton } from 'primeng/skeleton';
67

78
import { DatePipe } from '@angular/common';
8-
import { Skeleton } from 'primeng/skeleton';
99
import { ChangeDetectionStrategy, Component, computed, inject, OnDestroy, signal } from '@angular/core';
1010
import { ActivatedRoute } from '@angular/router';
1111

12+
import { ENVIRONMENT } from '@core/constants/environment.token';
1213
import { CustomPaginatorComponent } from '@shared/components';
14+
import { ACTIVITY_LOGS_DEFAULT_PAGE_SIZE } from '@shared/constants/activity-logs';
1315
import {
1416
ActivityLogsSelectors,
1517
ClearActivityLogsStore,
1618
GetRegistrationActivityLogs,
1719
} from '@shared/stores/activity-logs';
1820

19-
import { ENVIRONMENT } from '@core/constants/environment.token';
20-
import { ACTIVITY_LOGS_DEFAULT_PAGE_SIZE } from '@shared/constants/activity-logs';
21-
2221
@Component({
2322
selector: 'osf-registration-recent-activity',
2423
imports: [TranslatePipe, DatePipe, CustomPaginatorComponent, Skeleton],

src/app/shared/models/activity-logs/activity-log-with-display.model.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { SafeHtml } from '@angular/platform-browser';
2+
23
import { ActivityLog } from './activity-logs.model';
34

45
export interface ActivityLogWithDisplay extends ActivityLog {

src/app/shared/models/activity-logs/activity-logs.model.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ export interface ActivityLog {
1414
paramsNode: { id: string; title: string };
1515
paramsProject: null;
1616
pointer: Pointer | null;
17-
preprintProvider?:
18-
| string
19-
| { url: string; name: string }
20-
| null;
17+
preprintProvider?: string | { url: string; name: string } | null;
2118
addon?: string;
2219
anonymousLink?: boolean;
2320
file?: { name: string; url: string };
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1+
export * from './activity-log-with-display.model';
12
export * from './activity-logs.model';
23
export * from './activity-logs-json-api.model';
3-
export * from './activity-log-with-display.model';

src/app/shared/services/activity-logs/activity-logs.service.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ import { HttpTestingController } from '@angular/common/http/testing';
22
import { inject, TestBed } from '@angular/core/testing';
33

44
import { ActivityLogDisplayService } from '@shared/services';
5+
56
import { ActivityLogsService } from './activity-logs.service';
67

78
import {
8-
getActivityLogsResponse,
9-
buildRegistrationLogsUrl,
109
buildNodeLogsUrl,
10+
buildRegistrationLogsUrl,
11+
getActivityLogsResponse,
1112
} from '@testing/data/activity-logs/activity-logs.data';
1213
import { OSFTestingStoreModule } from '@testing/osf.testing.module';
1314

src/app/shared/services/activity-logs/activity-logs.service.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Observable } from 'rxjs';
22
import { map } from 'rxjs/operators';
3+
34
import { inject, Injectable } from '@angular/core';
45

56
import { ActivityLogsMapper } from '@shared/mappers/activity-logs.mapper';
@@ -32,7 +33,7 @@ export class ActivityLogsService {
3233
};
3334
}
3435

35-
fetchLogs(projectId: string, page: number = 1, pageSize: number): Observable<PaginatedData<ActivityLogWithDisplay[]>> {
36+
fetchLogs(projectId: string, page = 1, pageSize: number): Observable<PaginatedData<ActivityLogWithDisplay[]>> {
3637
const url = `${this.apiUrl}/nodes/${projectId}/logs/`;
3738
const params: Record<string, unknown> = {
3839
'embed[]': ['original_node', 'user', 'linked_node', 'linked_registration', 'template_node', 'group'],
@@ -50,7 +51,7 @@ export class ActivityLogsService {
5051

5152
fetchRegistrationLogs(
5253
registrationId: string,
53-
page: number = 1,
54+
page = 1,
5455
pageSize: number
5556
): Observable<PaginatedData<ActivityLogWithDisplay[]>> {
5657
const url = `${this.apiUrl}/registrations/${registrationId}/logs/`;

0 commit comments

Comments
 (0)