Imports sorted.

src/Squidex/app/app.module.ts

@@ -5,13 +5,13 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { ApplicationRef, NgModule } from '@angular/core';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
 import { HttpClientModule } from '@angular/common/http';
+import { ApplicationRef, NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterModule } from '@angular/router';
 import { DndModule } from 'ng2-dnd';
 
 import { AppComponent } from './app.component';

src/Squidex/app/features/administration/module.ts

@@ -9,8 +9,8 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import {
-    SqxSharedModule,
+    SqxFrameworkModule,
-    SqxFrameworkModule
+    SqxSharedModule
 } from '@app/shared';
 
 import {

src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts

@@ -10,8 +10,8 @@ import { Observable, Subscription } from 'rxjs';
 
 import { ImmutableArray, ModalView } from '@app/shared';
 
-import { EventConsumerDto } from './../../services/event-consumers.service';
 import { EventConsumersState } from '@appfeatures/administration/declarations';
+import { EventConsumerDto } from './../../services/event-consumers.service';
 
 @Component({
     selector: 'sqx-event-consumers-page',

src/Squidex/app/features/administration/pages/users/users-page.component.ts

@@ -53,8 +53,8 @@ export class UsersPageComponent implements OnInit {
         this.usersState.unlock(user).onErrorResumeNext().subscribe();
     }
 
-    public trackByUser(index: number, user: { user: UserDto }) {
+    public trackByUser(index: number, userInfo: { user: UserDto }) {
-        return user.user.id;
+        return userInfo.user.id;
     }
 }
 

src/Squidex/app/features/administration/state/users.state.ts

@@ -6,7 +6,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Observable } from 'rxjs';
 
 import '@app/framework/utils/rxjs-extensions';
@@ -14,18 +14,18 @@ import '@app/framework/utils/rxjs-extensions';
 import {
     AuthService,
     DialogService,
+    Form,
     ImmutableArray,
     Pager,
-    Form,
     State,
     ValidatorsEx
 } from '@app/shared';
 
 import {
     CreateUserDto,
+    UpdateUserDto,
     UserDto,
-    UsersService,
+    UsersService
-    UpdateUserDto
 } from './../services/users.service';
 
 export class UserForm extends Form<FormGroup> {

src/Squidex/app/features/content/module.ts

@@ -22,8 +22,8 @@ import {
     AssetsEditorComponent,
     ContentFieldComponent,
     ContentHistoryComponent,
-    ContentPageComponent,
     ContentItemComponent,
+    ContentPageComponent,
     ContentsPageComponent,
     ContentsSelectorComponent,
     ReferencesEditorComponent,

src/Squidex/app/features/content/pages/content/content-page.component.ts

@@ -13,9 +13,9 @@ import { Observable, Subscription } from 'rxjs';
 import { ContentVersionSelected } from './../messages';
 
 import {
+    allData,
     AppContext,
     AppLanguageDto,
-    allData,
     CanComponentDeactivate,
     ContentDto,
     ContentsService,

src/Squidex/app/features/content/pages/contents/contents-page.component.ts

@@ -18,8 +18,8 @@ import {
     ImmutableArray,
     ModalView,
     Pager,
-    SchemasState,
     SchemaDetailsDto,
+    SchemasState,
     Versioned
 } from '@app/shared';
 

src/Squidex/app/features/content/shared/assets-editor.component.ts

@@ -14,8 +14,8 @@ import {
     AppsState,
     AssetDto,
     AssetsService,
-    ModalView,
     ImmutableArray,
+    ModalView,
     Types
 } from '@app/shared';
 

src/Squidex/app/features/content/shared/contents-selector.component.ts

@@ -13,10 +13,10 @@ import {
     ContentsService,
     DialogService,
     ImmutableArray,
+    LanguageDto,
     ModalView,
     Pager,
-    SchemaDetailsDto,
+    SchemaDetailsDto
-    LanguageDto
 } from '@app/shared';
 
 @Component({

src/Squidex/app/features/rules/pages/rules/rule-wizard.component.ts

@@ -13,9 +13,9 @@ import {
     Form,
     ImmutableArray,
     ruleActions,
-    ruleTriggers,
     RuleDto,
     RulesState,
+    ruleTriggers,
     SchemaDto
 } from '@app/shared';
 

src/Squidex/app/features/schemas/module.ts

@@ -16,13 +16,13 @@ import {
 } from '@app/shared';
 
 import {
-    FieldComponent,
     AssetsUIComponent,
     AssetsValidationComponent,
     BooleanUIComponent,
     BooleanValidationComponent,
     DateTimeUIComponent,
     DateTimeValidationComponent,
+    FieldComponent,
     FieldFormCommonComponent,
     FieldFormUIComponent,
     FieldFormValidationComponent,
@@ -38,8 +38,8 @@ import {
     SchemaEditFormComponent,
     SchemaFormComponent,
     SchemaPageComponent,
-    SchemasPageComponent,
     SchemaScriptsFormComponent,
+    SchemasPageComponent,
     StringUIComponent,
     StringValidationComponent,
     TagsUIComponent,

src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts

@@ -10,7 +10,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
 
 import {
-    AppPatternDto,
     AppsState,
     fadeAnimation,
     FieldDto,

src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.ts

@@ -6,7 +6,7 @@
  */
 
 import { Component, Input, OnInit } from '@angular/core';
-import { FormGroup, FormControl, Validators } from '@angular/forms';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
 
 import { GeolocationFieldPropertiesDto } from '@app/shared';
 

src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts

@@ -12,8 +12,8 @@ import {
     ApiUrlConfig,
     AppsState,
     CreateSchemaForm,
-    SchemasState,
+    SchemaDto,
-    SchemaDto
+    SchemasState
 } from '@app/shared';
 
 @Component({

src/Squidex/app/features/settings/pages/backups/backups-page.component.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Observable, Subscription } from 'rxjs';
 
 import {

src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts

@@ -100,7 +100,7 @@ export class ContributorsPageComponent implements OnInit {
         }
     }
 
-    public trackByContributor(index: number, contributor: { contributor: AppContributorDto }) {
+    public trackByContributor(index: number, contributorInfo: { contributor: AppContributorDto }) {
-        return contributor.contributor.contributorId;
+        return contributorInfo.contributor.contributorId;
     }
 }

src/Squidex/app/features/settings/pages/languages/language.component.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { Subscription } from 'rxjs';
 

src/Squidex/app/features/settings/pages/patterns/pattern.component.ts

@@ -10,8 +10,8 @@ import { FormBuilder } from '@angular/forms';
 
 import {
     AppPatternDto,
-    PatternsState,
+    EditPatternForm,
-    EditPatternForm
+    PatternsState
 } from '@app/shared';
 
 @Component({

src/Squidex/app/features/settings/pages/plans/plans-page.component.ts

@@ -11,8 +11,8 @@ import { ActivatedRoute } from '@angular/router';
 import {
     ApiUrlConfig,
     AppsState,
-    PlansState,
+    PlanDto,
-    PlanDto
+    PlansState
 } from '@app/shared';
 
 @Component({
@@ -49,8 +49,8 @@ export class PlansPageComponent implements OnInit {
         this.plansState.change(planId).onErrorResumeNext().subscribe();
     }
 
-    public trackByPlan(index: number, plan: PlanDto) {
+    public trackByPlan(index: number, planInfo: { plan: PlanDto }) {
-        return plan.id;
+        return planInfo.plan.id;
     }
 }
 

src/Squidex/app/framework/angular/forms/date-time-editor.component.ts

@@ -5,10 +5,10 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { AfterViewInit, Component, forwardRef, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { Subscription } from 'rxjs';
 import * as moment from 'moment';
+import { Subscription } from 'rxjs';
 
 import { Types } from '@app/framework/internal';
 

src/Squidex/app/framework/angular/forms/indeterminate-value.directive.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Directive, forwardRef, ElementRef, HostListener, Renderer } from '@angular/core';
+import { Directive, ElementRef, forwardRef, HostListener, Renderer } from '@angular/core';
 import { ControlValueAccessor,  NG_VALUE_ACCESSOR } from '@angular/forms';
 
 import { Types } from '@app/framework/internal';

src/Squidex/app/framework/angular/forms/jscript-editor.component.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { AfterViewInit, Component, forwardRef, ElementRef, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, forwardRef, ViewChild } from '@angular/core';
 import { ControlValueAccessor,  NG_VALUE_ACCESSOR } from '@angular/forms';
 import { Subject } from 'rxjs';
 

src/Squidex/app/framework/angular/forms/json-editor.component.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { AfterViewInit, Component, forwardRef, ElementRef, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, forwardRef, ViewChild } from '@angular/core';
 import { ControlValueAccessor,  NG_VALUE_ACCESSOR } from '@angular/forms';
 import { Subject } from 'rxjs';
 

src/Squidex/app/framework/angular/forms/lowercase-input.directive.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Directive, forwardRef, ElementRef, HostListener, Renderer } from '@angular/core';
+import { Directive, ElementRef, forwardRef, HostListener, Renderer } from '@angular/core';
 import { ControlValueAccessor,  NG_VALUE_ACCESSOR } from '@angular/forms';
 
 import { Types } from '@app/framework/internal';

src/Squidex/app/framework/angular/forms/slugify-input.directive.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Directive, forwardRef, ElementRef, HostListener, Renderer } from '@angular/core';
+import { Directive, ElementRef, forwardRef, HostListener, Renderer } from '@angular/core';
 import { ControlValueAccessor,  NG_VALUE_ACCESSOR } from '@angular/forms';
 
 import slugify from 'slugify';

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

@@ -9,9 +9,9 @@
 import { Directive, EventEmitter, Output } from '@angular/core';
 
 import {
+    DragDropSortableService,
     SortableComponent,
-    SortableContainer,
+    SortableContainer
-    DragDropSortableService
 } from 'ng2-dnd';
 
 @Directive({

src/Squidex/app/framework/angular/user-report.component.ts

@@ -7,8 +7,8 @@
 
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 
-import { ResourceLoaderService } from './../services/resource-loader.service';
 import { UserReportConfig } from './../configurations';
+import { ResourceLoaderService } from './../services/resource-loader.service';
 
 @Component({
     selector: 'sqx-user-report',

src/Squidex/app/framework/module.ts

@@ -21,8 +21,8 @@ import {
     DateTimeEditorComponent,
     DayOfWeekPipe,
     DayPipe,
-    DialogService,
     DialogRendererComponent,
+    DialogService,
     DisplayNamePipe,
     DropdownComponent,
     DurationPipe,
@@ -51,8 +51,8 @@ import {
     OnboardingService,
     OnboardingTooltipComponent,
     PagerComponent,
-    PanelContainerDirective,
     PanelComponent,
+    PanelContainerDirective,
     ParentLinkDirective,
     PopupLinkDirective,
     ProgressBarComponent,
@@ -69,8 +69,8 @@ import {
     StarsComponent,
     TagEditorComponent,
     TemplateWrapperDirective,
-    TitleService,
     TitleComponent,
+    TitleService,
     ToggleComponent,
     TooltipComponent,
     UserReportComponent

src/Squidex/app/shared/components/app-context.ts

@@ -6,8 +6,8 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
 import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
 
 import { MessageBus } from '@app/framework';
 

src/Squidex/app/shared/components/assets-list.component.ts

@@ -10,8 +10,8 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 
 import {
-    AssetsState,
     AssetDto,
+    AssetsState,
     ImmutableArray
 } from '@app/shared/internal';
 

src/Squidex/app/shared/components/rich-editor.component.ts

@@ -5,8 +5,8 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { AfterViewInit, Component, forwardRef, ElementRef, EventEmitter, OnDestroy, Output, ViewChild } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, EventEmitter, forwardRef, OnDestroy, Output, ViewChild } from '@angular/core';
-import { ControlValueAccessor,  NG_VALUE_ACCESSOR } from '@angular/forms';
+import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 
 import {
     AssetDto,

src/Squidex/app/shared/interceptors/auth.interceptor.ts

@@ -5,13 +5,14 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpErrorResponse } from '@angular/common/http';
+import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Injectable} from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { AuthService, Profile } from './../services/auth.service';
 import { ApiUrlConfig } from '@app/framework';
 
+import { AuthService, Profile } from './../services/auth.service';
+
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
     private baseUrl: string;

src/Squidex/app/shared/module.ts

@@ -13,21 +13,21 @@ import { DndModule } from 'ng2-dnd';
 import { SqxFrameworkModule } from '@app/framework';
 
 import {
-    AppFormComponent,
     AppClientsService,
     AppContributorsService,
+    AppFormComponent,
     AppLanguagesService,
     AppMustExistGuard,
     AppPatternsService,
-    AppsState,
     AppsService,
+    AppsState,
     AssetComponent,
     AssetPreviewUrlPipe,
     AssetsDialogState,
     AssetsListComponent,
     AssetsSelectorComponent,
-    AssetsState,
     AssetsService,
+    AssetsState,
     AssetUrlPipe,
     AuthInterceptor,
     AuthService,
@@ -65,9 +65,9 @@ import {
     UnsetAppGuard,
     UsagesService,
     UserDtoPicture,
+    UserIdPicturePipe,
     UserNamePipe,
     UserNameRefPipe,
-    UserIdPicturePipe,
     UserPicturePipe,
     UserPictureRefPipe,
     UsersProviderService,

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

@@ -15,8 +15,8 @@ import { UsersProviderService } from './users-provider.service';
 
 import {
     ApiUrlConfig,
-    HTTP,
+    DateTime,
-    DateTime
+    HTTP
 } from '@app/framework';
 
 export class HistoryEventDto {

src/Squidex/app/shared/state/assets.state.ts

@@ -6,21 +6,21 @@
  */
 
 import { Injectable } from '@angular/core';
-import { FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Observable } from 'rxjs';
 
 import '@app/framework/utils/rxjs-extensions';
 
 import {
     DialogService,
+    Form,
     ImmutableArray,
     Pager,
-    Form,
     State
 } from '@app/framework';
 
-import { AppsState } from './apps.state';
 import { AssetDto, AssetsService} from './../services/assets.service';
+import { AppsState } from './apps.state';
 
 export class RenameAssetForm extends Form<FormGroup> {
     constructor(formBuilder: FormBuilder) {

src/Squidex/app/shared/state/clients.state.ts

@@ -6,15 +6,15 @@
  */
 
 import { Injectable } from '@angular/core';
-import { FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Observable } from 'rxjs';
 
 import '@app/framework/utils/rxjs-extensions';
 
 import {
     DialogService,
-    ImmutableArray,
     Form,
+    ImmutableArray,
     State,
     ValidatorsEx,
     Version

src/Squidex/app/shared/state/contributors.state.ts

@@ -6,22 +6,22 @@
  */
 
 import { Injectable } from '@angular/core';
-import { FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Observable } from 'rxjs';
 
 import '@app/framework/utils/rxjs-extensions';
 
 import {
     DialogService,
-    ImmutableArray,
     Form,
+    ImmutableArray,
     State,
     Version
 } from '@app/framework';
 
+import { AppContributorDto, AppContributorsService } from './../services/app-contributors.service';
 import { AuthService } from './../services/auth.service';
 import { AppsState } from './apps.state';
-import { AppContributorDto, AppContributorsService } from './../services/app-contributors.service';
 
 export class AssignContributorForm extends Form<FormGroup> {
     public hasNoUser =

src/Squidex/app/shared/state/patterns.state.ts

@@ -6,15 +6,15 @@
  */
 
 import { Injectable } from '@angular/core';
-import { FormBuilder, Validators, FormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Observable } from 'rxjs';
 
 import '@app/framework/utils/rxjs-extensions';
 
 import {
     DialogService,
-    ImmutableArray,
     Form,
+    ImmutableArray,
     State,
     ValidatorsEx,
     Version

src/Squidex/app/shared/state/plans.state.ts

@@ -17,8 +17,8 @@ import {
     Version
 } from '@app/framework';
 
-import { AppsState } from './apps.state';
 import { AuthService } from './../services/auth.service';
+import { AppsState } from './apps.state';
 
 import {
     ChangePlanDto,

src/Squidex/app/shared/state/rules.state.ts

@@ -18,8 +18,8 @@ import {
     Version
 } from '@app/framework';
 
-import { AppsState } from './apps.state';
 import { AuthService} from './../services/auth.service';
+import { AppsState } from './apps.state';
 
 import {
     CreateRuleDto,

src/Squidex/app/shared/state/schemas.state.ts

@@ -21,22 +21,22 @@ import {
     Version
 } from '@app/framework';
 
-import { AppsState } from './apps.state';
 import { AuthService } from './../services/auth.service';
+import { AppsState } from './apps.state';
 
 import {
     AddFieldDto,
     createProperties,
     CreateSchemaDto,
     FieldDto,
-    SchemaDto,
+    FieldPropertiesDto,
     SchemaDetailsDto,
+    SchemaDto,
+    SchemaPropertiesDto,
     SchemasService,
     UpdateFieldDto,
-    UpdateSchemaScriptsDto,
     UpdateSchemaDto,
-    SchemaPropertiesDto,
+    UpdateSchemaScriptsDto
-    FieldPropertiesDto
 } from './../services/schemas.service';
 
 const FALLBACK_NAME = 'my-schema';

src/Squidex/app/shell/pages/not-found/not-found-page.component.ts

@@ -5,8 +5,8 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { Component } from '@angular/core';
 import { Location } from '@angular/common';
+import { Component } from '@angular/core';
 
 @Component({
     selector: 'sqx-not-found-page',

src/Squidex/tslint.json

@@ -84,7 +84,7 @@
       "allow-declarations"
     ],
     "ordered-imports": [
-      false
+      true
     ],
     "pipe-naming": [
       true,