Skip to content

Commit ae3a148

Browse files
author
Andrea Barbasso
committed
[DSC-2256] fix lint
1 parent 9cc8f09 commit ae3a148

62 files changed

Lines changed: 358 additions & 394 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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": "ng lint",
32-
"lint-fix": "npm run build:lint && ng 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/collection-page/collection-page.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import { ThemedComcolPageHandleComponent } from '../shared/comcol/comcol-page-ha
4747
import { ComcolPageHeaderComponent } from '../shared/comcol/comcol-page-header/comcol-page-header.component';
4848
import { ComcolPageLogoComponent } from '../shared/comcol/comcol-page-logo/comcol-page-logo.component';
4949
import { ContextMenuComponent } from '../shared/context-menu/context-menu.component';
50-
import { DsoEditMenuComponent } from '../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
5150
import {
5251
hasValue,
5352
isNotEmpty,

src/app/community-page/community-page.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import { ThemedComcolPageHandleComponent } from '../shared/comcol/comcol-page-ha
3434
import { ComcolPageHeaderComponent } from '../shared/comcol/comcol-page-header/comcol-page-header.component';
3535
import { ComcolPageLogoComponent } from '../shared/comcol/comcol-page-logo/comcol-page-logo.component';
3636
import { ContextMenuComponent } from '../shared/context-menu/context-menu.component';
37-
import { DsoEditMenuComponent } from '../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
3837
import { hasValue } from '../shared/empty.util';
3938
import { ErrorComponent } from '../shared/error/error.component';
4039
import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';

src/app/core/json-patch/json-patch-operations.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
112112
map((rd: RemoteData<any>) => {
113113
if (rd.hasFailed) {
114114
this.store.dispatch(new RollbacktPatchOperationsAction(resourceType, resourceId));
115-
throw rd;
115+
throw rd as unknown as Error;
116116
} else if (hasValue(rd.payload) && isNotEmpty(rd.payload.dataDefinition)) {
117117
this.store.dispatch(new CommitPatchOperationsAction(resourceType, resourceId));
118118
return rd.payload.dataDefinition;

src/app/core/locale/locale.service.spec.ts

Lines changed: 136 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -62,173 +62,173 @@ describe('LocaleService', () => {
6262

6363
describe('with valid language', () => {
6464

65-
beforeEach(waitForAsync(() => {
66-
return TestBed.configureTestingModule({
67-
imports: [
68-
TranslateModule.forRoot({
69-
loader: {
70-
provide: TranslateLoader,
71-
useClass: TranslateLoaderMock,
72-
},
73-
}),
74-
],
75-
providers: [
76-
{ provide: CookieService, useValue: new CookieServiceMock() },
77-
{ provide: AuthService, userValue: authService },
78-
{ provide: RouteService, useValue: routeServiceStub },
79-
{ provide: TranslateService, useValue: translateServiceStub },
80-
{ provide: Document, useValue: document },
65+
beforeEach(waitForAsync(() => {
66+
return TestBed.configureTestingModule({
67+
imports: [
68+
TranslateModule.forRoot({
69+
loader: {
70+
provide: TranslateLoader,
71+
useClass: TranslateLoaderMock,
72+
},
73+
}),
74+
],
75+
providers: [
76+
{ provide: CookieService, useValue: new CookieServiceMock() },
77+
{ provide: AuthService, userValue: authService },
78+
{ provide: RouteService, useValue: routeServiceStub },
79+
{ provide: TranslateService, useValue: translateServiceStub },
80+
{ provide: Document, useValue: document },
8181
{ provide: PLATFORM_ID, useValue: platformId },
82-
],
83-
});
84-
}));
85-
86-
beforeEach(() => {
87-
cookieService = TestBed.inject(CookieService);
88-
translateService = TestBed.inject(TranslateService);
89-
routeService = TestBed.inject(RouteService);
90-
window = new NativeWindowRef();
91-
document = { documentElement: { lang: 'en' } };
82+
],
83+
});
84+
}));
85+
86+
beforeEach(() => {
87+
cookieService = TestBed.inject(CookieService);
88+
translateService = TestBed.inject(TranslateService);
89+
routeService = TestBed.inject(RouteService);
90+
window = new NativeWindowRef();
91+
document = { documentElement: { lang: 'en' } };
9292
service = new LocaleService(window, cookieService, translateService, authService, routeService, document, platformId);
93-
serviceAsAny = service;
94-
spyOnGet = spyOn(cookieService, 'get');
95-
spyOnSet = spyOn(cookieService, 'set');
93+
serviceAsAny = service;
94+
spyOnGet = spyOn(cookieService, 'get');
95+
spyOnSet = spyOn(cookieService, 'set');
9696
spyOnGetLanguage = spyOn(routeService, 'getQueryParameterValue').withArgs('lang');
97-
});
97+
});
9898

99-
describe('getCurrentLanguageCode', () => {
100-
let testScheduler: TestScheduler;
99+
describe('getCurrentLanguageCode', () => {
100+
let testScheduler: TestScheduler;
101101

102-
beforeEach(() => {
103-
spyOn(translateService, 'getLangs').and.returnValue(langList);
104-
testScheduler = new TestScheduler((actual, expected) => {
102+
beforeEach(() => {
103+
spyOn(translateService, 'getLangs').and.returnValue(langList);
104+
testScheduler = new TestScheduler((actual, expected) => {
105105
// use jasmine to test equality
106-
expect(actual).toEqual(expected);
106+
expect(actual).toEqual(expected);
107+
});
108+
authService.isAuthenticated.and.returnValue(of(false));
109+
authService.isAuthenticationLoaded.and.returnValue(of(false));
107110
});
108-
authService.isAuthenticated.and.returnValue(of(false));
109-
authService.isAuthenticationLoaded.and.returnValue(of(false));
110-
});
111111

112-
it('should return the language saved on cookie if it\'s a valid & active language', () => {
113-
spyOnGet.and.returnValue('de');
114-
testScheduler.run(({ expectObservable }) => {
115-
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'de' });
112+
it('should return the language saved on cookie if it\'s a valid & active language', () => {
113+
spyOnGet.and.returnValue('de');
114+
testScheduler.run(({ expectObservable }) => {
115+
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'de' });
116+
});
116117
});
117-
});
118118

119-
it('should return the fallback language if the cookie language is disabled', () => {
120-
spyOnGet.and.returnValue('disabled');
121-
testScheduler.run(({ expectObservable }) => {
122-
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'en' });
119+
it('should return the fallback language if the cookie language is disabled', () => {
120+
spyOnGet.and.returnValue('disabled');
121+
testScheduler.run(({ expectObservable }) => {
122+
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'en' });
123+
});
123124
});
124-
});
125125

126-
it('should return the fallback language if the cookie language does not exist', () => {
127-
spyOnGet.and.returnValue('does-not-exist');
128-
testScheduler.run(({ expectObservable }) => {
129-
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'en' });
126+
it('should return the fallback language if the cookie language does not exist', () => {
127+
spyOnGet.and.returnValue('does-not-exist');
128+
testScheduler.run(({ expectObservable }) => {
129+
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'en' });
130+
});
130131
});
131-
});
132132

133-
it('should return language from browser setting', () => {
134-
spyOn(service, 'getLanguageCodeList').and.returnValue(of(['xx', 'en']));
135-
testScheduler.run(({ expectObservable }) => {
136-
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'xx' });
133+
it('should return language from browser setting', () => {
134+
spyOn(service, 'getLanguageCodeList').and.returnValue(of(['xx', 'en']));
135+
testScheduler.run(({ expectObservable }) => {
136+
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'xx' });
137+
});
137138
});
138-
});
139139

140-
it('should match language from browser setting case insensitive', () => {
141-
spyOn(service, 'getLanguageCodeList').and.returnValue(of(['DE', 'en']));
142-
testScheduler.run(({ expectObservable }) => {
143-
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'DE' });
140+
it('should match language from browser setting case insensitive', () => {
141+
spyOn(service, 'getLanguageCodeList').and.returnValue(of(['DE', 'en']));
142+
testScheduler.run(({ expectObservable }) => {
143+
expectObservable(service.getCurrentLanguageCode()).toBe('(a|)', { a: 'DE' });
144+
});
144145
});
145146
});
146-
});
147147

148-
describe('getLanguageCodeList', () => {
149-
let testScheduler: TestScheduler;
148+
describe('getLanguageCodeList', () => {
149+
let testScheduler: TestScheduler;
150150

151-
beforeEach(() => {
152-
spyOn(translateService, 'getLangs').and.returnValue(langList);
153-
testScheduler = new TestScheduler((actual, expected) => {
151+
beforeEach(() => {
152+
spyOn(translateService, 'getLangs').and.returnValue(langList);
153+
testScheduler = new TestScheduler((actual, expected) => {
154154
// use jasmine to test equality
155-
expect(actual).toEqual(expected);
155+
expect(actual).toEqual(expected);
156+
});
156157
});
157-
});
158158

159-
it('should return default language list without user preferred language when no logged in user', () => {
160-
authService.isAuthenticated.and.returnValue(of(false));
161-
authService.isAuthenticationLoaded.and.returnValue(of(false));
162-
testScheduler.run(({ expectObservable }) => {
163-
expectObservable(service.getLanguageCodeList()).toBe('(a|)', { a: ['en-US;q=1', 'en;q=0.9'] });
159+
it('should return default language list without user preferred language when no logged in user', () => {
160+
authService.isAuthenticated.and.returnValue(of(false));
161+
authService.isAuthenticationLoaded.and.returnValue(of(false));
162+
testScheduler.run(({ expectObservable }) => {
163+
expectObservable(service.getLanguageCodeList()).toBe('(a|)', { a: ['en-US;q=1', 'en;q=0.9'] });
164+
});
164165
});
165-
});
166166

167-
it('should return default language list with user preferred language when user is logged in', () => {
168-
authService.isAuthenticated.and.returnValue(of(true));
169-
authService.isAuthenticationLoaded.and.returnValue(of(true));
170-
authService.getAuthenticatedUserFromStore.and.returnValue(of(EPersonMock2));
171-
testScheduler.run(({ expectObservable }) => {
172-
expectObservable(service.getLanguageCodeList()).toBe('(a|)', { a: ['fr;q=0.5', 'en-US;q=1', 'en;q=0.9'] });
167+
it('should return default language list with user preferred language when user is logged in', () => {
168+
authService.isAuthenticated.and.returnValue(of(true));
169+
authService.isAuthenticationLoaded.and.returnValue(of(true));
170+
authService.getAuthenticatedUserFromStore.and.returnValue(of(EPersonMock2));
171+
testScheduler.run(({ expectObservable }) => {
172+
expectObservable(service.getLanguageCodeList()).toBe('(a|)', { a: ['fr;q=0.5', 'en-US;q=1', 'en;q=0.9'] });
173+
});
173174
});
174-
});
175175

176-
describe('', () => {
177-
beforeEach(() => {
178-
spyOn(translateService, 'getLangs').and.returnValue(langList);
179-
});
176+
describe('', () => {
177+
beforeEach(() => {
178+
spyOn(translateService, 'getLangs').and.returnValue(langList);
179+
});
180180

181-
it('should return language from browser setting', () => {
182-
spyOn(translateService, 'getBrowserLang').and.returnValue('xx');
183-
expect(service.getCurrentLanguageCode()).toBe(of('xx'));
184-
});
181+
it('should return language from browser setting', () => {
182+
spyOn(translateService, 'getBrowserLang').and.returnValue('xx');
183+
expect(service.getCurrentLanguageCode()).toBe(of('xx'));
184+
});
185185

186-
it('should return default language from config', () => {
187-
spyOn(translateService, 'getBrowserLang').and.returnValue('fr');
188-
expect(service.getCurrentLanguageCode()).toBe(of('en'));
186+
it('should return default language from config', () => {
187+
spyOn(translateService, 'getBrowserLang').and.returnValue('fr');
188+
expect(service.getCurrentLanguageCode()).toBe(of('en'));
189+
});
189190
});
190191
});
191-
});
192-
193-
describe('getLanguageCodeFromCookie', () => {
194-
it('should return language from cookie', () => {
195-
spyOnGet.and.returnValue('de');
196-
expect(service.getLanguageCodeFromCookie()).toBe('de');
197-
});
198192

199-
});
193+
describe('getLanguageCodeFromCookie', () => {
194+
it('should return language from cookie', () => {
195+
spyOnGet.and.returnValue('de');
196+
expect(service.getLanguageCodeFromCookie()).toBe('de');
197+
});
200198

201-
describe('saveLanguageCodeToCookie', () => {
202-
it('should save language to cookie', () => {
203-
service.saveLanguageCodeToCookie('en');
204-
expect(spyOnSet).toHaveBeenCalledWith(LANG_COOKIE, 'en');
205199
});
206-
});
207200

208-
describe('setCurrentLanguageCode', () => {
209-
beforeEach(() => {
210-
spyOn(service, 'saveLanguageCodeToCookie');
211-
spyOn(translateService, 'use');
201+
describe('saveLanguageCodeToCookie', () => {
202+
it('should save language to cookie', () => {
203+
service.saveLanguageCodeToCookie('en');
204+
expect(spyOnSet).toHaveBeenCalledWith(LANG_COOKIE, 'en');
205+
});
212206
});
213207

214-
it('should set the given language', () => {
208+
describe('setCurrentLanguageCode', () => {
209+
beforeEach(() => {
210+
spyOn(service, 'saveLanguageCodeToCookie');
211+
spyOn(translateService, 'use');
212+
});
213+
214+
it('should set the given language', () => {
215215
service.setCurrentLanguageCode('it');
216216
expect(translateService.use).toHaveBeenCalledWith('it');
217217
expect(service.saveLanguageCodeToCookie).toHaveBeenCalledWith('it');
218-
});
218+
});
219219

220-
it('should set the current language', () => {
221-
spyOn(service, 'getCurrentLanguageCode').and.returnValue(of('es'));
222-
service.setCurrentLanguageCode();
223-
expect(translateService.use).toHaveBeenCalledWith('es');
220+
it('should set the current language', () => {
221+
spyOn(service, 'getCurrentLanguageCode').and.returnValue(of('es'));
222+
service.setCurrentLanguageCode();
223+
expect(translateService.use).toHaveBeenCalledWith('es');
224224
expect(service.saveLanguageCodeToCookie).toHaveBeenCalledWith('es');
225-
});
225+
});
226226

227-
it('should set the current language on the html tag', () => {
228-
spyOn(service, 'getCurrentLanguageCode').and.returnValue(of('es'));
229-
service.setCurrentLanguageCode();
230-
expect((service as any).document.documentElement.lang).toEqual('es');
231-
});
227+
it('should set the current language on the html tag', () => {
228+
spyOn(service, 'getCurrentLanguageCode').and.returnValue(of('es'));
229+
service.setCurrentLanguageCode();
230+
expect((service as any).document.documentElement.lang).toEqual('es');
231+
});
232232

233233
describe('should set language on init', () => {
234234
beforeEach(() => {
@@ -254,21 +254,21 @@ describe('LocaleService', () => {
254254
});
255255
});
256256
});
257-
});
257+
});
258258

259-
describe('', () => {
260-
it('should set quality to current language list', () => {
259+
describe('', () => {
260+
it('should set quality to current language list', () => {
261261
const langListWithQuality = ['en;q=1', 'it;q=0.9', 'de;q=0.8'];
262-
spyOn(service, 'setQuality').and.returnValue(langListWithQuality);
263-
service.setQuality(langList, LANG_ORIGIN.BROWSER, false);
264-
expect(service.setQuality).toHaveBeenCalledWith(langList, LANG_ORIGIN.BROWSER, false);
265-
});
262+
spyOn(service, 'setQuality').and.returnValue(langListWithQuality);
263+
service.setQuality(langList, LANG_ORIGIN.BROWSER, false);
264+
expect(service.setQuality).toHaveBeenCalledWith(langList, LANG_ORIGIN.BROWSER, false);
265+
});
266266

267-
it('should return the list of language with quality factor', () => {
268-
spyOn(service, 'getLanguageCodeList');
269-
service.getLanguageCodeList();
270-
expect(service.getLanguageCodeList).toHaveBeenCalled();
267+
it('should return the list of language with quality factor', () => {
268+
spyOn(service, 'getLanguageCodeList');
269+
service.getLanguageCodeList();
270+
expect(service.getLanguageCodeList).toHaveBeenCalled();
271+
});
271272
});
272273
});
273274
});
274-
});

src/app/core/metadata/head-tag.service.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,11 @@ export class HeadTagService {
783783
if (content) {
784784
const tag = isProperty ? { name, property: name, content } as MetaDefinition
785785
: { name, content } as MetaDefinition;
786-
isMultiple ? this.meta.addTag(tag) : this.meta.updateTag(tag);
787-
this.storeTag(name);
786+
if (isMultiple) {
787+
this.meta.addTag(tag);
788+
} else {
789+
this.meta.updateTag(tag);
790+
} this.storeTag(name);
788791
}
789792
}
790793

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/cc-license-large/cc-license-large.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ import { MetadataGroupComponent } from '../metadataGroup/metadata-group.componen
1212

1313
@Component({
1414
selector: 'ds-cc-license-large',
15-
imports: [ItemPageCcLicenseFieldComponent],
15+
imports: [
16+
ItemPageCcLicenseFieldComponent,
17+
],
1618
templateUrl: './cc-license-large.component.html',
1719
styleUrl: './cc-license-large.component.scss',
1820
})

0 commit comments

Comments
 (0)