Skip to content

Commit 4b551b2

Browse files
committed
Fix all lint errors across datashare, info, themes, submission
1 parent 3620236 commit 4b551b2

33 files changed

Lines changed: 176 additions & 126 deletions

src/app/info/about/about.component.spec.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2-
import { AboutComponent } from './about.component';
3-
import { TranslateModule } from '@ngx-translate/core';
41
import { NO_ERRORS_SCHEMA } from '@angular/core';
2+
import {
3+
ComponentFixture,
4+
TestBed,
5+
waitForAsync,
6+
} from '@angular/core/testing';
7+
import { TranslateModule } from '@ngx-translate/core';
8+
9+
import { AboutComponent } from './about.component';
510

611
describe('AboutComponent', () => {
712
let component: AboutComponent;
@@ -11,7 +16,7 @@ describe('AboutComponent', () => {
1116
TestBed.configureTestingModule({
1217
imports: [TranslateModule.forRoot()],
1318
declarations: [AboutComponent],
14-
schemas: [NO_ERRORS_SCHEMA]
19+
schemas: [NO_ERRORS_SCHEMA],
1520
}).compileComponents();
1621
}));
1722

src/app/info/about/about.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component } from '@angular/core';
22

33
@Component({
4-
selector: 'ds-about',
4+
selector: 'ds-base-about',
55
templateUrl: './about.component.html',
66
styleUrls: ['./about.component.scss'],
77
standalone: true,

src/app/info/about/themed-about.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import { Component } from '@angular/core';
2+
23
import { ThemedComponent } from '../../shared/theme-support/themed.component';
34
import { AboutComponent } from './about.component';
45

56
/**
67
* Themed wrapper for Component
78
*/
89
@Component({
9-
selector: 'ds-themed-about',
10+
selector: 'ds-about',
1011
styleUrls: [],
1112
templateUrl: '../../shared/theme-support/themed.component.html',
1213
standalone: true,
13-
imports: [AboutComponent]
14+
imports: [AboutComponent],
1415
})
1516
export class ThemedAboutComponent extends ThemedComponent<AboutComponent> {
1617
protected getComponentName(): string {

src/app/info/accessibility-statement/accessibility-statement.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component } from '@angular/core';
22

33
@Component({
4-
selector: 'ds-accessibility-statement',
4+
selector: 'ds-base-accessibility-statement',
55
templateUrl: './accessibility-statement.component.html',
66
styleUrls: ['./accessibility-statement.component.scss'],
77
standalone: true,

src/app/info/copyright/copyright.component.spec.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2-
import { CopyrightComponent } from './copyright.component';
3-
import { TranslateModule } from '@ngx-translate/core';
41
import { NO_ERRORS_SCHEMA } from '@angular/core';
2+
import {
3+
ComponentFixture,
4+
TestBed,
5+
waitForAsync,
6+
} from '@angular/core/testing';
7+
import { TranslateModule } from '@ngx-translate/core';
8+
9+
import { CopyrightComponent } from './copyright.component';
510

611
describe('CopyrightComponent', () => {
712
let component: CopyrightComponent;
@@ -11,7 +16,7 @@ describe('CopyrightComponent', () => {
1116
TestBed.configureTestingModule({
1217
imports: [TranslateModule.forRoot()],
1318
declarations: [CopyrightComponent],
14-
schemas: [NO_ERRORS_SCHEMA]
19+
schemas: [NO_ERRORS_SCHEMA],
1520
}).compileComponents();
1621
}));
1722

src/app/info/copyright/copyright.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component } from '@angular/core';
22

33
@Component({
4-
selector: 'ds-copyright',
4+
selector: 'ds-base-copyright',
55
templateUrl: './copyright.component.html',
66
styleUrls: ['./copyright.component.scss'],
77
standalone: true,

src/app/info/copyright/themed-copyright.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import { Component } from '@angular/core';
2+
23
import { ThemedComponent } from '../../shared/theme-support/themed.component';
34
import { CopyrightComponent } from './copyright.component';
45

56
/**
67
* Themed wrapper for Component
78
*/
89
@Component({
9-
selector: 'ds-themed-copyright',
10+
selector: 'ds-copyright',
1011
styleUrls: [],
1112
templateUrl: '../../shared/theme-support/themed.component.html',
1213
standalone: true,
13-
imports: [CopyrightComponent]
14+
imports: [CopyrightComponent],
1415
})
1516
export class ThemedCopyrightComponent extends ThemedComponent<CopyrightComponent> {
1617
protected getComponentName(): string {

src/app/info/info-routes.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
88
import { notifyInfoGuard } from '../core/coar-notify/notify-info/notify-info.guard';
99
import { feedbackGuard } from '../core/feedback/feedback.guard';
1010
import { hasValue } from '../shared/empty.util';
11+
// CUSTOMISED
12+
import { ThemedAboutComponent } from './about/themed-about.component';
1113
import { AccessibilitySettingsComponent } from './accessibility-settings/accessibility-settings.component';
14+
import { ThemedAccessibilityStatementComponent } from './accessibility-statement/themed-accessibility-statement.component';
15+
import { ThemedCopyrightComponent } from './copyright/themed-copyright.component';
1216
import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
1317
import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
1418
import {
19+
ABOUT_PATH,
1520
ACCESSIBILITY_SETTINGS_PATH,
21+
ACCESSIBILITY_STATEMENT_PATH,
1622
COAR_NOTIFY_SUPPORT,
23+
COPYRIGHT_PATH,
1724
END_USER_AGREEMENT_PATH,
1825
FEEDBACK_PATH,
26+
ORGANISED_PATH,
1927
PRIVACY_PATH,
20-
ABOUT_PATH,
21-
ACCESSIBILITY_STATEMENT_PATH,
22-
COPYRIGHT_PATH,
23-
ORGANISED_PATH
2428
} from './info-routing-paths';
2529
import { NotifyInfoComponent } from './notify-info/notify-info.component';
26-
import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
27-
// CUSTOMISED
28-
import { ThemedAboutComponent } from './about/themed-about.component';
29-
import { ThemedAccessibilityStatementComponent } from './accessibility-statement/themed-accessibility-statement.component';
30-
import { ThemedCopyrightComponent } from './copyright/themed-copyright.component';
3130
import { ThemedOrganisedComponent } from './organised/themed-organised.component';
31+
import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
3232

3333

3434

@@ -74,25 +74,25 @@ export const ROUTES: Routes = [
7474
path: ABOUT_PATH,
7575
component: ThemedAboutComponent,
7676
resolve: { breadcrumb: i18nBreadcrumbResolver },
77-
data: { title: 'info.about.title', breadcrumbKey: 'info.about' }
77+
data: { title: 'info.about.title', breadcrumbKey: 'info.about' },
7878
},
7979
{
8080
path: ACCESSIBILITY_STATEMENT_PATH,
8181
component: ThemedAccessibilityStatementComponent,
8282
resolve: { breadcrumb: i18nBreadcrumbResolver },
83-
data: { title: 'info.accessibility-statement.title', breadcrumbKey: 'info.accessibility-statement' }
83+
data: { title: 'info.accessibility-statement.title', breadcrumbKey: 'info.accessibility-statement' },
8484
},
8585
{
8686
path: COPYRIGHT_PATH,
8787
component: ThemedCopyrightComponent,
8888
resolve: { breadcrumb: i18nBreadcrumbResolver },
89-
data: { title: 'info.copyright.title', breadcrumbKey: 'info.copyright' }
89+
data: { title: 'info.copyright.title', breadcrumbKey: 'info.copyright' },
9090
},
9191
{
9292
path: ORGANISED_PATH,
9393
component: ThemedOrganisedComponent,
9494
resolve: { breadcrumb: i18nBreadcrumbResolver },
95-
data: { title: 'info.organised.title', breadcrumbKey: 'info.organised' }
96-
}
95+
data: { title: 'info.organised.title', breadcrumbKey: 'info.organised' },
96+
},
9797

9898
].filter((route: Route) => hasValue(route));

src/app/info/organised/organised.component.spec.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2-
import { OrganisedComponent } from './organised.component';
3-
import { TranslateModule } from '@ngx-translate/core';
41
import { NO_ERRORS_SCHEMA } from '@angular/core';
2+
import {
3+
ComponentFixture,
4+
TestBed,
5+
waitForAsync,
6+
} from '@angular/core/testing';
7+
import { TranslateModule } from '@ngx-translate/core';
8+
9+
import { OrganisedComponent } from './organised.component';
510

611
describe('OrganisedComponent', () => {
712
let component: OrganisedComponent;
@@ -11,7 +16,7 @@ describe('OrganisedComponent', () => {
1116
TestBed.configureTestingModule({
1217
imports: [TranslateModule.forRoot()],
1318
declarations: [OrganisedComponent],
14-
schemas: [NO_ERRORS_SCHEMA]
19+
schemas: [NO_ERRORS_SCHEMA],
1520
}).compileComponents();
1621
}));
1722

src/app/info/organised/organised.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Component } from '@angular/core';
22

33
@Component({
4-
selector: 'ds-organised',
4+
selector: 'ds-base-organised',
55
templateUrl: './organised.component.html',
66
styleUrls: ['./organised.component.scss'],
77
standalone: true,

0 commit comments

Comments
 (0)