diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.ts b/src/Squidex/app/features/assets/pages/assets-page.component.ts index c0d266855..011381093 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.ts +++ b/src/Squidex/app/features/assets/pages/assets-page.component.ts @@ -86,7 +86,7 @@ export class AssetsPageComponent extends AppComponentBase implements OnDestroy, public onAssetDeleting(asset: AssetDto) { this.appNameOnce() .switchMap(app => this.assetsService.deleteAsset(app, asset.id, asset.version)) - .subscribe(dtos => { + .subscribe(dto => { this.assetsItems = this.assetsItems.filter(x => x.id !== asset.id); this.assetsPager = this.assetsPager.decrementCount(); }, error => { diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.ts b/src/Squidex/app/features/content/pages/content/content-page.component.ts index b24ebe0f4..cbaf60646 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-page.component.ts @@ -43,7 +43,7 @@ import { }) export class ContentPageComponent extends AppComponentBase implements CanComponentDeactivate, OnDestroy, OnInit { private contentDeletedSubscription: Subscription; - private version: Version = new Version(''); + private version = new Version(''); private cancelPromise: Subject | null = null; private content: ContentDto; diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.ts b/src/Squidex/app/features/schemas/pages/schema/field.component.ts index 58e18c3d3..3fb298628 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.ts @@ -6,7 +6,7 @@ */ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { createProperties, @@ -59,7 +59,7 @@ export class FieldComponent implements OnInit { } public editFormSubmitted = false; - public editForm: FormGroup = + public editForm = this.formBuilder.group({ label: ['', [ diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts index d44fe3e53..930af2cbc 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-edit-form.component.ts @@ -6,7 +6,7 @@ */ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { ComponentBase, @@ -41,7 +41,7 @@ export class SchemaEditFormComponent extends ComponentBase implements OnInit { public appName: string; public editFormSubmitted = false; - public editForm: FormGroup = + public editForm = this.formBuilder.group({ label: ['', [ diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts index 63ee20367..ead1c368b 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts @@ -6,7 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { @@ -55,7 +55,7 @@ export class SchemaPageComponent extends AppComponentBase implements OnInit { public editSchemaDialog = new ModalView(); public addFieldFormSubmitted = false; - public addFieldForm: FormGroup = + public addFieldForm = this.formBuilder.group({ type: ['String', [ diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts index 0a52c03e9..d4fffad12 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts +++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts @@ -6,7 +6,7 @@ */ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { ApiUrlConfig, @@ -42,7 +42,7 @@ export class SchemaFormComponent { public createFormError = ''; public createFormSubmitted = false; - public createForm: FormGroup = + public createForm = this.formBuilder.group({ name: ['', [ diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.ts b/src/Squidex/app/features/settings/pages/clients/client.component.ts index 6983d9b52..cfcd67113 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.ts +++ b/src/Squidex/app/features/settings/pages/clients/client.component.ts @@ -6,7 +6,7 @@ */ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { AccessTokenDto, @@ -49,7 +49,7 @@ export class ClientComponent extends ComponentBase { public token: AccessTokenDto; public tokenDialog = new ModalView(); - public renameForm: FormGroup = + public renameForm = this.formBuilder.group({ name: ['', Validators.required diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts b/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts index 115a1d6bf..28e1ad952 100644 --- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts +++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts @@ -6,7 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { AppClientDto, @@ -34,7 +34,7 @@ export class ClientsPageComponent extends AppComponentBase implements OnInit { public appClients: ImmutableArray; public addClientFormSubmitted = false; - public addClientForm: FormGroup = + public addClientForm = this.formBuilder.group({ name: ['', [ diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts index 12515f6ee..a763800c2 100644 --- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts +++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts @@ -6,7 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; import { @@ -73,7 +73,7 @@ export class ContributorsPageComponent extends AppComponentBase implements OnIni return this.addContributorForm.valid && (this.maxContributors <= -1 || this.appContributors.length < this.maxContributors); } - public addContributorForm: FormGroup = + public addContributorForm = this.formBuilder.group({ user: [null, [ diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.ts b/src/Squidex/app/features/settings/pages/languages/language.component.ts index 90d33a4dd..ad96317bf 100644 --- a/src/Squidex/app/features/settings/pages/languages/language.component.ts +++ b/src/Squidex/app/features/settings/pages/languages/language.component.ts @@ -6,7 +6,7 @@ */ import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { Subscription } from 'rxjs'; import { @@ -46,13 +46,13 @@ export class LanguageComponent implements OnInit, OnChanges, OnDestroy { public isMaster = false; public editFormSubmitted = false; - public editForm: FormGroup = + public editForm = this.formBuilder.group({ isMaster: [false, []], isOptional: [false, []] }); - public addLanguageForm: FormGroup = + public addLanguageForm = this.formBuilder.group({ language: [null, Validators.required diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts index e1a122ae2..c43216dce 100644 --- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts +++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts @@ -6,7 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { AddAppLanguageDto, @@ -35,7 +35,7 @@ export class LanguagesPageComponent extends AppComponentBase implements OnInit { public newLanguages: LanguageDto[] = []; public appLanguages = ImmutableArray.empty(); - public addLanguageForm: FormGroup = + public addLanguageForm = this.formBuilder.group({ language: [null, Validators.required diff --git a/src/Squidex/app/features/webhooks/pages/webhooks-page.component.ts b/src/Squidex/app/features/webhooks/pages/webhooks-page.component.ts index c3e6ef6bd..9a50bed9b 100644 --- a/src/Squidex/app/features/webhooks/pages/webhooks-page.component.ts +++ b/src/Squidex/app/features/webhooks/pages/webhooks-page.component.ts @@ -6,7 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { AppComponentBase, @@ -36,7 +36,7 @@ export class WebhooksPageComponent extends AppComponentBase implements OnInit { public schemas: SchemaDto[]; public addWebhookFormSubmitted = false; - public addWebhookForm: FormGroup = + public addWebhookForm = this.formBuilder.group({ schemaId: ['', [ diff --git a/src/Squidex/app/framework/angular/autocomplete.component.ts b/src/Squidex/app/framework/angular/autocomplete.component.ts index f4d4dbf32..3742e6fac 100644 --- a/src/Squidex/app/framework/angular/autocomplete.component.ts +++ b/src/Squidex/app/framework/angular/autocomplete.component.ts @@ -59,7 +59,7 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O if (!value) { this.resetValue(); } else { - let item = this.items.find(i => i === value); + const item = this.items.find(i => i === value); if (item) { this.queryInput.setValue(value.title || ''); @@ -103,7 +103,7 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O } }) .filter(query => !!query && !!this.source) - .switchMap(query => this.source.find(query)).catch(_ => Observable.of([])) + .switchMap(query => this.source.find(query)).catch(error => Observable.of([])) .subscribe(items => { this.reset(); this.items = items || []; @@ -129,6 +129,8 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O } break; } + + return true; } public blur() { diff --git a/src/Squidex/app/framework/angular/control-errors.component.ts b/src/Squidex/app/framework/angular/control-errors.component.ts index a32cbca88..d1f4b0fbf 100644 --- a/src/Squidex/app/framework/angular/control-errors.component.ts +++ b/src/Squidex/app/framework/angular/control-errors.component.ts @@ -61,17 +61,17 @@ export class ControlErrorsComponent implements OnChanges { for (let key in this.control.errors) { if (this.control.errors.hasOwnProperty(key)) { - let message: string = (this.errors ? this.errors[key] : null) || DEFAULT_ERRORS[key]; + let message = (this.errors ? this.errors[key] : null) || DEFAULT_ERRORS[key]; if (!message) { continue; } - let properties = this.control.errors[key]; + const properties = this.control.errors[key]; for (let property in properties) { if (properties.hasOwnProperty(property)) { - message = message.replace('{' + property + '}', properties[property]); + message = message.replace(`{${property}}`, properties[property]); } } diff --git a/src/Squidex/app/framework/angular/date-time-editor.component.ts b/src/Squidex/app/framework/angular/date-time-editor.component.ts index 081c94ee4..8168326f2 100644 --- a/src/Squidex/app/framework/angular/date-time-editor.component.ts +++ b/src/Squidex/app/framework/angular/date-time-editor.component.ts @@ -166,7 +166,7 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, } private updateValue() { - let result: string | null = null; + let result: string | null; if ((this.dateValue && !this.dateValue.isValid()) || (this.timeValue && !this.timeValue.isValid())) { result = 'Invalid DateTime'; diff --git a/src/Squidex/app/framework/angular/dropdown.component.ts b/src/Squidex/app/framework/angular/dropdown.component.ts index b0cf58322..a4ec504a5 100644 --- a/src/Squidex/app/framework/angular/dropdown.component.ts +++ b/src/Squidex/app/framework/angular/dropdown.component.ts @@ -89,6 +89,8 @@ export class DropdownComponent implements AfterContentInit, ControlValueAccessor this.close(); return false; } + + return true; } public open() { diff --git a/src/Squidex/app/framework/angular/focus-on-init.directive.spec.ts b/src/Squidex/app/framework/angular/focus-on-init.directive.spec.ts index 6e0724110..50efd6f96 100644 --- a/src/Squidex/app/framework/angular/focus-on-init.directive.spec.ts +++ b/src/Squidex/app/framework/angular/focus-on-init.directive.spec.ts @@ -15,7 +15,7 @@ describe('FocusOnInitDirective', () => { const calledElements: any[] = []; const renderer = { - invokeElementMethod: (elem: any, method: any, args: any) => { + invokeElementMethod: (elem: any, method: any) => { calledElements.push(elem); calledMethods.push(method); } diff --git a/src/Squidex/app/framework/angular/geolocation-editor.component.ts b/src/Squidex/app/framework/angular/geolocation-editor.component.ts index 76e803261..00001813a 100644 --- a/src/Squidex/app/framework/angular/geolocation-editor.component.ts +++ b/src/Squidex/app/framework/angular/geolocation-editor.component.ts @@ -169,7 +169,7 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi this.value = { latitude: latlng.lat, longitude: latlng.lng }; }); - this.marker.on('dragend', (event: any) => { + this.marker.on('dragend', () => { this.updateMarker(false, true); }); diff --git a/src/Squidex/app/framework/angular/http-extensions-impl.ts b/src/Squidex/app/framework/angular/http-extensions-impl.ts index 800138dee..82314edf2 100644 --- a/src/Squidex/app/framework/angular/http-extensions-impl.ts +++ b/src/Squidex/app/framework/angular/http-extensions-impl.ts @@ -13,7 +13,7 @@ import { Version } from './../utils/version'; export class ErrorDto { public get displayMessage(): string { let result = this.message; - let lastChar = ''; + let lastChar: string; if (this.details && this.details.length > 0) { const detailMessage = this.details[0]; @@ -103,7 +103,7 @@ export function pretifyError(message: string): Observable { result = new ErrorDto(response.status, response.error.message, response.error.details); } } catch (e) { - result = result; + /* Ignore */ } } diff --git a/src/Squidex/app/framework/angular/name.pipe.ts b/src/Squidex/app/framework/angular/name.pipe.ts index d4a2bbe95..0f06e5b35 100644 --- a/src/Squidex/app/framework/angular/name.pipe.ts +++ b/src/Squidex/app/framework/angular/name.pipe.ts @@ -29,12 +29,12 @@ export class DisplayNamePipe implements PipeTransform { const parts = s.split('.'); for (let i = 0, n = parts.length; i < n; ++i) { - let k = parts[i]; + const k = parts[i]; if (k in o) { o = o[k]; } else { - return; + return undefined; } } diff --git a/src/Squidex/app/framework/angular/root-view.directive.spec.ts b/src/Squidex/app/framework/angular/root-view.directive.spec.ts index 1169d1f5b..7ea8d8548 100644 --- a/src/Squidex/app/framework/angular/root-view.directive.spec.ts +++ b/src/Squidex/app/framework/angular/root-view.directive.spec.ts @@ -12,7 +12,7 @@ import { RootViewDirective } from './../'; describe('RootViewDirective', () => { it('should call init of service in ctor', () => { let viewRef = {}; - let viewRefPassed = null; + let viewRefPassed: any = null; const service = { init: (ref: any) => { diff --git a/src/Squidex/app/framework/angular/router-utils.ts b/src/Squidex/app/framework/angular/router-utils.ts index 97034de9e..82fb59638 100644 --- a/src/Squidex/app/framework/angular/router-utils.ts +++ b/src/Squidex/app/framework/angular/router-utils.ts @@ -10,7 +10,7 @@ import { ActivatedRoute, ActivatedRouteSnapshot, Data, Params } from '@angular/r export function allData(value: ActivatedRouteSnapshot | ActivatedRoute): Data { let snapshot: ActivatedRouteSnapshot = value['snapshot'] || value; - let result: { [key: string]: any } = { }; + const result: { [key: string]: any } = { }; while (snapshot) { for (let key in snapshot.data) { @@ -27,7 +27,7 @@ export function allData(value: ActivatedRouteSnapshot | ActivatedRoute): Data { export function allParams(value: ActivatedRouteSnapshot | ActivatedRoute): Params { let snapshot: ActivatedRouteSnapshot = value['snapshot'] || value; - let result: { [key: string]: any } = { }; + const result: { [key: string]: any } = { }; while (snapshot) { for (let key in snapshot.params) { diff --git a/src/Squidex/app/framework/angular/slider.component.ts b/src/Squidex/app/framework/angular/slider.component.ts index a893e0e84..f429e385f 100644 --- a/src/Squidex/app/framework/angular/slider.component.ts +++ b/src/Squidex/app/framework/angular/slider.component.ts @@ -95,7 +95,7 @@ export class SliderComponent implements ControlValueAccessor { }); this.mouseUpSubscription = - this.renderer.listenGlobal('window', 'mouseup', (e: MouseEvent) => { + this.renderer.listenGlobal('window', 'mouseup', () => { this.onMouseUp(); }); diff --git a/src/Squidex/app/framework/angular/stars.component.ts b/src/Squidex/app/framework/angular/stars.component.ts index a6ba25a86..9b751b494 100644 --- a/src/Squidex/app/framework/angular/stars.component.ts +++ b/src/Squidex/app/framework/angular/stars.component.ts @@ -89,7 +89,7 @@ export class StarsComponent implements ControlValueAccessor { public reset() { if (this.isDisabled) { - return; + return false; } if (this.value !== null) { @@ -105,7 +105,7 @@ export class StarsComponent implements ControlValueAccessor { public setValue(value: number) { if (this.isDisabled) { - return; + return false; } if (this.value !== value) { diff --git a/src/Squidex/app/framework/angular/tag-editor.component.ts b/src/Squidex/app/framework/angular/tag-editor.component.ts index deeef8af1..45efc61fd 100644 --- a/src/Squidex/app/framework/angular/tag-editor.component.ts +++ b/src/Squidex/app/framework/angular/tag-editor.component.ts @@ -120,6 +120,8 @@ export class TagEditorComponent implements ControlValueAccessor { return false; } } + + return true; } private updateItems(items: string[]) { diff --git a/src/Squidex/app/framework/services/root-view.service.spec.ts b/src/Squidex/app/framework/services/root-view.service.spec.ts index 269bc274a..d1da6a19b 100644 --- a/src/Squidex/app/framework/services/root-view.service.spec.ts +++ b/src/Squidex/app/framework/services/root-view.service.spec.ts @@ -26,7 +26,7 @@ describe('RootViewService', () => { }); it('should call view when creating element', () => { - let view = {}; + const view = {}; const viewRef = { createEmbeddedView: () => { diff --git a/src/Squidex/app/framework/services/shortcut.service.spec.ts b/src/Squidex/app/framework/services/shortcut.service.spec.ts index 8192fa101..94abe8eb0 100644 --- a/src/Squidex/app/framework/services/shortcut.service.spec.ts +++ b/src/Squidex/app/framework/services/shortcut.service.spec.ts @@ -25,7 +25,7 @@ describe('ShortcutService', () => { let isTriggered = false; - shortcutService.on('ctrl+a', e => { isTriggered = true; }); + shortcutService.on('ctrl+a', () => { isTriggered = true; }); shortcutService.trigger('ctrl+a'); expect(isTriggered).toBeTruthy(); @@ -36,7 +36,7 @@ describe('ShortcutService', () => { let isTriggered = false; - shortcutService.on('ctrl+a', e => { isTriggered = true; }); + shortcutService.on('ctrl+a', () => { isTriggered = true; }); shortcutService.off('ctrl+a'); shortcutService.trigger('ctrl+a'); diff --git a/src/Squidex/app/framework/utils/pager.ts b/src/Squidex/app/framework/utils/pager.ts index 908680a24..f3e6cc4d8 100644 --- a/src/Squidex/app/framework/utils/pager.ts +++ b/src/Squidex/app/framework/utils/pager.ts @@ -21,8 +21,8 @@ export class Pager { ) { const totalPages = Math.ceil(numberOfItems / this.pageSize); - if (page >= totalPages && page > 0) { - page = this.page = totalPages - 1; + if (this.page >= totalPages && this.page > 0) { + this.page = this.page = totalPages - 1; } this.itemFirst = numberOfItems === 0 ? 0 : page * this.pageSize + 1; diff --git a/src/Squidex/app/shared/components/app-form.component.ts b/src/Squidex/app/shared/components/app-form.component.ts index 5123d4e4b..d75af7e42 100644 --- a/src/Squidex/app/shared/components/app-form.component.ts +++ b/src/Squidex/app/shared/components/app-form.component.ts @@ -6,7 +6,7 @@ */ import { Component, EventEmitter, Output } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { ApiUrlConfig, ValidatorsEx } from 'framework'; @@ -32,7 +32,7 @@ export class AppFormComponent { public createFormError? = ''; public createFormSubmitted = false; - public createForm: FormGroup = + public createForm = this.formBuilder.group({ name: ['', [ diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts index 940ecb40b..babbd20cd 100644 --- a/src/Squidex/app/shared/components/asset.component.ts +++ b/src/Squidex/app/shared/components/asset.component.ts @@ -6,7 +6,7 @@ */ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { FormBuilder, Validators } from '@angular/forms'; import { AppComponentBase } from './app.component-base'; @@ -60,7 +60,7 @@ export class AssetComponent extends AppComponentBase implements OnInit { public renameDialog = new ModalView(); public renameFormSubmitted = false; - public renameForm: FormGroup = + public renameForm = this.formBuilder.group({ name: ['', [ diff --git a/src/Squidex/app/shared/components/history.component.ts b/src/Squidex/app/shared/components/history.component.ts index 787952856..0d7d7ef05 100644 --- a/src/Squidex/app/shared/components/history.component.ts +++ b/src/Squidex/app/shared/components/history.component.ts @@ -34,13 +34,13 @@ export class HistoryComponent extends AppComponentBase { let channelPath = this.route.snapshot.data['channel']; if (channelPath) { - let params = allParams(this.route); + const params = allParams(this.route); for (let key in params) { if (params.hasOwnProperty(key)) { const value = params[key]; - channelPath = channelPath.replace('{' + key + '}', value); + channelPath = channelPath.replace(`{${key}}`, value); } } } diff --git a/src/Squidex/app/shared/components/pipes.ts b/src/Squidex/app/shared/components/pipes.ts index 524872134..fc97fe540 100644 --- a/src/Squidex/app/shared/components/pipes.ts +++ b/src/Squidex/app/shared/components/pipes.ts @@ -220,7 +220,7 @@ export class AssetPreviewUrlPipe implements PipeTransform { } public transform(asset: { id: any, version: Version }): string { - return this.apiUrl.buildUrl(`api/assets/${asset.id}?version=${asset.version.value}`) + return this.apiUrl.buildUrl(`api/assets/${asset.id}?version=${asset.version.value}`); } } @@ -241,13 +241,13 @@ export class FileIconPipe implements PipeTransform { 'xlsx' ]; - let mimeIcon = ''; + let mimeIcon: string; let mimeParts = asset.mimeType.split('/'); if (mimeParts.length === 2 && mimeParts[0].toLowerCase() === 'video') { mimeIcon = 'video'; } else { - mimeIcon = knownTypes.indexOf(asset.fileType) >= 0 ? asset.fileType : 'generic' + mimeIcon = knownTypes.indexOf(asset.fileType) >= 0 ? asset.fileType : 'generic'; } return `/images/asset_${mimeIcon}.png`; diff --git a/src/Squidex/app/shared/services/app-clients.service.spec.ts b/src/Squidex/app/shared/services/app-clients.service.spec.ts index e8a3f0805..e6c1e5f9f 100644 --- a/src/Squidex/app/shared/services/app-clients.service.spec.ts +++ b/src/Squidex/app/shared/services/app-clients.service.spec.ts @@ -35,7 +35,7 @@ describe('AppClientDto', () => { }); describe('AppClientsService', () => { - let version = new Version('1'); + const version = new Version('1'); beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/Squidex/app/shared/services/app-contributors.service.spec.ts b/src/Squidex/app/shared/services/app-contributors.service.spec.ts index b1f617dc4..0529ee3a1 100644 --- a/src/Squidex/app/shared/services/app-contributors.service.spec.ts +++ b/src/Squidex/app/shared/services/app-contributors.service.spec.ts @@ -26,7 +26,7 @@ describe('AppContributorDto', () => { }); describe('AppContributorsService', () => { - let version = new Version('1'); + const version = new Version('1'); beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/Squidex/app/shared/services/app-languages.service.spec.ts b/src/Squidex/app/shared/services/app-languages.service.spec.ts index 68059cc8d..2d66de6f5 100644 --- a/src/Squidex/app/shared/services/app-languages.service.spec.ts +++ b/src/Squidex/app/shared/services/app-languages.service.spec.ts @@ -30,7 +30,7 @@ describe('AppLanguageDto', () => { }); describe('AppLanguagesService', () => { - let version = new Version('1'); + const version = new Version('1'); beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/Squidex/app/shared/services/apps-store.service.spec.ts b/src/Squidex/app/shared/services/apps-store.service.spec.ts index 1f89a72ec..b90f80a0c 100644 --- a/src/Squidex/app/shared/services/apps-store.service.spec.ts +++ b/src/Squidex/app/shared/services/apps-store.service.spec.ts @@ -70,7 +70,7 @@ describe('AppsStoreService', () => { result1 = x; }).unsubscribe(); - store.createApp(new CreateAppDto('new-name'), now).subscribe(x => { /* Do Nothing */ }); + store.createApp(new CreateAppDto('new-name'), now).subscribe(() => { /* Do Nothing */ }); store.apps.subscribe(x => { result2 = x; diff --git a/src/Squidex/app/shared/services/assets.service.spec.ts b/src/Squidex/app/shared/services/assets.service.spec.ts index 5f224bebd..f1d721d10 100644 --- a/src/Squidex/app/shared/services/assets.service.spec.ts +++ b/src/Squidex/app/shared/services/assets.service.spec.ts @@ -51,9 +51,9 @@ describe('AssetDto', () => { }); describe('AssetsService', () => { - let now = DateTime.now(); - let user = 'me'; - let version = new Version('1'); + const now = DateTime.now(); + const user = 'me'; + const version = new Version('1'); beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/Squidex/app/shared/services/assets.service.ts b/src/Squidex/app/shared/services/assets.service.ts index 325c6b981..a11fb7e8f 100644 --- a/src/Squidex/app/shared/services/assets.service.ts +++ b/src/Squidex/app/shared/services/assets.service.ts @@ -56,7 +56,7 @@ export class AssetDto { update.isImage, update.pixelWidth, update.pixelHeight, - update.version) + update.version); } public rename(name: string, user: string, now?: DateTime): AssetDto { @@ -105,7 +105,7 @@ export class AssetsService { } public getAssets(appName: string, take: number, skip: number, query?: string, mimeTypes?: string[], ids?: string[]): Observable { - let queries: string[] = []; + const queries: string[] = []; if (mimeTypes && mimeTypes.length > 0) { queries.push(`mimeTypes=${mimeTypes.join(',')}`); diff --git a/src/Squidex/app/shared/services/contents.service.spec.ts b/src/Squidex/app/shared/services/contents.service.spec.ts index 8e875f384..973a2d19f 100644 --- a/src/Squidex/app/shared/services/contents.service.spec.ts +++ b/src/Squidex/app/shared/services/contents.service.spec.ts @@ -53,7 +53,7 @@ describe('ContentDto', () => { }); describe('ContentsService', () => { - let version = new Version('1'); + const version = new Version('1'); beforeEach(() => { TestBed.configureTestingModule({ @@ -129,7 +129,7 @@ describe('ContentsService', () => { it('should append query to get request as search', inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { - let contents: ContentsDto | null = null; + let contents: ContentsDto | null; contentsService.getContents('my-app', 'my-schema', 17, 13, 'my-query').subscribe(result => { contents = result; @@ -146,7 +146,7 @@ describe('ContentsService', () => { it('should append ids to get request with ids', inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { - let contents: ContentsDto | null = null; + let contents: ContentsDto | null; contentsService.getContents('my-app', 'my-schema', 17, 13, null, ['id1', 'id2']).subscribe(result => { contents = result; @@ -163,7 +163,7 @@ describe('ContentsService', () => { it('should append query to get request as plain query string', inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { - let contents: ContentsDto | null = null; + let contents: ContentsDto | null; contentsService.getContents('my-app', 'my-schema', 17, 13, '$filter=my-filter').subscribe(result => { contents = result; diff --git a/src/Squidex/app/shared/services/graphql.service.spec.ts b/src/Squidex/app/shared/services/graphql.service.spec.ts index 7a5300a97..f702d2a3b 100644 --- a/src/Squidex/app/shared/services/graphql.service.spec.ts +++ b/src/Squidex/app/shared/services/graphql.service.spec.ts @@ -30,7 +30,7 @@ describe('GraphQlService', () => { it('should make get request to get history events', inject([GraphQlService, HttpTestingController], (graphQlService: GraphQlService, httpMock: HttpTestingController) => { - let graphQlResult = null; + let graphQlResult: any = null; graphQlService.query('my-app', { }).subscribe(result => { graphQlResult = result; diff --git a/src/Squidex/app/shared/services/graphql.service.ts b/src/Squidex/app/shared/services/graphql.service.ts index bfc1dcd39..7f1e0a23d 100644 --- a/src/Squidex/app/shared/services/graphql.service.ts +++ b/src/Squidex/app/shared/services/graphql.service.ts @@ -20,7 +20,7 @@ export class GraphQlService { } public query(appName: string, params: any): Observable { - const url = this.apiUrl.buildUrl(`api/content/${appName}/graphql`) + const url = this.apiUrl.buildUrl(`api/content/${appName}/graphql`); return this.http.post(url, params); } diff --git a/src/Squidex/app/shared/services/help.service.ts b/src/Squidex/app/shared/services/help.service.ts index 8f94ef66b..a5baba89a 100644 --- a/src/Squidex/app/shared/services/help.service.ts +++ b/src/Squidex/app/shared/services/help.service.ts @@ -31,6 +31,6 @@ export class HelpService { return result; }) - .catch(err => Observable.of([])); + .catch(error => Observable.of([])); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/plans.service.spec.ts b/src/Squidex/app/shared/services/plans.service.spec.ts index afd369e26..536b1ec7a 100644 --- a/src/Squidex/app/shared/services/plans.service.spec.ts +++ b/src/Squidex/app/shared/services/plans.service.spec.ts @@ -18,7 +18,7 @@ import { } from './../'; describe('PlansService', () => { - let version = new Version('1'); + const version = new Version('1'); beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/Squidex/app/shared/services/schemas.service.spec.ts b/src/Squidex/app/shared/services/schemas.service.spec.ts index b3f1f7efa..85c082efa 100644 --- a/src/Squidex/app/shared/services/schemas.service.spec.ts +++ b/src/Squidex/app/shared/services/schemas.service.spec.ts @@ -160,9 +160,9 @@ describe('SchemaDetailsDto', () => { }); describe('SchemasService', () => { - let now = DateTime.now(); - let user = 'me'; - let version = new Version('1'); + const now = DateTime.now(); + const user = 'me'; + const version = new Version('1'); beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/Squidex/app/shared/services/users-provider.service.ts b/src/Squidex/app/shared/services/users-provider.service.ts index 986931073..166221e27 100644 --- a/src/Squidex/app/shared/services/users-provider.service.ts +++ b/src/Squidex/app/shared/services/users-provider.service.ts @@ -28,7 +28,7 @@ export class UsersProviderService { if (!result) { const request = this.usersService.getUser(id).retry(2) - .catch(err => { + .catch(error => { return Observable.of(new UserDto('NOT FOUND', 'NOT FOUND', 'NOT FOUND', null, false)); }) .publishLast(); diff --git a/src/Squidex/app/shared/services/webhooks.service.spec.ts b/src/Squidex/app/shared/services/webhooks.service.spec.ts index a1ddb7b95..41a6fd4be 100644 --- a/src/Squidex/app/shared/services/webhooks.service.spec.ts +++ b/src/Squidex/app/shared/services/webhooks.service.spec.ts @@ -17,7 +17,7 @@ import { } from './../'; describe('WebhooksService', () => { - let version = new Version('1'); + const version = new Version('1'); beforeEach(() => { TestBed.configureTestingModule({ diff --git a/src/Squidex/app/shell/pages/home/home-page.component.ts b/src/Squidex/app/shell/pages/home/home-page.component.ts index 3c61e4837..6bd9813c6 100644 --- a/src/Squidex/app/shell/pages/home/home-page.component.ts +++ b/src/Squidex/app/shell/pages/home/home-page.component.ts @@ -31,7 +31,7 @@ export class HomePageComponent { this.authService.loginPopup() .subscribe(() => { this.router.navigate(['/app']); - }, ex => { + }, error => { this.showLoginError = true; }); }