Ordered imports. (#827)

frontend/.eslintrc.js

@@ -82,6 +82,17 @@ module.exports = {
         "import/extensions": "off",
         "import/no-extraneous-dependencies": "off",
         "import/no-useless-path-segments": "off",
+        "import/order": ["error", {
+            "pathGroupsExcludedImportTypes": ["builtin"],
+            "pathGroups": [{
+                "pattern": "@app/**",
+                "group": "external",
+                "position": "after"
+            }],
+            "alphabetize": {
+                "order": "asc"
+            }
+        }],
         "import/prefer-default-export": "off",
         "linebreak-style": "off",
         "max-classes-per-file": "off",

frontend/package.json

@@ -3,6 +3,8 @@
   "version": "0.0.0",
   "scripts": {
     "build": "ng build",
+    "lint": "eslint src/app/**/*.ts",
+    "lint:fix": "eslint src/app/**/*.ts --fix",
     "ng": "ng",
     "postinstall": "npx patch-package",
     "start": "ng serve",

frontend/src/app/app.module.ts

@@ -15,11 +15,11 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRouteSnapshot, BaseRouteReuseStrategy, RouteReuseStrategy, RouterModule } from '@angular/router';
+import { environment } from './../environments/environment';
 import { AppComponent } from './app.component';
 import { routing } from './app.routes';
 import { ApiUrlConfig, CurrencyConfig, DateHelper, DecimalSeparatorConfig, LocalizerService, SqxFrameworkModule, SqxSharedModule, TitlesConfig, UIOptions } from './shared';
 import { SqxShellModule } from './shell';
-import { environment } from './../environments/environment';
 
 DateHelper.setlocale(window['options']?.more?.culture);
 

frontend/src/app/features/administration/guards/user-must-exist.guard.spec.ts

@@ -6,9 +6,9 @@
  */
 
 import { Router } from '@angular/router';
-import { UserDto, UsersState } from '@app/features/administration/internal';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
+import { UserDto, UsersState } from '@app/features/administration/internal';
 import { UserMustExistGuard } from './user-must-exist.guard';
 
 describe('UserMustExistGuard', () => {

frontend/src/app/features/administration/guards/user-must-exist.guard.ts

@@ -7,9 +7,9 @@
 
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
+import { Observable, map, tap } from 'rxjs';
 import { UsersState } from '@app/features/administration/internal';
 import { allParams } from '@app/framework';
-import { Observable, map, tap } from 'rxjs';
 
 @Injectable()
 export class UserMustExistGuard implements CanActivate {

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

@@ -6,10 +6,10 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { EventConsumerDto, EventConsumersState } from '@app/features/administration/internal';
-import { DialogModel, ResourceOwner } from '@app/shared';
 import { timer } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
+import { EventConsumerDto, EventConsumersState } from '@app/features/administration/internal';
+import { DialogModel, ResourceOwner } from '@app/shared';
 
 @Component({
     selector: 'sqx-event-consumers-page',

frontend/src/app/features/administration/pages/restore/restore-page.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { Component } from '@angular/core';
-import { AuthService, BackupsService, DialogService, RestoreForm, switchSafe } from '@app/shared';
 import { timer } from 'rxjs';
+import { AuthService, BackupsService, DialogService, RestoreForm, switchSafe } from '@app/shared';
 
 @Component({
     selector: 'sqx-restore-page',

frontend/src/app/features/administration/services/event-consumers.service.ts

@@ -7,9 +7,9 @@
 
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { ApiUrlConfig, hasAnyLink, pretifyError, Resource, ResourceLinks } from '@app/shared';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { ApiUrlConfig, hasAnyLink, pretifyError, Resource, ResourceLinks } from '@app/shared';
 
 export class EventConsumersDto {
     public readonly _links: ResourceLinks;

frontend/src/app/features/administration/services/users.service.ts

@@ -7,9 +7,9 @@
 
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { ApiUrlConfig, hasAnyLink, pretifyError, Resource, ResourceLinks, ResultSet } from '@app/shared';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { ApiUrlConfig, hasAnyLink, pretifyError, Resource, ResourceLinks, ResultSet } from '@app/shared';
 
 export class UsersDto extends ResultSet<UserDto> {
     public get canCreate() {

frontend/src/app/features/administration/state/event-consumers.state.spec.ts

@@ -5,11 +5,11 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { EventConsumersDto, EventConsumersService } from '@app/features/administration/internal';
-import { DialogService } from '@app/framework';
 import { of, throwError } from 'rxjs';
 import { onErrorResumeNext } from 'rxjs/operators';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { EventConsumersDto, EventConsumersService } from '@app/features/administration/internal';
+import { DialogService } from '@app/framework';
 import { createEventConsumer } from './../services/event-consumers.service.spec';
 import { EventConsumersState } from './event-consumers.state';
 

frontend/src/app/features/administration/state/event-consumers.state.ts

@@ -6,9 +6,9 @@
  */
 
 import { Injectable } from '@angular/core';
-import { DialogService, shareSubscribed, State } from '@app/shared';
 import { Observable } from 'rxjs';
 import { finalize, tap } from 'rxjs/operators';
+import { DialogService, shareSubscribed, State } from '@app/shared';
 import { EventConsumerDto, EventConsumersService } from './../services/event-consumers.service';
 
 interface Snapshot {

frontend/src/app/features/administration/state/users.state.spec.ts

@@ -5,11 +5,11 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { UsersDto, UsersService } from '@app/features/administration/internal';
-import { DialogService } from '@app/shared';
 import { firstValueFrom, of, throwError } from 'rxjs';
 import { onErrorResumeNext } from 'rxjs/operators';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { UsersDto, UsersService } from '@app/features/administration/internal';
+import { DialogService } from '@app/shared';
 import { createUser } from './../services/users.service.spec';
 import { UsersState } from './users.state';
 

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

@@ -9,9 +9,9 @@
 
 import { Injectable } from '@angular/core';
 import '@app/framework/utils/rxjs-extensions';
-import { DialogService, getPagingInfo, ListState, shareSubscribed, State } from '@app/shared';
 import { EMPTY, Observable, of } from 'rxjs';
 import { catchError, finalize, tap } from 'rxjs/operators';
+import { DialogService, getPagingInfo, ListState, shareSubscribed, State } from '@app/shared';
 import { CreateUserDto, UpdateUserDto, UserDto, UsersService } from './../services/users.service';
 
 interface Snapshot extends ListState<string> {

frontend/src/app/features/api/pages/graphql/graphql-page.component.ts

@@ -6,12 +6,12 @@
  */
 
 import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core';
-import { AppsState, GraphQlService } from '@app/shared';
 import GraphiQL from 'graphiql';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
+import { AppsState, GraphQlService } from '@app/shared';
 
 @Component({
     selector: 'sqx-graphql-page',

frontend/src/app/features/apps/pages/apps-page.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { Component, OnInit } from '@angular/core';
+import { take } from 'rxjs/operators';
 import { AppDto, AppsState, AuthService, DialogModel, FeatureDto, LocalStoreService, NewsService, OnboardingService, UIOptions, UIState } from '@app/shared';
 import { Settings } from '@app/shared/state/settings';
-import { take } from 'rxjs/operators';
 
 @Component({
     selector: 'sqx-apps-page',

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

@@ -5,11 +5,11 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
+import { ScrollingModule as ScrollingModuleExperimental } from '@angular/cdk-experimental/scrolling';
+import { ScrollingModule } from '@angular/cdk/scrolling';
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { CanDeactivateGuard, ContentMustExistGuard, LoadLanguagesGuard, LoadSchemasGuard, SchemaMustExistPublishedGuard, SchemaMustNotBeSingletonGuard, SqxFrameworkModule, SqxSharedModule } from '@app/shared';
-import { ScrollingModule } from '@angular/cdk/scrolling';
-import { ScrollingModule as ScrollingModuleExperimental } from '@angular/cdk-experimental/scrolling';
 import { ArrayEditorComponent, ArrayItemComponent, AssetsEditorComponent, CalendarPageComponent, CommentsPageComponent, ComponentComponent, ComponentSectionComponent, ContentComponent, ContentCreatorComponent, ContentEditorComponent, ContentEventComponent, ContentExtensionComponent, ContentFieldComponent, ContentHistoryPageComponent, ContentInspectionComponent, ContentPageComponent, ContentReferencesComponent, ContentSectionComponent, ContentsFiltersPageComponent, ContentsPageComponent, CustomViewEditorComponent, DueTimeSelectorComponent, FieldCopyButtonComponent, FieldEditorComponent, FieldLanguagesComponent, IFrameEditorComponent, PreviewButtonComponent, ReferenceDropdownComponent, ReferenceItemComponent, ReferencesCheckboxesComponent, ReferencesEditorComponent, ReferencesTagsComponent, SchemasPageComponent, SidebarPageComponent, StockPhotoEditorComponent } from './declarations';
 
 const routes: Routes = [

frontend/src/app/features/content/pages/content/content-history-page.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { AppsState, ContentDto, ContentsState, defined, HistoryEventDto, HistoryService, ModalModel, ResourceOwner, SchemasState, switchSafe } from '@app/shared';
 import { Observable, timer } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { AppsState, ContentDto, ContentsState, defined, HistoryEventDto, HistoryService, ModalModel, ResourceOwner, SchemasState, switchSafe } from '@app/shared';
 import { DueTimeSelectorComponent } from './../../shared/due-time-selector.component';
 import { ContentPageComponent } from './content-page.component';
 

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

@@ -7,9 +7,9 @@
 
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { ApiUrlConfig, AppLanguageDto, AppsState, AuthService, AutoSaveKey, AutoSaveService, CanComponentDeactivate, ContentDto, ResolveContents, ContentsState, defined, DialogService, EditContentForm, LanguagesState, ModalModel, ResourceOwner, SchemaDto, SchemasState, TempService, ToolbarService, Types, Version, ResolveAssets } from '@app/shared';
 import { Observable, of } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
+import { ApiUrlConfig, AppLanguageDto, AppsState, AuthService, AutoSaveKey, AutoSaveService, CanComponentDeactivate, ContentDto, ResolveContents, ContentsState, defined, DialogService, EditContentForm, LanguagesState, ModalModel, ResourceOwner, SchemaDto, SchemasState, TempService, ToolbarService, Types, Version, ResolveAssets } from '@app/shared';
 
 @Component({
     selector: 'sqx-content-page',

frontend/src/app/features/content/pages/content/editor/content-field.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { Component, EventEmitter, HostBinding, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { AppLanguageDto, AppsState, changed$, EditContentForm, FieldForm, invalid$, LocalStoreService, SchemaDto, Settings, TranslationsService } from '@app/shared';
 import { Observable } from 'rxjs';
+import { AppLanguageDto, AppsState, changed$, EditContentForm, FieldForm, invalid$, LocalStoreService, SchemaDto, Settings, TranslationsService } from '@app/shared';
 
 @Component({
     selector: 'sqx-content-field[form][formContext][formLevel][formModel][language][languages][schema]',

frontend/src/app/features/content/pages/content/inspecting/content-inspection.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
-import { AppLanguageDto, ContentDto, ContentsService, ContentsState, ErrorDto, ToolbarService } from '@app/shared';
 import { BehaviorSubject, combineLatest, of } from 'rxjs';
 import { filter, map, switchMap } from 'rxjs/operators';
+import { AppLanguageDto, ContentDto, ContentsService, ContentsState, ErrorDto, ToolbarService } from '@app/shared';
 
 type Mode = 'Content' | 'Data' | 'FlatData';
 

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

@@ -6,8 +6,8 @@
  */
 
 import { Component } from '@angular/core';
-import { ContentsState, defined, Queries, Query, SchemasState, UIState } from '@app/shared';
 import { map } from 'rxjs/operators';
+import { ContentsState, defined, Queries, Query, SchemasState, UIState } from '@app/shared';
 
 @Component({
     selector: 'sqx-contents-filters-page',

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

@@ -9,9 +9,9 @@
 
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { AppLanguageDto, AppsState, ContentDto, ContentsState, ContributorsState, defined, LanguagesState, ModalModel, Queries, Query, queryModelFromSchema, QuerySynchronizer, ResourceOwner, Router2State, SchemaDto, SchemasState, switchSafe, TableFields, TempService, UIState } from '@app/shared';
 import { combineLatest } from 'rxjs';
 import { distinctUntilChanged, map, switchMap, take, tap } from 'rxjs/operators';
+import { AppLanguageDto, AppsState, ContentDto, ContentsState, ContributorsState, defined, LanguagesState, ModalModel, Queries, Query, queryModelFromSchema, QuerySynchronizer, ResourceOwner, Router2State, SchemaDto, SchemasState, switchSafe, TableFields, TempService, UIState } from '@app/shared';
 import { DueTimeSelectorComponent } from './../../shared/due-time-selector.component';
 
 @Component({

frontend/src/app/features/content/pages/schemas/schemas-page.component.ts

@@ -7,9 +7,9 @@
 
 import { Component } from '@angular/core';
 import { FormControl } from '@angular/forms';
-import { AppsState, getCategoryTree, LocalStoreService, SchemaCategory, SchemasState, Settings, value$ } from '@app/shared';
 import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { AppsState, getCategoryTree, LocalStoreService, SchemaCategory, SchemasState, Settings, value$ } from '@app/shared';
 
 @Component({
     selector: 'sqx-schemas-page',

frontend/src/app/features/content/pages/sidebar/sidebar-page.component.ts

@@ -6,10 +6,10 @@
  */
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { defined } from '@app/framework/internal';
-import { ContentsState, SchemasState } from '@app/shared';
 import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { defined } from '@app/framework/internal';
+import { ContentsState, SchemasState } from '@app/shared';
 
 @Component({
     selector: 'sqx-sidebar-page',

frontend/src/app/features/content/shared/due-time-selector.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { Component, Input } from '@angular/core';
-import { DialogModel } from '@app/shared';
 import { Observable, of, Subject } from 'rxjs';
+import { DialogModel } from '@app/shared';
 
 const OPTION_IMMEDIATELY = 'Immediately';
 

frontend/src/app/features/content/shared/forms/array-editor.component.ts

@@ -7,9 +7,9 @@
 
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { ChangeDetectionStrategy, Component, Input, OnChanges, OnInit, QueryList, SimpleChanges, ViewChildren } from '@angular/core';
-import { AppLanguageDto, ComponentsFieldPropertiesDto, disabled$, EditContentForm, FieldArrayForm, LocalStoreService, ModalModel, ObjectFormBase, SchemaDto, Settings, sorted, Types } from '@app/shared';
 import { combineLatest, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { AppLanguageDto, ComponentsFieldPropertiesDto, disabled$, EditContentForm, FieldArrayForm, LocalStoreService, ModalModel, ObjectFormBase, SchemaDto, Settings, sorted, Types } from '@app/shared';
 import { ArrayItemComponent } from './array-item.component';
 
 @Component({

frontend/src/app/features/content/shared/forms/array-item.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output, QueryList, SimpleChanges, ViewChildren } from '@angular/core';
-import { AppLanguageDto, ComponentForm, EditContentForm, FieldDto, FieldFormatter, FieldSection, invalid$, ObjectFormBase, RootFieldDto, StatefulComponent, Types, valueProjection$ } from '@app/shared';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { AppLanguageDto, ComponentForm, EditContentForm, FieldDto, FieldFormatter, FieldSection, invalid$, ObjectFormBase, RootFieldDto, StatefulComponent, Types, valueProjection$ } from '@app/shared';
 import { ComponentSectionComponent } from './component-section.component';
 
 interface State {

frontend/src/app/features/content/shared/forms/field-editor.component.ts

@@ -7,8 +7,8 @@
 
 import { Component, ElementRef, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
 import { AbstractControl } from '@angular/forms';
-import { AbstractContentForm, AppLanguageDto, EditContentForm, FieldDto, hasNoValue$, MathHelper, Types } from '@app/shared';
 import { Observable } from 'rxjs';
+import { AbstractContentForm, AppLanguageDto, EditContentForm, FieldDto, hasNoValue$, MathHelper, Types } from '@app/shared';
 
 @Component({
     selector: 'sqx-field-editor[form][formContext][formLevel][formModel][language][languages]',

frontend/src/app/features/content/shared/forms/stock-photo-editor.component.ts

@@ -7,9 +7,9 @@
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnInit } from '@angular/core';
 import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { StatefulControlComponent, StockPhotoDto, StockPhotoService, thumbnail, Types, value$, valueProjection$ } from '@app/shared';
 import { of } from 'rxjs';
 import { debounceTime, switchMap, tap } from 'rxjs/operators';
+import { StatefulControlComponent, StockPhotoDto, StockPhotoService, thumbnail, Types, value$, valueProjection$ } from '@app/shared';
 
 export const SQX_STOCK_PHOTO_EDITOR_CONTROL_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => StockPhotoEditorComponent), multi: true,

frontend/src/app/features/content/shared/preview-button.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
-import { ContentDto, interpolate, LocalStoreService, ModalModel, SchemaDto, Settings, StatefulComponent } from '@app/shared';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
+import { ContentDto, interpolate, LocalStoreService, ModalModel, SchemaDto, Settings, StatefulComponent } from '@app/shared';
 
 interface State {
     // The name of the selected preview config.

frontend/src/app/features/content/shared/references/reference-dropdown.component.ts

@@ -7,9 +7,9 @@
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { Observable } from 'rxjs';
 import { ContentsDto } from '@app/shared';
 import { ContentDto, ResolveContents, getContentValue, LanguageDto, LocalizerService, StatefulControlComponent, Types, value$ } from '@app/shared/internal';
-import { Observable } from 'rxjs';
 
 export const SQX_REFERENCE_DROPDOWN_CONTROL_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => ReferenceDropdownComponent), multi: true,

frontend/src/app/features/content/shared/references/references-tags.component.ts

@@ -7,9 +7,9 @@
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
+import { Observable } from 'rxjs';
 import { Types } from '@app/framework';
 import { ContentDto, ContentsDto, ResolveContents, LanguageDto, LocalizerService, StatefulControlComponent } from '@app/shared/internal';
-import { Observable } from 'rxjs';
 import { ReferencesTagsConverter } from './references-tag-converter';
 
 export const SQX_REFERENCES_TAGS_CONTROL_VALUE_ACCESSOR: any = {

frontend/src/app/features/dashboard/module.ts

@@ -7,9 +7,9 @@
 
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
-import { SqxFrameworkModule, SqxSharedModule } from '@app/shared';
 import { GridsterModule } from 'angular-gridster2';
 import { ChartModule } from 'angular2-chartjs';
+import { SqxFrameworkModule, SqxSharedModule } from '@app/shared';
 import { ApiCallsCardComponent, ApiCallsSummaryCardComponent, ApiCardComponent, ApiPerformanceCardComponent, ApiTrafficCardComponent, ApiTrafficSummaryCardComponent, AssetUploadsCountCardComponent, AssetUploadsSizeCardComponent, AssetUploadsSizeSummaryCardComponent, ContentSummaryCardComponent, DashboardConfigComponent, DashboardPageComponent, GithubCardComponent, HistoryCardComponent, IFrameCardComponent, RandomCatCardComponent, RandomDogCardComponent, SchemaCardComponent, SupportCardComponent } from './declarations';
 
 const routes: Routes = [

frontend/src/app/features/dashboard/pages/cards/history-card.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
-import { AppDto, HistoryEventDto, HistoryService } from '@app/shared';
 import { Observable } from 'rxjs';
+import { AppDto, HistoryEventDto, HistoryService } from '@app/shared';
 
 @Component({
     selector: 'sqx-history-card[app]',

frontend/src/app/features/dashboard/pages/dashboard-config.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { AppDto, AppsState, AuthService, DialogModel, DialogService, LocalizerService, ModalModel, Types, UIState } from '@app/shared';
 import { GridsterItem } from 'angular-gridster2';
 import { take } from 'rxjs/operators';
+import { AppDto, AppsState, AuthService, DialogModel, DialogService, LocalizerService, ModalModel, Types, UIState } from '@app/shared';
 
 @Component({
     selector: 'sqx-dashboard-config[app][config]',

frontend/src/app/features/dashboard/pages/dashboard-page.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { AfterViewInit, Component, NgZone, OnInit, Renderer2, ViewChild } from '@angular/core';
-import { AppsState, AuthService, CallsUsageDto, CurrentStorageDto, DateTime, defined, fadeAnimation, LocalStoreService, ResourceOwner, Settings, StorageUsagePerDateDto, switchSafe, UsagesService } from '@app/shared';
 import { GridsterComponent, GridsterConfig, GridsterItem, GridType } from 'angular-gridster2';
+import { AppsState, AuthService, CallsUsageDto, CurrentStorageDto, DateTime, defined, fadeAnimation, LocalStoreService, ResourceOwner, Settings, StorageUsagePerDateDto, switchSafe, UsagesService } from '@app/shared';
 
 @Component({
     selector: 'sqx-dashboard-page',

frontend/src/app/features/schemas/pages/schema/fields/types/boolean-validation.component.ts

@@ -7,8 +7,8 @@
 
 import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { BooleanFieldPropertiesDto, FieldDto, hasNoValue$, LanguageDto } from '@app/shared';
 import { Observable } from 'rxjs';
+import { BooleanFieldPropertiesDto, FieldDto, hasNoValue$, LanguageDto } from '@app/shared';
 
 @Component({
     selector: 'sqx-boolean-validation[field][fieldForm][languages][properties]',

frontend/src/app/features/schemas/pages/schema/fields/types/date-time-validation.component.ts

@@ -7,8 +7,8 @@
 
 import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { DateTimeFieldPropertiesDto, FieldDto, hasNoValue$, LanguageDto } from '@app/shared';
 import { Observable } from 'rxjs';
+import { DateTimeFieldPropertiesDto, FieldDto, hasNoValue$, LanguageDto } from '@app/shared';
 
 const CALCULATED_DEFAULT_VALUES: ReadonlyArray<string> = ['Now', 'Today'];
 

frontend/src/app/features/schemas/pages/schema/fields/types/number-ui.component.ts

@@ -7,8 +7,8 @@
 
 import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { FieldDto, FloatConverter, NumberFieldPropertiesDto, NUMBER_FIELD_EDITORS, ResourceOwner, valueProjection$ } from '@app/shared';
 import { Observable } from 'rxjs';
+import { FieldDto, FloatConverter, NumberFieldPropertiesDto, NUMBER_FIELD_EDITORS, ResourceOwner, valueProjection$ } from '@app/shared';
 
 @Component({
     selector: 'sqx-number-ui[field][fieldForm][properties]',

frontend/src/app/features/schemas/pages/schema/fields/types/string-ui.component.ts

@@ -7,8 +7,8 @@
 
 import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { FieldDto, ResourceOwner, StringFieldPropertiesDto, STRING_FIELD_EDITORS, valueProjection$ } from '@app/shared';
 import { Observable } from 'rxjs';
+import { FieldDto, ResourceOwner, StringFieldPropertiesDto, STRING_FIELD_EDITORS, valueProjection$ } from '@app/shared';
 
 @Component({
     selector: 'sqx-string-ui[field][fieldForm][properties]',

frontend/src/app/features/schemas/pages/schema/fields/types/string-validation.component.ts

@@ -7,8 +7,8 @@
 
 import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { AppSettingsDto, FieldDto, hasNoValue$, hasValue$, LanguageDto, ModalModel, PatternDto, ResourceOwner, RootFieldDto, SchemaDto, StringFieldPropertiesDto, STRING_CONTENT_TYPES, Types, value$ } from '@app/shared';
 import { Observable } from 'rxjs';
+import { AppSettingsDto, FieldDto, hasNoValue$, hasValue$, LanguageDto, ModalModel, PatternDto, ResourceOwner, RootFieldDto, SchemaDto, StringFieldPropertiesDto, STRING_CONTENT_TYPES, Types, value$ } from '@app/shared';
 
 @Component({
     selector: 'sqx-string-validation[field][fieldForm][languages][properties][schema][settings]',

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

@@ -7,8 +7,8 @@
 
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { defined, MessageBus, ModalModel, ResourceOwner, SchemaDto, SchemasState } from '@app/shared';
 import { map } from 'rxjs/operators';
+import { defined, MessageBus, ModalModel, ResourceOwner, SchemaDto, SchemasState } from '@app/shared';
 import { SchemaCloning } from './../messages';
 
 @Component({

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

@@ -6,8 +6,8 @@
  */
 
 import { Component, Input, OnChanges } from '@angular/core';
-import { AppsState, EditSchemaScriptsForm, SchemaCompletions, SchemaDto, SchemasService, SchemasState } from '@app/shared';
 import { EMPTY, Observable } from 'rxjs';
+import { AppsState, EditSchemaScriptsForm, SchemaCompletions, SchemaDto, SchemasService, SchemasState } from '@app/shared';
 
 @Component({
     selector: 'sqx-schema-scripts-form',

frontend/src/app/features/schemas/pages/schemas/schemas-page.component.ts

@@ -8,9 +8,9 @@
 import { Component, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
-import { CreateCategoryForm, DialogModel, getCategoryTree, MessageBus, ResourceOwner, SchemaCategory, SchemaDto, SchemasState, value$ } from '@app/shared';
 import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { CreateCategoryForm, DialogModel, getCategoryTree, MessageBus, ResourceOwner, SchemaCategory, SchemaDto, SchemasState, value$ } from '@app/shared';
 import { SchemaCloning } from './../messages';
 
 @Component({

frontend/src/app/features/settings/pages/asset-scripts/asset-scripts-page.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { AppsState, AssetCompletions, AssetScriptsState, AssetsService, EditAssetScriptsForm, ResourceOwner } from '@app/shared';
 import { EMPTY, Observable } from 'rxjs';
+import { AppsState, AssetCompletions, AssetScriptsState, AssetsService, EditAssetScriptsForm, ResourceOwner } from '@app/shared';
 
 @Component({
     selector: 'sqx-asset-scripts-page',

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

@@ -6,9 +6,9 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { ApiUrlConfig, BackupDto, BackupsState, ResourceOwner } from '@app/shared';
 import { timer } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
+import { ApiUrlConfig, BackupDto, BackupsState, ResourceOwner } from '@app/shared';
 
 @Component({
     selector: 'sqx-backups-page',

frontend/src/app/features/settings/pages/contributors/contributor-add-form.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { Component, Injectable, Input, OnChanges } from '@angular/core';
-import { AssignContributorForm, AutocompleteSource, ContributorsState, DialogModel, DialogService, RoleDto, UsersService } from '@app/shared';
 import { Observable, of } from 'rxjs';
 import { withLatestFrom } from 'rxjs/operators';
+import { AssignContributorForm, AutocompleteSource, ContributorsState, DialogModel, DialogService, RoleDto, UsersService } from '@app/shared';
 
 @Injectable()
 export class UsersDataSource implements AutocompleteSource {

frontend/src/app/features/settings/pages/contributors/import-contributors-dialog.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ContributorsState, ErrorDto, ImportContributorsForm, RoleDto } from '@app/shared';
 import { EMPTY, of } from 'rxjs';
 import { catchError, mergeMap, tap } from 'rxjs/operators';
+import { ContributorsState, ErrorDto, ImportContributorsForm, RoleDto } from '@app/shared';
 
 type ImportStatus = {
     email: string;

frontend/src/app/features/settings/pages/languages/language-add-form.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { AddLanguageForm, AutocompleteSource, LanguageDto, LanguagesState } from '@app/shared';
 import { Observable, of } from 'rxjs';
+import { AddLanguageForm, AutocompleteSource, LanguageDto, LanguagesState } from '@app/shared';
 
 class LanguageSource implements AutocompleteSource {
     constructor(

frontend/src/app/features/settings/pages/roles/roles-page.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { AppsState, AutocompleteSource, RoleDto, RolesService, RolesState, SchemasState } from '@app/shared';
 import { Observable, of } from 'rxjs';
+import { AppsState, AutocompleteSource, RoleDto, RolesService, RolesState, SchemasState } from '@app/shared';
 
 /* eslint-disable no-return-assign */
 

frontend/src/app/framework/angular/forms/confirm-click.directive.spec.ts

@@ -5,9 +5,9 @@
  * Copyright (c) Sebastian Stehle. All rights r vbeserved
  */
 
-import { DialogService } from '@app/framework/internal';
 import { of } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { DialogService } from '@app/framework/internal';
 import { ConfirmClickDirective } from './confirm-click.directive';
 
 describe('ConfirmClickDirective', () => {

frontend/src/app/framework/angular/forms/confirm-click.directive.ts

@@ -6,9 +6,9 @@
  */
 
 import { Directive, EventEmitter, HostListener, Input, Output } from '@angular/core';
-import { DialogService, Types } from '@app/framework/internal';
 import { Subscriber } from 'rxjs';
 import { take } from 'rxjs/operators';
+import { DialogService, Types } from '@app/framework/internal';
 
 @Directive({
     selector: '[sqxConfirmClick]',

frontend/src/app/framework/angular/forms/control-errors.component.ts

@@ -7,10 +7,10 @@
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Host, Input, OnChanges, OnDestroy, Optional } from '@angular/core';
 import { AbstractControl, FormArray, FormGroupDirective } from '@angular/forms';
-import { LocalizerService, StatefulComponent, Types } from '@app/framework/internal';
 import { merge } from 'rxjs';
-import { touchedChange$ } from './forms-helper';
+import { LocalizerService, StatefulComponent, Types } from '@app/framework/internal';
 import { formatError } from './error-formatting';
+import { touchedChange$ } from './forms-helper';
 
 interface State {
     // The error messages to show.

frontend/src/app/framework/angular/forms/editors/autocomplete.component.ts

@@ -7,9 +7,9 @@
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ElementRef, forwardRef, Input, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { Keys, ModalModel, RelativePosition, StatefulControlComponent, Types } from '@app/framework/internal';
 import { merge, Observable, of, Subject } from 'rxjs';
 import { catchError, debounceTime, finalize, map, switchMap, tap } from 'rxjs/operators';
+import { Keys, ModalModel, RelativePosition, StatefulControlComponent, Types } from '@app/framework/internal';
 
 export interface AutocompleteSource {
     find(query: string): Observable<ReadonlyArray<any>>;

frontend/src/app/framework/angular/forms/editors/code-editor.component.ts

@@ -7,9 +7,9 @@
 
 import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
-import { ResourceLoaderService, StatefulControlComponent, Types } from '@app/framework/internal';
 import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
+import { ResourceLoaderService, StatefulControlComponent, Types } from '@app/framework/internal';
 import { FocusComponent } from './../forms-helper';
 
 declare const ace: any;

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

@@ -7,8 +7,8 @@
 
 import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { DateHelper, DateTime, StatefulControlComponent, UIOptions } from '@app/framework/internal';
 import * as Pikaday from 'pikaday/pikaday';
+import { DateHelper, DateTime, StatefulControlComponent, UIOptions } from '@app/framework/internal';
 import { FocusComponent } from './../forms-helper';
 
 declare module 'pikaday/pikaday';

frontend/src/app/framework/angular/forms/editors/dropdown.component.ts

@@ -7,8 +7,8 @@
 
 import { AfterContentInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChildren, EventEmitter, forwardRef, Input, OnChanges, OnInit, Output, QueryList, SimpleChanges, TemplateRef } from '@angular/core';
 import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { Keys, ModalModel, StatefulControlComponent, Types } from '@app/framework/internal';
 import { map } from 'rxjs/operators';
+import { Keys, ModalModel, StatefulControlComponent, Types } from '@app/framework/internal';
 
 export const SQX_DROPDOWN_CONTROL_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => DropdownComponent), multi: true,

frontend/src/app/framework/angular/forms/editors/tag-editor.component.ts

@@ -7,8 +7,8 @@
 
 import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
 import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { getTagValues, Keys, ModalModel, StatefulControlComponent, StringConverter, TagValue, Types } from '@app/framework/internal';
 import { distinctUntilChanged, map, tap } from 'rxjs/operators';
+import { getTagValues, Keys, ModalModel, StatefulControlComponent, StringConverter, TagValue, Types } from '@app/framework/internal';
 
 export const SQX_TAG_EDITOR_CONTROL_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => TagEditorComponent), multi: true,

frontend/src/app/framework/angular/forms/transform-input.directive.ts

@@ -7,8 +7,8 @@
 
 import { Directive, ElementRef, forwardRef, HostListener, Input, Renderer2 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { Types } from '@app/framework/internal';
 import slugify from 'slugify';
+import { Types } from '@app/framework/internal';
 
 type Transform = (value: string) => string;
 

frontend/src/app/framework/angular/http/caching.interceptor.ts

@@ -7,9 +7,9 @@
 
 import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest, HttpResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Types } from '@app/framework/internal';
 import { Observable, of, throwError } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
+import { Types } from '@app/framework/internal';
 
 @Injectable()
 export class CachingInterceptor implements HttpInterceptor {

frontend/src/app/framework/angular/http/http-extensions.ts

@@ -8,9 +8,9 @@
 /* eslint-disable no-inner-declarations */
 
 import { HttpClient, HttpErrorResponse, HttpEvent, HttpHeaders, HttpRequest, HttpResponse } from '@angular/common/http';
-import { ErrorDto, Types, Version, Versioned } from '@app/framework/internal';
 import { Observable, throwError } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
+import { ErrorDto, Types, Version, Versioned } from '@app/framework/internal';
 
 export module HTTP {
     export function upload<T = any>(http: HttpClient, method: string, url: string, file: Blob, version?: Version): Observable<HttpEvent<T>> {

frontend/src/app/framework/angular/http/loading.interceptor.ts

@@ -7,9 +7,9 @@
 
 import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { LoadingService, MathHelper } from '@app/framework/internal';
 import { Observable } from 'rxjs';
 import { finalize } from 'rxjs/operators';
+import { LoadingService, MathHelper } from '@app/framework/internal';
 
 @Injectable()
 export class LoadingInterceptor implements HttpInterceptor {

frontend/src/app/framework/angular/modals/dialog-renderer.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core';
-import { DialogModel, DialogRequest, DialogService, fadeAnimation, Notification, StatefulComponent, Tooltip } from '@app/framework/internal';
 import { timer } from 'rxjs';
+import { DialogModel, DialogRequest, DialogService, fadeAnimation, Notification, StatefulComponent, Tooltip } from '@app/framework/internal';
 
 interface State {
     // The pending dialog request.

frontend/src/app/framework/angular/modals/modal-placement.directive.ts

@@ -6,8 +6,8 @@
  */
 
 import { AfterViewInit, Directive, ElementRef, Input, OnDestroy, Renderer2 } from '@angular/core';
-import { AnchorX, AnchorY, computeAnchors, positionModal, PositionRequest, RelativePosition, ResourceOwner } from '@app/framework/internal';
 import { timer } from 'rxjs';
+import { AnchorX, AnchorY, computeAnchors, positionModal, PositionRequest, RelativePosition, ResourceOwner } from '@app/framework/internal';
 
 @Directive({
     selector: '[sqxAnchoredTo]',

frontend/src/app/framework/angular/modals/onboarding-tooltip.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, Renderer2 } from '@angular/core';
-import { DialogModel, fadeAnimation, OnboardingService, RelativePosition, StatefulComponent, Types } from '@app/framework/internal';
 import { timer } from 'rxjs';
+import { DialogModel, fadeAnimation, OnboardingService, RelativePosition, StatefulComponent, Types } from '@app/framework/internal';
 
 @Component({
     selector: 'sqx-onboarding-tooltip',

frontend/src/app/framework/angular/routers/router-2-state.spec.ts

@@ -6,8 +6,8 @@
  */
 
 import { NavigationExtras, Params, Router } from '@angular/router';
-import { LocalStoreService } from '@app/framework/internal';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { LocalStoreService } from '@app/framework/internal';
 import { State } from './../../state';
 import { PagingSynchronizer, QueryParams, Router2State, StringKeysSynchronizer, StringSynchronizer } from './router-2-state';
 

frontend/src/app/framework/angular/routers/router-2-state.ts

@@ -7,9 +7,9 @@
 
 import { Injectable, OnDestroy } from '@angular/core';
 import { ActivatedRoute, Params, Router } from '@angular/router';
+import { Subscription } from 'rxjs';
 import { LocalStoreService, Types } from '@app/framework/internal';
 import { State } from '@app/framework/state';
-import { Subscription } from 'rxjs';
 
 export type QueryParams = { [name: string]: string };
 

frontend/src/app/framework/services/dialog.service.ts

@@ -7,8 +7,8 @@
 
 import { Injectable } from '@angular/core';
 import { Observable, ReplaySubject, Subject, throwError } from 'rxjs';
-import { RelativePosition } from './../utils/modal-positioner';
 import { ErrorDto } from './../utils/error';
+import { RelativePosition } from './../utils/modal-positioner';
 import { Types } from './../utils/types';
 import { LocalStoreService } from './local-store.service';
 

frontend/src/app/shared/components/assets/asset-dialog.component.ts

@@ -6,11 +6,11 @@
  */
 
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, QueryList, ViewChildren } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { AnnotateAssetDto, AnnotateAssetForm, AppsState, AssetDto, AssetsState, AssetUploaderState, AuthService, DialogService, Types, UploadCanceled } from '@app/shared/internal';
 import { AssetsService } from '@app/shared/services/assets.service';
 import { AssetPathItem, ROOT_ITEM } from '@app/shared/state/assets.state';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
 import { AssetTextEditorComponent } from './asset-text-editor.component';
 import { ImageCropperComponent } from './image-cropper.component';
 import { ImageFocusPointComponent } from './image-focus-point.component';

frontend/src/app/shared/components/assets/asset-history.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { Component, Input, OnChanges } from '@angular/core';
-import { AppsState, AssetDto, HistoryEventDto, HistoryService } from '@app/shared/internal';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { AppsState, AssetDto, HistoryEventDto, HistoryService } from '@app/shared/internal';
 
 interface AssetEvent { event: HistoryEventDto; version: number; canDownload: boolean }
 

frontend/src/app/shared/components/assets/image-cropper.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnChanges, OnDestroy, ViewChild } from '@angular/core';
-import { Types } from '@app/framework';
 import Cropper from 'cropperjs';
+import { Types } from '@app/framework';
 
 @Component({
     selector: 'sqx-image-editor',

frontend/src/app/shared/components/assets/image-focus-point.component.ts

@@ -6,9 +6,9 @@
  */
 
 import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnChanges, OnDestroy, ViewChild } from '@angular/core';
+import { FocusedImage, FocusPicker } from 'image-focus';
 import { Types } from '@app/framework';
 import { AnnotateAssetDto, AssetDto } from '@app/shared/services/assets.service';
-import { FocusedImage, FocusPicker } from 'image-focus';
 
 @Component({
     selector: 'sqx-image-focus-point',

frontend/src/app/shared/components/comments/comment.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges } from '@angular/core';
-import { CommentDto, CommentsState, ContributorDto, DialogService, Keys, StatefulComponent } from '@app/shared/internal';
 import { MentionConfig } from 'angular-mentions';
+import { CommentDto, CommentsState, ContributorDto, DialogService, Keys, StatefulComponent } from '@app/shared/internal';
 
 interface State {
     isEditing: boolean;

frontend/src/app/shared/components/comments/comments.component.ts

@@ -7,10 +7,10 @@
 
 import { ChangeDetectorRef, Component, ElementRef, Input, OnChanges, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { Router } from '@angular/router';
-import { switchSafe } from '@app/framework';
-import { AppsState, AuthService, CommentDto, CommentsService, CommentsState, ContributorsState, DialogService, ResourceOwner, UpsertCommentForm } from '@app/shared/internal';
 import { MentionConfig } from 'angular-mentions';
 import { timer } from 'rxjs';
+import { switchSafe } from '@app/framework';
+import { AppsState, AuthService, CommentDto, CommentsService, CommentsState, ContributorsState, DialogService, ResourceOwner, UpsertCommentForm } from '@app/shared/internal';
 import { CommentComponent } from './comment.component';
 
 @Component({

frontend/src/app/shared/components/forms/markdown-editor.component.ts

@@ -7,8 +7,8 @@
 
 import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, ViewChild } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
-import { ApiUrlConfig, AssetDto, AssetUploaderState, DialogModel, ResourceLoaderService, StatefulControlComponent, Types, UploadCanceled } from '@app/shared/internal';
 import { marked } from 'marked';
+import { ApiUrlConfig, AssetDto, AssetUploaderState, DialogModel, ResourceLoaderService, StatefulControlComponent, Types, UploadCanceled } from '@app/shared/internal';
 
 declare const SimpleMDE: any;
 

frontend/src/app/shared/components/history/history.component.ts

@@ -7,9 +7,9 @@
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { allParams, AppsState, HistoryChannelUpdated, HistoryEventDto, HistoryService, MessageBus, switchSafe } from '@app/shared/internal';
 import { merge, Observable, timer } from 'rxjs';
 import { delay } from 'rxjs/operators';
+import { allParams, AppsState, HistoryChannelUpdated, HistoryEventDto, HistoryService, MessageBus, switchSafe } from '@app/shared/internal';
 
 @Component({
     selector: 'sqx-history',

frontend/src/app/shared/components/history/pipes.ts

@@ -6,8 +6,8 @@
  */
 
 import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
-import { formatHistoryMessage, HistoryEventDto, UsersProviderService } from '@app/shared/internal';
 import { Subscription } from 'rxjs';
+import { formatHistoryMessage, HistoryEventDto, UsersProviderService } from '@app/shared/internal';
 
 @Pipe({
     name: 'sqxHistoryMessage',

frontend/src/app/shared/components/pipes.ts

@@ -6,9 +6,9 @@
  */
 
 import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core';
-import { ApiUrlConfig, UserDto, UsersProviderService } from '@app/shared/internal';
 import { Observable, of, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { ApiUrlConfig, UserDto, UsersProviderService } from '@app/shared/internal';
 
 class UserAsyncPipe {
     private lastUserId?: string;

frontend/src/app/shared/components/search/search-form.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { DialogModel, equalsQuery, hasFilter, LanguageDto, Queries, Query, QueryModel, SaveQueryForm, Types } from '@app/shared/internal';
 import { Observable } from 'rxjs';
+import { DialogModel, equalsQuery, hasFilter, LanguageDto, Queries, Query, QueryModel, SaveQueryForm, Types } from '@app/shared/internal';
 
 @Component({
     selector: 'sqx-search-form',

frontend/src/app/shared/components/watching-users.component.ts

@@ -6,8 +6,8 @@
  */
 
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { AppsState, CommentsService, switchSafe } from '@app/shared/internal';
 import { timer } from 'rxjs';
+import { AppsState, CommentsService, switchSafe } from '@app/shared/internal';
 
 @Component({
     selector: 'sqx-watching-users[resource]',

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

@@ -6,9 +6,9 @@
  */
 
 import { Router } from '@angular/router';
-import { AppsState } from '@app/shared';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
+import { AppsState } from '@app/shared';
 import { AppMustExistGuard } from './app-must-exist.guard';
 
 describe('AppMustExistGuard', () => {

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

@@ -6,9 +6,9 @@
  */
 
 import { Router } from '@angular/router';
-import { ContentDto, ContentsState } from '@app/shared/internal';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { ContentDto, ContentsState } from '@app/shared/internal';
 import { ContentMustExistGuard } from './content-must-exist.guard';
 
 describe('ContentMustExistGuard', () => {

frontend/src/app/shared/guards/content-must-exist.guard.ts

@@ -7,9 +7,9 @@
 
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
-import { allParams } from '@app/framework';
 import { Observable } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
+import { allParams } from '@app/framework';
 import { ContentsState } from './../state/contents.state';
 
 @Injectable()

frontend/src/app/shared/guards/load-apps.guard.spec.ts

@@ -5,9 +5,9 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { AppsState } from '@app/shared';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
+import { AppsState } from '@app/shared';
 import { LoadAppsGuard } from './load-apps.guard';
 
 describe('LoadAppsGuard', () => {

frontend/src/app/shared/guards/load-languages.guard.spec.ts

@@ -5,9 +5,9 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { LanguagesState } from '@app/shared';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
+import { LanguagesState } from '@app/shared';
 import { LoadLanguagesGuard } from './load-languages.guard';
 
 describe('LoadLanguagesGuard', () => {

frontend/src/app/shared/guards/load-schemas.guard.spec.ts

@@ -5,9 +5,9 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { SchemasState } from '@app/shared';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
+import { SchemasState } from '@app/shared';
 import { LoadSchemasGuard } from './load-schemas.guard';
 
 describe('LoadSchemasGuard', () => {

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

@@ -6,9 +6,9 @@
  */
 
 import { Router } from '@angular/router';
-import { AuthService, UIOptions } from '@app/shared';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { AuthService, UIOptions } from '@app/shared';
 import { MustBeAuthenticatedGuard } from './must-be-authenticated.guard';
 
 describe('MustBeAuthenticatedGuard', () => {

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

@@ -7,9 +7,9 @@
 
 import { Injectable } from '@angular/core';
 import { CanActivate, Router } from '@angular/router';
-import { UIOptions } from '@app/framework';
 import { Observable } from 'rxjs';
 import { map, take, tap } from 'rxjs/operators';
+import { UIOptions } from '@app/framework';
 import { AuthService } from './../services/auth.service';
 
 @Injectable()

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

@@ -6,9 +6,9 @@
  */
 
 import { Router } from '@angular/router';
-import { AuthService, UIOptions } from '@app/shared';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { AuthService, UIOptions } from '@app/shared';
 import { MustBeNotAuthenticatedGuard } from './must-be-not-authenticated.guard';
 
 describe('MustBeNotAuthenticatedGuard', () => {

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

@@ -7,9 +7,9 @@
 
 import { Injectable } from '@angular/core';
 import { CanActivate, Router } from '@angular/router';
-import { UIOptions } from '@app/framework';
 import { Observable } from 'rxjs';
 import { map, take, tap } from 'rxjs/operators';
+import { UIOptions } from '@app/framework';
 import { AuthService } from './../services/auth.service';
 
 @Injectable()

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

@@ -6,9 +6,9 @@
  */
 
 import { Router } from '@angular/router';
-import { RuleDto, RulesState } from '@app/shared/internal';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { RuleDto, RulesState } from '@app/shared/internal';
 import { RuleMustExistGuard } from './rule-must-exist.guard';
 
 describe('RuleMustExistGuard', () => {

frontend/src/app/shared/guards/rule-must-exist.guard.ts

@@ -7,9 +7,9 @@
 
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
-import { allParams } from '@app/framework';
 import { Observable } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
+import { allParams } from '@app/framework';
 import { RulesState } from './../state/rules.state';
 
 @Injectable()

frontend/src/app/shared/guards/schema-must-exist-published.guard.spec.ts

@@ -6,9 +6,9 @@
  */
 
 import { Router } from '@angular/router';
-import { SchemaDto, SchemasState } from '@app/shared/internal';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { SchemaDto, SchemasState } from '@app/shared/internal';
 import { SchemaMustExistPublishedGuard } from './schema-must-exist-published.guard';
 
 describe('SchemaMustExistPublishedGuard', () => {

frontend/src/app/shared/guards/schema-must-exist-published.guard.ts

@@ -7,9 +7,9 @@
 
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
-import { allParams } from '@app/framework';
 import { Observable } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
+import { allParams } from '@app/framework';
 import { SchemasState } from './../state/schemas.state';
 
 @Injectable()

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

@@ -6,9 +6,9 @@
  */
 
 import { Router } from '@angular/router';
-import { SchemaDto, SchemasState } from '@app/shared/internal';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
+import { SchemaDto, SchemasState } from '@app/shared/internal';
 import { SchemaMustExistGuard } from './schema-must-exist.guard';
 
 describe('SchemaMustExistGuard', () => {

frontend/src/app/shared/guards/schema-must-exist.guard.ts

@@ -7,9 +7,9 @@
 
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router';
-import { allParams } from '@app/framework';
 import { Observable } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
+import { allParams } from '@app/framework';
 import { SchemasState } from './../state/schemas.state';
 
 @Injectable()

frontend/src/app/shared/guards/schema-must-not-be-singleton.guard.spec.ts

@@ -6,9 +6,9 @@
  */
 
 import { Router, RouterStateSnapshot, UrlSegment } from '@angular/router';
-import { SchemaDto, SchemasState } from '@app/shared/internal';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, It, Mock, Times } from 'typemoq';
+import { SchemaDto, SchemasState } from '@app/shared/internal';
 import { SchemaMustNotBeSingletonGuard } from './schema-must-not-be-singleton.guard';
 
 describe('SchemaMustNotBeSingletonGuard', () => {

frontend/src/app/shared/guards/schema-must-not-be-singleton.guard.ts

@@ -7,9 +7,9 @@
 
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
-import { defined } from '@app/framework';
 import { Observable } from 'rxjs';
 import { map, take, tap } from 'rxjs/operators';
+import { defined } from '@app/framework';
 import { SchemasState } from './../state/schemas.state';
 
 @Injectable()

frontend/src/app/shared/guards/unset-app.guard.spec.ts

@@ -5,9 +5,9 @@
  * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
  */
 
-import { AppsState } from '@app/shared/internal';
 import { firstValueFrom, of } from 'rxjs';
 import { IMock, Mock, Times } from 'typemoq';
+import { AppsState } from '@app/shared/internal';
 import { UnsetAppGuard } from './unset-app.guard';
 
 describe('UnsetAppGuard', () => {

frontend/src/app/shared/interceptors/auth.interceptor.spec.ts

@@ -9,10 +9,10 @@ import { HttpClient, HttpHeaders, HTTP_INTERCEPTORS } from '@angular/common/http
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
-import { ApiUrlConfig, AuthService } from '@app/shared/internal';
 import { of } from 'rxjs';
 import { onErrorResumeNext } from 'rxjs/operators';
 import { IMock, Mock, Times } from 'typemoq';
+import { ApiUrlConfig, AuthService } from '@app/shared/internal';
 import { AuthInterceptor } from './auth.interceptor';
 
 describe('AuthInterceptor', () => {