Style fixes

src/Squidex/app/components/internal/app/settings/languages-page.component.ts

@@ -14,7 +14,7 @@ import {
     AppLanguagesService,
     AppsStoreService,
     ArrayHelper,
-    LanguageDto, 
+    LanguageDto,
     LanguageService,
     NotificationService,
     UpdateAppLanguageDto,

src/Squidex/app/components/internal/apps/apps-page.component.ts

@@ -27,7 +27,7 @@ export class AppsPageComponent implements Ng2.OnInit {
 
     constructor(
         private readonly title: TitleService,
-        private readonly appsStore: AppsStoreService,
+        private readonly appsStore: AppsStoreService
     ) {
     }
 

src/Squidex/app/components/internal/internal-area.component.ts

@@ -9,8 +9,8 @@ import * as Ng2 from '@angular/core';
 
 import {
     fadeAnimation,
-    Notification, 
+    Notification,
-    NotificationService 
+    NotificationService
 } from 'shared';
 
 @Ng2.Component({
@@ -32,7 +32,7 @@ export class InternalAreaComponent implements Ng2.OnInit, Ng2.OnDestroy {
     }
 
     public ngOnInit() {
-        this.notificationsSubscription = 
+        this.notificationsSubscription =
             this.notificationService.notifications.subscribe(notification => {
                 this.notifications.push(notification);
 

src/Squidex/app/components/layout/module.ts

@@ -24,13 +24,13 @@ import {
         AppFormComponent,
         AppsMenuComponent,
         ProfileMenuComponent,
-        SearchFormComponent,
+        SearchFormComponent
     ],
     exports: [
         AppFormComponent,
         AppsMenuComponent,
         ProfileMenuComponent,
-        SearchFormComponent,
+        SearchFormComponent
     ]
 })
 export class SqxLayoutModule { }

src/Squidex/app/components/public/home-page.component.ts

@@ -21,7 +21,7 @@ export class HomePageComponent implements Ng2.OnInit {
     constructor(
         private readonly auth: AuthService,
         private readonly title: TitleService,
-        private readonly router: Ng2Router.Router,
+        private readonly router: Ng2Router.Router
     ) {
     }
 

src/Squidex/app/framework/angular/action.ts

@@ -5,10 +5,11 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-const EMPTY_FUNC = () => { };
+/* tslint:disable:no-empty */
-
 /* tslint:disable:only-arrow-functions */
 
+const EMPTY_FUNC = () => {};
+
 export function Action() {
     return function (target: any, key: string) {
         let observable: any;

src/Squidex/app/framework/angular/autocomplete.component.ts

@@ -28,6 +28,8 @@ const KEY_ENTER = 13;
 const KEY_UP = 38;
 const KEY_DOWN = 40;
 
+/* tslint:disable:no-empty */
+
 const NOOP = () => { };
 
 export const SQX_AUTOCOMPLETE_CONTROL_VALUE_ACCESSOR: any = {

src/Squidex/app/framework/angular/copy.directive.ts

@@ -29,7 +29,7 @@ export class CopyDirective {
 
         element.focus();
         element.setSelectionRange(0, element.value.length);
-        
+
         try {
             document.execCommand('copy');
         } catch (e) {
@@ -39,7 +39,7 @@ export class CopyDirective {
         if (currentFocus && typeof currentFocus.focus === 'function') {
             currentFocus.focus();
         }
-        
+
         element.setSelectionRange(prevSelectionStart, prevSelectionEnd);
     }
 }

src/Squidex/app/framework/angular/image-drop.directive.ts

@@ -95,6 +95,7 @@ export class ImageDropDirective {
     private findImage(event: DragDropEvent): File | null {
         let image: File | null = null;
 
+        /* tslint:disable:prefer-for-of */
         for (let i = 0; i < event.dataTransfer.files.length; i++) {
             const file = event.dataTransfer.files[i];
 

src/Squidex/app/framework/module.ts

@@ -66,7 +66,7 @@ import {
         SliderComponent,
         SpinnerComponent,
         TitleComponent,
-        UserReportComponent,
+        UserReportComponent
     ],
     exports: [
         AutocompleteComponent,

src/Squidex/app/framework/services/notification.service.spec.ts

@@ -5,10 +5,10 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
-import { 
+import {
     Notification,
     NotificationService,
-    NotificationServiceFactory 
+    NotificationServiceFactory
 } from './../';
 
 describe('NotificationService', () => {

src/Squidex/app/framework/utils/immutable-object.ts

@@ -5,6 +5,8 @@
  * Copyright (c) Sebastian Stehle. All rights reserved
  */
 
+/* tslint:disable:no-empty */
+
 export abstract class ImmutableObject {
     public abstract clone(): ImmutableObject;
 

src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts

@@ -21,7 +21,7 @@ describe('AppMustExistGuard', () => {
     it('should navigate to 404 page if app is not found', (done) => {
         appsStore.setup(x => x.selectApp('my-app'))
             .returns(() => Promise.resolve(false));
-        
+
         const router = new RouterMockup();
         const guard = new AppMustExistGuard(appsStore.object, <any>router);
 
@@ -37,7 +37,7 @@ describe('AppMustExistGuard', () => {
     it('should navigate to 404 page if app loading fails', (done) => {
         appsStore.setup(x => x.selectApp('my-app'))
             .returns(() => Promise.reject<boolean>('error'));
-        
+
         const router = new RouterMockup();
         const guard = new AppMustExistGuard(appsStore.object, <any>router);
 
@@ -53,7 +53,7 @@ describe('AppMustExistGuard', () => {
     it('should return true if app is found', (done) => {
         appsStore.setup(x => x.selectApp('my-app'))
             .returns(() => Promise.resolve(true));
-        
+
         const router = new RouterMockup();
         const guard = new AppMustExistGuard(appsStore.object, <any>router);
 

src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts

@@ -21,10 +21,10 @@ describe('MustBeAuthenticatedGuard', () => {
     it('should navigate to default page if not authenticated', (done) => {
         authService.setup(x => x.checkLogin())
             .returns(() => Promise.resolve(false));
-        
+
         const router = new RouterMockup();
         const guard = new MustBeAuthenticatedGuard(authService.object, <any>router);
-        
+
         guard.canActivate(null, null)
             .then(result => {
                 expect(result).toBeFalsy();
@@ -37,10 +37,10 @@ describe('MustBeAuthenticatedGuard', () => {
     it('should return true if authenticated', (done) => {
         authService.setup(x => x.checkLogin())
             .returns(() => Promise.resolve(true));
-        
+
         const router = new RouterMockup();
         const guard = new MustBeAuthenticatedGuard(authService.object, <any>router);
-        
+
         guard.canActivate(null, null)
             .then(result => {
                 expect(result).toBeTruthy();

src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts

@@ -21,10 +21,10 @@ describe('MustBeNotAuthenticatedGuard', () => {
     it('should navigate to app page if authenticated', (done) => {
         authService.setup(x => x.checkLogin())
             .returns(() => Promise.resolve(true));
-        
+
         const router = new RouterMockup();
         const guard = new MustBeNotAuthenticatedGuard(authService.object, <any>router);
-        
+
         guard.canActivate(null, null)
             .then(result => {
                 expect(result).toBeFalsy();
@@ -37,10 +37,10 @@ describe('MustBeNotAuthenticatedGuard', () => {
     it('should return true if not authenticated', (done) => {
         authService.setup(x => x.checkLogin())
             .returns(() => Promise.resolve(false));
-        
+
         const router = new RouterMockup();
         const guard = new MustBeNotAuthenticatedGuard(authService.object, <any>router);
-        
+
         guard.canActivate(null, null)
             .then(result => {
                 expect(result).toBeTruthy();

src/Squidex/app/shared/services/app-clients.service.spec.ts

@@ -51,7 +51,7 @@ describe('AppClientsService', () => {
             .verifiable(TypeMoq.Times.once());
 
         let clients: AppClientDto[] = null;
-        
+
         appClientsService.getClients('my-app').subscribe(result => {
             clients = result;
         }).unsubscribe();
@@ -82,7 +82,7 @@ describe('AppClientsService', () => {
                 )
             ))
             .verifiable(TypeMoq.Times.once());
-        
+
         let client: AppClientDto = null;
 
         appClientsService.postClient('my-app', dto).subscribe(result => {

src/Squidex/app/shared/services/app-contributors.service.spec.ts

@@ -44,7 +44,7 @@ describe('AppContributorsService', () => {
             .verifiable(TypeMoq.Times.once());
 
         let contributors: AppContributorDto[] = null;
-        
+
         appContributorsService.getContributors('my-app').subscribe(result => {
             contributors = result;
         }).unsubscribe();

src/Squidex/app/shared/services/app-languages.service.spec.ts

@@ -47,7 +47,7 @@ describe('AppLanguagesService', () => {
             .verifiable(TypeMoq.Times.once());
 
         let languages: AppLanguageDto[] = null;
-        
+
         appLanguagesService.getLanguages('my-app').subscribe(result => {
             languages = result;
         }).unsubscribe();

src/Squidex/app/shared/services/app-languages.service.ts

@@ -25,7 +25,7 @@ export class AppLanguageDto {
 
 export class AddAppLanguageDto {
     constructor(
-        public readonly name: string,
+        public readonly name: string
     ) {
     }
 }
@@ -50,12 +50,12 @@ export class AppLanguagesService {
 
         return this.authService.authGet(url)
                 .map(response => response.json())
-                .map(response => {                    
+                .map(response => {
                     const items: any[] = response;
 
                     return items.map(item => {
                         return new AppLanguageDto(
-                            item.iso2Code, 
+                            item.iso2Code,
                             item.englishName,
                             item.isMasterLanguage === true);
                     });
@@ -68,9 +68,9 @@ export class AppLanguagesService {
 
         return this.authService.authPost(url, dto)
                 .map(response => response.json())
-                .map(response => {               
+                .map(response => {
                     return new AppLanguageDto(
-                        response.iso2Code, 
+                        response.iso2Code,
                         response.englishName,
                         response.isMasterLanguage === true);
                 })
@@ -82,7 +82,7 @@ export class AppLanguagesService {
 
         return this.authService.authPut(url, dto)
                 .catch(response => handleError('Failed to change language. Please reload.', response));
-    } 
+    }
 
     public deleteLanguage(appName: string, languageCode: string): Observable<any> {
         const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages/${languageCode}`);

src/Squidex/app/shared/services/apps.service.spec.ts

@@ -53,7 +53,7 @@ describe('AppsService', () => {
             .verifiable(TypeMoq.Times.once());
 
         let apps: AppDto[] = null;
-        
+
         appsService.getApps().subscribe(result => {
             apps = result;
         }).unsubscribe();
@@ -80,7 +80,7 @@ describe('AppsService', () => {
                 )
             ))
             .verifiable(TypeMoq.Times.once());
-            
+
         let newCreated: EntityCreatedDto = null;
 
         appsService.postApp(createApp).subscribe(result => {

src/Squidex/app/shared/services/auth.service.ts

@@ -61,7 +61,7 @@ export class AuthService {
 
     constructor(apiUrl: ApiUrlConfig,
         private readonly http: Ng2Http.Http,
-        private readonly router: Ng2Router.Router,
+        private readonly router: Ng2Router.Router
     ) {
         if (!apiUrl) {
             return;

src/Squidex/app/shared/services/languages.service.spec.ts

@@ -44,7 +44,7 @@ describe('LanguageService', () => {
             .verifiable(TypeMoq.Times.once());
 
         let languages: LanguageDto[] = null;
-        
+
         languageService.getLanguages().subscribe(result => {
             languages = result;
         }).unsubscribe();

src/Squidex/app/shared/services/languages.service.ts

@@ -35,12 +35,12 @@ export class LanguageService {
 
         return this.authService.authGet(url)
                 .map(response => response.json())
-                .map(response => {                    
+                .map(response => {
                     const items: any[] = response;
 
                     return items.map(item => {
                         return new LanguageDto(
-                            item.iso2Code, 
+                            item.iso2Code,
                             item.englishName);
                     });
                 })

src/Squidex/app/shared/services/schemas.service.ts

@@ -118,12 +118,12 @@ export class SchemasService {
 
         return this.authService.authGet(url)
                 .map(response => response.json())
-                .map(response => {                    
+                .map(response => {
                     const items: any[] = response;
 
                     return items.map(item => {
                         return new SchemaDto(
-                            item.id, 
+                            item.id,
                             item.name,
                             DateTime.parseISO_UTC(item.created),
                             DateTime.parseISO_UTC(item.lastModified));
@@ -155,7 +155,7 @@ export class SchemasService {
                                 properties.patternMessage,
                                 properties.minLength,
                                 properties.maxLength,
-                                properties.allowedValues); 
+                                properties.allowedValues);
                         } else {
                             propertiesDto = new NumberFieldPropertiesDto(
                                 properties.label,
@@ -165,7 +165,7 @@ export class SchemasService {
                                 properties.defaultValue,
                                 properties.minValue,
                                 properties.maxValue,
-                                properties.allowedValues); 
+                                properties.allowedValues);
                         }
 
                         return new FieldDto(
@@ -174,12 +174,12 @@ export class SchemasService {
                             item.isDisabled,
                             propertiesDto);
                     });
-                    
+
                     return new SchemaDetailsDto(
-                        response.id, 
+                        response.id,
                         response.name,
                         DateTime.parseISO_UTC(response.created),
-                        DateTime.parseISO_UTC(response.lastModified), 
+                        DateTime.parseISO_UTC(response.lastModified),
                         fields);
                 })
                 .catch(response => handleError('Failed to load schema. Please reload.', response));

src/Squidex/app/shared/services/users-provider.service.spec.ts

@@ -34,7 +34,7 @@ describe('UsersProviderService', () => {
         usersService.setup(x => x.getUser('123'))
             .returns(() => Observable.of(user))
             .verifiable(TypeMoq.Times.once());
-            
+
         let resultingUser: UserDto = null;
 
         usersProviderService.getUser('123').subscribe(result => {
@@ -52,9 +52,9 @@ describe('UsersProviderService', () => {
         usersService.setup(x => x.getUser('123'))
             .returns(() => Observable.of(user))
             .verifiable(TypeMoq.Times.once());
-            
+
         usersProviderService.getUser('123');
-        
+
         let resultingUser: UserDto = null;
 
         usersProviderService.getUser('123').subscribe(result => {
@@ -75,7 +75,7 @@ describe('UsersProviderService', () => {
         usersService.setup(x => x.getUser('123'))
             .returns(() => Observable.of(user))
             .verifiable(TypeMoq.Times.once());
-            
+
         let resultingUser: UserDto = null;
 
         usersProviderService.getUser('123').subscribe(result => {

src/Squidex/app/shared/services/users-provider.service.ts

@@ -7,7 +7,7 @@
 
 import * as Ng2 from '@angular/core';
 
-import { Observable,  } from 'rxjs';
+import { Observable } from 'rxjs';
 
 import { UserDto, UsersService } from './users.service';
 
@@ -19,7 +19,7 @@ export class UsersProviderService {
 
     constructor(
         private readonly usersService: UsersService,
-        private readonly authService: AuthService,
+        private readonly authService: AuthService
     ) {
     }
 

src/Squidex/app/shared/services/users.service.spec.ts

@@ -48,7 +48,7 @@ describe('UsersService', () => {
             .verifiable(TypeMoq.Times.once());
 
         let user: UserDto[] = null;
-        
+
         usersService.getUsers().subscribe(result => {
             user = result;
         }).unsubscribe();
@@ -84,7 +84,7 @@ describe('UsersService', () => {
             .verifiable(TypeMoq.Times.once());
 
         let user: UserDto[] = null;
-        
+
         usersService.getUsers('my-query').subscribe(result => {
             user = result;
         }).unsubscribe();
@@ -115,7 +115,7 @@ describe('UsersService', () => {
             .verifiable(TypeMoq.Times.once());
 
         let user: UserDto = null;
-        
+
         usersService.getUser('123').subscribe(result => {
             user = result;
         }).unsubscribe();

src/Squidex/app/shared/services/users.service.ts

@@ -35,7 +35,7 @@ export class UsersService {
 
         return this.authService.authGet(url)
                 .map(response => response.json())
-                .map(response => {                    
+                .map(response => {
                     const items: any[] = response;
 
                     return items.map(item => {
@@ -50,10 +50,10 @@ export class UsersService {
 
     public getUser(id: string): Observable<UserDto> {
         const url = this.apiUrl.buildUrl(`api/users/${id}`);
-        
+
         return this.authService.authGet(url)
                 .map(response => response.json())
-                .map(response => {                    
+                .map(response => {
                     return new UserDto(
                         response.id,
                         response.email,

src/Squidex/tslint.json

@@ -38,7 +38,7 @@
     "no-construct": true,
     "no-debugger": true,
     "no-duplicate-variable": true,
-    "no-empty": false,
+    "no-empty": true,
     "no-eval": true,
     "no-inferrable-types": [
       true, 
@@ -48,6 +48,7 @@
     "no-string-literal": false,
     "no-switch-case-fall-through": true,
     "no-trailing-whitespace": true,
+    
     "no-unused-expression": true,
     "no-unused-variable": true,
     "no-use-before-declare": true,
@@ -61,11 +62,13 @@
       "check-whitespace"
     ],
     "only-arrow-functions": [
-      true, 
+      true,
-      "allow-declarations"],
+      "allow-declarations"
+    ],
     "ordered-imports": [
       true
     ],
+    "prefer-for-of": true,
     "quotemark": [
       true,
       "single"
@@ -74,6 +77,13 @@
     "semicolon": [
       "always"
     ],
+    "trailing-comma": [
+      true, 
+      {
+        "multiline": "never", 
+        "singleline": "never"
+      }
+    ],
     "triple-equals": [
       true,
       "allow-null-check"