diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 9ff59addb..dfd745a5e 100644 --- a/frontend/.eslintrc.js +++ b/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", diff --git a/frontend/package.json b/frontend/package.json index 5552057aa..8d1934aa2 100644 --- a/frontend/package.json +++ b/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", diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 467473113..8a79d6bca 100644 --- a/frontend/src/app/app.module.ts +++ b/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); diff --git a/frontend/src/app/features/administration/guards/user-must-exist.guard.spec.ts b/frontend/src/app/features/administration/guards/user-must-exist.guard.spec.ts index 10185f590..592548b45 100644 --- a/frontend/src/app/features/administration/guards/user-must-exist.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/features/administration/guards/user-must-exist.guard.ts b/frontend/src/app/features/administration/guards/user-must-exist.guard.ts index f5113a357..684db8666 100644 --- a/frontend/src/app/features/administration/guards/user-must-exist.guard.ts +++ b/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 { diff --git a/frontend/src/app/features/administration/pages/event-consumers/event-consumers-page.component.ts b/frontend/src/app/features/administration/pages/event-consumers/event-consumers-page.component.ts index f0fd8a783..5ecdb6517 100644 --- a/frontend/src/app/features/administration/pages/event-consumers/event-consumers-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/administration/pages/restore/restore-page.component.ts b/frontend/src/app/features/administration/pages/restore/restore-page.component.ts index 8347f17b1..1ca8662ff 100644 --- a/frontend/src/app/features/administration/pages/restore/restore-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/administration/services/event-consumers.service.ts b/frontend/src/app/features/administration/services/event-consumers.service.ts index 0fd448640..33bca9d7c 100644 --- a/frontend/src/app/features/administration/services/event-consumers.service.ts +++ b/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; diff --git a/frontend/src/app/features/administration/services/users.service.ts b/frontend/src/app/features/administration/services/users.service.ts index b4d70ceb0..75ca87049 100644 --- a/frontend/src/app/features/administration/services/users.service.ts +++ b/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 { public get canCreate() { diff --git a/frontend/src/app/features/administration/state/event-consumers.state.spec.ts b/frontend/src/app/features/administration/state/event-consumers.state.spec.ts index 8e8b032e0..8ccd67098 100644 --- a/frontend/src/app/features/administration/state/event-consumers.state.spec.ts +++ b/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'; diff --git a/frontend/src/app/features/administration/state/event-consumers.state.ts b/frontend/src/app/features/administration/state/event-consumers.state.ts index e6e743cc3..e572360b8 100644 --- a/frontend/src/app/features/administration/state/event-consumers.state.ts +++ b/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 { diff --git a/frontend/src/app/features/administration/state/users.state.spec.ts b/frontend/src/app/features/administration/state/users.state.spec.ts index 78ff14814..59b839d96 100644 --- a/frontend/src/app/features/administration/state/users.state.spec.ts +++ b/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'; diff --git a/frontend/src/app/features/administration/state/users.state.ts b/frontend/src/app/features/administration/state/users.state.ts index 7229ac8a6..2a423e4f5 100644 --- a/frontend/src/app/features/administration/state/users.state.ts +++ b/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 { diff --git a/frontend/src/app/features/api/pages/graphql/graphql-page.component.ts b/frontend/src/app/features/api/pages/graphql/graphql-page.component.ts index deb67d475..fefb5c54e 100644 --- a/frontend/src/app/features/api/pages/graphql/graphql-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/apps/pages/apps-page.component.ts b/frontend/src/app/features/apps/pages/apps-page.component.ts index e8c44203d..535080eda 100644 --- a/frontend/src/app/features/apps/pages/apps-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/content/module.ts b/frontend/src/app/features/content/module.ts index 5747796f5..be42655f5 100644 --- a/frontend/src/app/features/content/module.ts +++ b/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 = [ diff --git a/frontend/src/app/features/content/pages/content/content-history-page.component.ts b/frontend/src/app/features/content/pages/content/content-history-page.component.ts index ab4ce2043..be92f9fdb 100644 --- a/frontend/src/app/features/content/pages/content/content-history-page.component.ts +++ b/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'; diff --git a/frontend/src/app/features/content/pages/content/content-page.component.ts b/frontend/src/app/features/content/pages/content/content-page.component.ts index 045999a50..bb7c5d29c 100644 --- a/frontend/src/app/features/content/pages/content/content-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/content/pages/content/editor/content-field.component.ts b/frontend/src/app/features/content/pages/content/editor/content-field.component.ts index c6a4ec92f..50f561051 100644 --- a/frontend/src/app/features/content/pages/content/editor/content-field.component.ts +++ b/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]', diff --git a/frontend/src/app/features/content/pages/content/inspecting/content-inspection.component.ts b/frontend/src/app/features/content/pages/content/inspecting/content-inspection.component.ts index 5de7cb9cf..fb86f024e 100644 --- a/frontend/src/app/features/content/pages/content/inspecting/content-inspection.component.ts +++ b/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'; diff --git a/frontend/src/app/features/content/pages/contents/contents-filters-page.component.ts b/frontend/src/app/features/content/pages/contents/contents-filters-page.component.ts index 2ea4dec9b..13afe1bce 100644 --- a/frontend/src/app/features/content/pages/contents/contents-filters-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/content/pages/contents/contents-page.component.ts b/frontend/src/app/features/content/pages/contents/contents-page.component.ts index 19a8631e4..770aaefa7 100644 --- a/frontend/src/app/features/content/pages/contents/contents-page.component.ts +++ b/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({ diff --git a/frontend/src/app/features/content/pages/schemas/schemas-page.component.ts b/frontend/src/app/features/content/pages/schemas/schemas-page.component.ts index b95b84a1a..fcbbd187c 100644 --- a/frontend/src/app/features/content/pages/schemas/schemas-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/content/pages/sidebar/sidebar-page.component.ts b/frontend/src/app/features/content/pages/sidebar/sidebar-page.component.ts index 318ecfe8b..d13f8d2b8 100644 --- a/frontend/src/app/features/content/pages/sidebar/sidebar-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/content/shared/due-time-selector.component.ts b/frontend/src/app/features/content/shared/due-time-selector.component.ts index 2d47652e2..1dc45f8a5 100644 --- a/frontend/src/app/features/content/shared/due-time-selector.component.ts +++ b/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'; diff --git a/frontend/src/app/features/content/shared/forms/array-editor.component.ts b/frontend/src/app/features/content/shared/forms/array-editor.component.ts index 52e26e3b9..3fc3050c2 100644 --- a/frontend/src/app/features/content/shared/forms/array-editor.component.ts +++ b/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({ diff --git a/frontend/src/app/features/content/shared/forms/array-item.component.ts b/frontend/src/app/features/content/shared/forms/array-item.component.ts index e88b0f4f7..21380b9f2 100644 --- a/frontend/src/app/features/content/shared/forms/array-item.component.ts +++ b/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 { diff --git a/frontend/src/app/features/content/shared/forms/field-editor.component.ts b/frontend/src/app/features/content/shared/forms/field-editor.component.ts index e040b7eac..40659c6bd 100644 --- a/frontend/src/app/features/content/shared/forms/field-editor.component.ts +++ b/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]', diff --git a/frontend/src/app/features/content/shared/forms/stock-photo-editor.component.ts b/frontend/src/app/features/content/shared/forms/stock-photo-editor.component.ts index c47bd4ab1..3c7f8e999 100644 --- a/frontend/src/app/features/content/shared/forms/stock-photo-editor.component.ts +++ b/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, diff --git a/frontend/src/app/features/content/shared/preview-button.component.ts b/frontend/src/app/features/content/shared/preview-button.component.ts index 9f2052e5d..8da47700c 100644 --- a/frontend/src/app/features/content/shared/preview-button.component.ts +++ b/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. diff --git a/frontend/src/app/features/content/shared/references/reference-dropdown.component.ts b/frontend/src/app/features/content/shared/references/reference-dropdown.component.ts index 16ac29c4e..399740d52 100644 --- a/frontend/src/app/features/content/shared/references/reference-dropdown.component.ts +++ b/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, diff --git a/frontend/src/app/features/content/shared/references/references-tags.component.ts b/frontend/src/app/features/content/shared/references/references-tags.component.ts index 90f35600c..334438276 100644 --- a/frontend/src/app/features/content/shared/references/references-tags.component.ts +++ b/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 = { diff --git a/frontend/src/app/features/dashboard/module.ts b/frontend/src/app/features/dashboard/module.ts index 8a2298017..8b9f6f483 100644 --- a/frontend/src/app/features/dashboard/module.ts +++ b/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 = [ diff --git a/frontend/src/app/features/dashboard/pages/cards/history-card.component.ts b/frontend/src/app/features/dashboard/pages/cards/history-card.component.ts index 975c615d8..a2628495a 100644 --- a/frontend/src/app/features/dashboard/pages/cards/history-card.component.ts +++ b/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]', diff --git a/frontend/src/app/features/dashboard/pages/dashboard-config.component.ts b/frontend/src/app/features/dashboard/pages/dashboard-config.component.ts index 145c17885..05ff790c8 100644 --- a/frontend/src/app/features/dashboard/pages/dashboard-config.component.ts +++ b/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]', diff --git a/frontend/src/app/features/dashboard/pages/dashboard-page.component.ts b/frontend/src/app/features/dashboard/pages/dashboard-page.component.ts index 471cb7429..3656bf8e7 100644 --- a/frontend/src/app/features/dashboard/pages/dashboard-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/schemas/pages/schema/fields/types/boolean-validation.component.ts b/frontend/src/app/features/schemas/pages/schema/fields/types/boolean-validation.component.ts index 43ea0045f..d81688924 100644 --- a/frontend/src/app/features/schemas/pages/schema/fields/types/boolean-validation.component.ts +++ b/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]', diff --git a/frontend/src/app/features/schemas/pages/schema/fields/types/date-time-validation.component.ts b/frontend/src/app/features/schemas/pages/schema/fields/types/date-time-validation.component.ts index d255be247..beac5f9df 100644 --- a/frontend/src/app/features/schemas/pages/schema/fields/types/date-time-validation.component.ts +++ b/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 = ['Now', 'Today']; diff --git a/frontend/src/app/features/schemas/pages/schema/fields/types/number-ui.component.ts b/frontend/src/app/features/schemas/pages/schema/fields/types/number-ui.component.ts index 59da12e03..7c0e4cb74 100644 --- a/frontend/src/app/features/schemas/pages/schema/fields/types/number-ui.component.ts +++ b/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]', diff --git a/frontend/src/app/features/schemas/pages/schema/fields/types/string-ui.component.ts b/frontend/src/app/features/schemas/pages/schema/fields/types/string-ui.component.ts index 90a931e06..70aac478f 100644 --- a/frontend/src/app/features/schemas/pages/schema/fields/types/string-ui.component.ts +++ b/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]', diff --git a/frontend/src/app/features/schemas/pages/schema/fields/types/string-validation.component.ts b/frontend/src/app/features/schemas/pages/schema/fields/types/string-validation.component.ts index 6fa1614cb..545f9b2dd 100644 --- a/frontend/src/app/features/schemas/pages/schema/fields/types/string-validation.component.ts +++ b/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]', diff --git a/frontend/src/app/features/schemas/pages/schema/schema-page.component.ts b/frontend/src/app/features/schemas/pages/schema/schema-page.component.ts index 193bc92d7..e8286175b 100644 --- a/frontend/src/app/features/schemas/pages/schema/schema-page.component.ts +++ b/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({ diff --git a/frontend/src/app/features/schemas/pages/schema/scripts/schema-scripts-form.component.ts b/frontend/src/app/features/schemas/pages/schema/scripts/schema-scripts-form.component.ts index 5d0531248..81327a766 100644 --- a/frontend/src/app/features/schemas/pages/schema/scripts/schema-scripts-form.component.ts +++ b/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', diff --git a/frontend/src/app/features/schemas/pages/schemas/schemas-page.component.ts b/frontend/src/app/features/schemas/pages/schemas/schemas-page.component.ts index f25c6d319..24f84ba6f 100644 --- a/frontend/src/app/features/schemas/pages/schemas/schemas-page.component.ts +++ b/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({ diff --git a/frontend/src/app/features/settings/pages/asset-scripts/asset-scripts-page.component.ts b/frontend/src/app/features/settings/pages/asset-scripts/asset-scripts-page.component.ts index b2804b31a..30c3f7718 100644 --- a/frontend/src/app/features/settings/pages/asset-scripts/asset-scripts-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/settings/pages/backups/backups-page.component.ts b/frontend/src/app/features/settings/pages/backups/backups-page.component.ts index 1b2dac03b..d5b85844e 100644 --- a/frontend/src/app/features/settings/pages/backups/backups-page.component.ts +++ b/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', diff --git a/frontend/src/app/features/settings/pages/contributors/contributor-add-form.component.ts b/frontend/src/app/features/settings/pages/contributors/contributor-add-form.component.ts index 15e164155..668de7a99 100644 --- a/frontend/src/app/features/settings/pages/contributors/contributor-add-form.component.ts +++ b/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 { diff --git a/frontend/src/app/features/settings/pages/contributors/import-contributors-dialog.component.ts b/frontend/src/app/features/settings/pages/contributors/import-contributors-dialog.component.ts index 55f80607e..12eab1569 100644 --- a/frontend/src/app/features/settings/pages/contributors/import-contributors-dialog.component.ts +++ b/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; diff --git a/frontend/src/app/features/settings/pages/languages/language-add-form.component.ts b/frontend/src/app/features/settings/pages/languages/language-add-form.component.ts index 1925bd019..0cb51e3cb 100644 --- a/frontend/src/app/features/settings/pages/languages/language-add-form.component.ts +++ b/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( diff --git a/frontend/src/app/features/settings/pages/roles/roles-page.component.ts b/frontend/src/app/features/settings/pages/roles/roles-page.component.ts index 69acc4185..b17961e81 100644 --- a/frontend/src/app/features/settings/pages/roles/roles-page.component.ts +++ b/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 */ diff --git a/frontend/src/app/framework/angular/forms/confirm-click.directive.spec.ts b/frontend/src/app/framework/angular/forms/confirm-click.directive.spec.ts index 900ac310d..4df587324 100644 --- a/frontend/src/app/framework/angular/forms/confirm-click.directive.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/framework/angular/forms/confirm-click.directive.ts b/frontend/src/app/framework/angular/forms/confirm-click.directive.ts index 633c404c3..41b8899c6 100644 --- a/frontend/src/app/framework/angular/forms/confirm-click.directive.ts +++ b/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]', diff --git a/frontend/src/app/framework/angular/forms/control-errors.component.ts b/frontend/src/app/framework/angular/forms/control-errors.component.ts index 126128b25..675b4916a 100644 --- a/frontend/src/app/framework/angular/forms/control-errors.component.ts +++ b/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. diff --git a/frontend/src/app/framework/angular/forms/editors/autocomplete.component.ts b/frontend/src/app/framework/angular/forms/editors/autocomplete.component.ts index 6197b569d..4a4ce6f54 100644 --- a/frontend/src/app/framework/angular/forms/editors/autocomplete.component.ts +++ b/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>; diff --git a/frontend/src/app/framework/angular/forms/editors/code-editor.component.ts b/frontend/src/app/framework/angular/forms/editors/code-editor.component.ts index 77b3c0b2b..9378fe87f 100644 --- a/frontend/src/app/framework/angular/forms/editors/code-editor.component.ts +++ b/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; diff --git a/frontend/src/app/framework/angular/forms/editors/date-time-editor.component.ts b/frontend/src/app/framework/angular/forms/editors/date-time-editor.component.ts index 5eb9b2db8..1c0e31e5c 100644 --- a/frontend/src/app/framework/angular/forms/editors/date-time-editor.component.ts +++ b/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'; diff --git a/frontend/src/app/framework/angular/forms/editors/dropdown.component.ts b/frontend/src/app/framework/angular/forms/editors/dropdown.component.ts index 1e3a02ad0..985318da2 100644 --- a/frontend/src/app/framework/angular/forms/editors/dropdown.component.ts +++ b/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, diff --git a/frontend/src/app/framework/angular/forms/editors/tag-editor.component.ts b/frontend/src/app/framework/angular/forms/editors/tag-editor.component.ts index d916baa5b..218103dc8 100644 --- a/frontend/src/app/framework/angular/forms/editors/tag-editor.component.ts +++ b/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, diff --git a/frontend/src/app/framework/angular/forms/transform-input.directive.ts b/frontend/src/app/framework/angular/forms/transform-input.directive.ts index 16b7b3bdb..5211de271 100644 --- a/frontend/src/app/framework/angular/forms/transform-input.directive.ts +++ b/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; diff --git a/frontend/src/app/framework/angular/http/caching.interceptor.ts b/frontend/src/app/framework/angular/http/caching.interceptor.ts index 9a8bc88ff..63aae1adb 100644 --- a/frontend/src/app/framework/angular/http/caching.interceptor.ts +++ b/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 { diff --git a/frontend/src/app/framework/angular/http/http-extensions.ts b/frontend/src/app/framework/angular/http/http-extensions.ts index 6f0531ce0..fb6876fe0 100644 --- a/frontend/src/app/framework/angular/http/http-extensions.ts +++ b/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(http: HttpClient, method: string, url: string, file: Blob, version?: Version): Observable> { diff --git a/frontend/src/app/framework/angular/http/loading.interceptor.ts b/frontend/src/app/framework/angular/http/loading.interceptor.ts index cbc024b78..881a17beb 100644 --- a/frontend/src/app/framework/angular/http/loading.interceptor.ts +++ b/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 { diff --git a/frontend/src/app/framework/angular/modals/dialog-renderer.component.ts b/frontend/src/app/framework/angular/modals/dialog-renderer.component.ts index 27b5275ad..c8cbda78f 100644 --- a/frontend/src/app/framework/angular/modals/dialog-renderer.component.ts +++ b/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. diff --git a/frontend/src/app/framework/angular/modals/modal-placement.directive.ts b/frontend/src/app/framework/angular/modals/modal-placement.directive.ts index ea64f59f1..a646ce0e5 100644 --- a/frontend/src/app/framework/angular/modals/modal-placement.directive.ts +++ b/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]', diff --git a/frontend/src/app/framework/angular/modals/onboarding-tooltip.component.ts b/frontend/src/app/framework/angular/modals/onboarding-tooltip.component.ts index c90658c77..7ffc76119 100644 --- a/frontend/src/app/framework/angular/modals/onboarding-tooltip.component.ts +++ b/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', diff --git a/frontend/src/app/framework/angular/routers/router-2-state.spec.ts b/frontend/src/app/framework/angular/routers/router-2-state.spec.ts index 313f99558..145894858 100644 --- a/frontend/src/app/framework/angular/routers/router-2-state.spec.ts +++ b/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'; diff --git a/frontend/src/app/framework/angular/routers/router-2-state.ts b/frontend/src/app/framework/angular/routers/router-2-state.ts index ba137ecf9..667193af2 100644 --- a/frontend/src/app/framework/angular/routers/router-2-state.ts +++ b/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 }; diff --git a/frontend/src/app/framework/services/dialog.service.ts b/frontend/src/app/framework/services/dialog.service.ts index 626cf7162..8eebd5f59 100644 --- a/frontend/src/app/framework/services/dialog.service.ts +++ b/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'; diff --git a/frontend/src/app/shared/components/assets/asset-dialog.component.ts b/frontend/src/app/shared/components/assets/asset-dialog.component.ts index 6a0e4780c..985b44775 100644 --- a/frontend/src/app/shared/components/assets/asset-dialog.component.ts +++ b/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'; diff --git a/frontend/src/app/shared/components/assets/asset-history.component.ts b/frontend/src/app/shared/components/assets/asset-history.component.ts index 6cb659215..a13a0b3d9 100644 --- a/frontend/src/app/shared/components/assets/asset-history.component.ts +++ b/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 } diff --git a/frontend/src/app/shared/components/assets/image-cropper.component.ts b/frontend/src/app/shared/components/assets/image-cropper.component.ts index c85e5f9f8..f5f233f04 100644 --- a/frontend/src/app/shared/components/assets/image-cropper.component.ts +++ b/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', diff --git a/frontend/src/app/shared/components/assets/image-focus-point.component.ts b/frontend/src/app/shared/components/assets/image-focus-point.component.ts index 526d9cea0..d398d3c4f 100644 --- a/frontend/src/app/shared/components/assets/image-focus-point.component.ts +++ b/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', diff --git a/frontend/src/app/shared/components/comments/comment.component.ts b/frontend/src/app/shared/components/comments/comment.component.ts index c2752dd11..5dcab4479 100644 --- a/frontend/src/app/shared/components/comments/comment.component.ts +++ b/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; diff --git a/frontend/src/app/shared/components/comments/comments.component.ts b/frontend/src/app/shared/components/comments/comments.component.ts index d6e490ea9..650603c0c 100644 --- a/frontend/src/app/shared/components/comments/comments.component.ts +++ b/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({ diff --git a/frontend/src/app/shared/components/forms/markdown-editor.component.ts b/frontend/src/app/shared/components/forms/markdown-editor.component.ts index 9990f9394..c010a0abc 100644 --- a/frontend/src/app/shared/components/forms/markdown-editor.component.ts +++ b/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; diff --git a/frontend/src/app/shared/components/history/history.component.ts b/frontend/src/app/shared/components/history/history.component.ts index 7a075efb9..8956e0af1 100644 --- a/frontend/src/app/shared/components/history/history.component.ts +++ b/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', diff --git a/frontend/src/app/shared/components/history/pipes.ts b/frontend/src/app/shared/components/history/pipes.ts index fdede0886..ddabb7550 100644 --- a/frontend/src/app/shared/components/history/pipes.ts +++ b/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', diff --git a/frontend/src/app/shared/components/pipes.ts b/frontend/src/app/shared/components/pipes.ts index 96a54de63..e7fc1f24d 100644 --- a/frontend/src/app/shared/components/pipes.ts +++ b/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; diff --git a/frontend/src/app/shared/components/search/search-form.component.ts b/frontend/src/app/shared/components/search/search-form.component.ts index 0e91bb4f2..fbfaf62d7 100644 --- a/frontend/src/app/shared/components/search/search-form.component.ts +++ b/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', diff --git a/frontend/src/app/shared/components/watching-users.component.ts b/frontend/src/app/shared/components/watching-users.component.ts index 658bf1f16..60d7d37e4 100644 --- a/frontend/src/app/shared/components/watching-users.component.ts +++ b/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]', diff --git a/frontend/src/app/shared/guards/app-must-exist.guard.spec.ts b/frontend/src/app/shared/guards/app-must-exist.guard.spec.ts index e427d58fe..2dfde313e 100644 --- a/frontend/src/app/shared/guards/app-must-exist.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/content-must-exist.guard.spec.ts b/frontend/src/app/shared/guards/content-must-exist.guard.spec.ts index 4b64b70b3..c14f8455d 100644 --- a/frontend/src/app/shared/guards/content-must-exist.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/content-must-exist.guard.ts b/frontend/src/app/shared/guards/content-must-exist.guard.ts index 5758b1e27..bfeffd3b1 100644 --- a/frontend/src/app/shared/guards/content-must-exist.guard.ts +++ b/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() diff --git a/frontend/src/app/shared/guards/load-apps.guard.spec.ts b/frontend/src/app/shared/guards/load-apps.guard.spec.ts index d713c9293..379a9b030 100644 --- a/frontend/src/app/shared/guards/load-apps.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/load-languages.guard.spec.ts b/frontend/src/app/shared/guards/load-languages.guard.spec.ts index 45c5118c5..8bbba30cc 100644 --- a/frontend/src/app/shared/guards/load-languages.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/load-schemas.guard.spec.ts b/frontend/src/app/shared/guards/load-schemas.guard.spec.ts index 69d66a0f9..7e17eac50 100644 --- a/frontend/src/app/shared/guards/load-schemas.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/must-be-authenticated.guard.spec.ts b/frontend/src/app/shared/guards/must-be-authenticated.guard.spec.ts index 30e335c2c..bbd038f94 100644 --- a/frontend/src/app/shared/guards/must-be-authenticated.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/must-be-authenticated.guard.ts b/frontend/src/app/shared/guards/must-be-authenticated.guard.ts index 88ef3fd7e..2e35129d1 100644 --- a/frontend/src/app/shared/guards/must-be-authenticated.guard.ts +++ b/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() diff --git a/frontend/src/app/shared/guards/must-be-not-authenticated.guard.spec.ts b/frontend/src/app/shared/guards/must-be-not-authenticated.guard.spec.ts index 2d21d08e9..676f704f1 100644 --- a/frontend/src/app/shared/guards/must-be-not-authenticated.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/must-be-not-authenticated.guard.ts b/frontend/src/app/shared/guards/must-be-not-authenticated.guard.ts index 9bc692906..d7f54e255 100644 --- a/frontend/src/app/shared/guards/must-be-not-authenticated.guard.ts +++ b/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() diff --git a/frontend/src/app/shared/guards/rule-must-exist.guard.spec.ts b/frontend/src/app/shared/guards/rule-must-exist.guard.spec.ts index a7ebc947a..211e35b30 100644 --- a/frontend/src/app/shared/guards/rule-must-exist.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/rule-must-exist.guard.ts b/frontend/src/app/shared/guards/rule-must-exist.guard.ts index eaeccfa5a..b81400048 100644 --- a/frontend/src/app/shared/guards/rule-must-exist.guard.ts +++ b/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() diff --git a/frontend/src/app/shared/guards/schema-must-exist-published.guard.spec.ts b/frontend/src/app/shared/guards/schema-must-exist-published.guard.spec.ts index 3e75230df..7fe33821e 100644 --- a/frontend/src/app/shared/guards/schema-must-exist-published.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/schema-must-exist-published.guard.ts b/frontend/src/app/shared/guards/schema-must-exist-published.guard.ts index 0b2ce9348..7e197d780 100644 --- a/frontend/src/app/shared/guards/schema-must-exist-published.guard.ts +++ b/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() diff --git a/frontend/src/app/shared/guards/schema-must-exist.guard.spec.ts b/frontend/src/app/shared/guards/schema-must-exist.guard.spec.ts index 1ce3561be..695b7c9c9 100644 --- a/frontend/src/app/shared/guards/schema-must-exist.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/schema-must-exist.guard.ts b/frontend/src/app/shared/guards/schema-must-exist.guard.ts index 598732649..6d4e4fa2f 100644 --- a/frontend/src/app/shared/guards/schema-must-exist.guard.ts +++ b/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() diff --git a/frontend/src/app/shared/guards/schema-must-not-be-singleton.guard.spec.ts b/frontend/src/app/shared/guards/schema-must-not-be-singleton.guard.spec.ts index 10ddb8811..ec161474c 100644 --- a/frontend/src/app/shared/guards/schema-must-not-be-singleton.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/guards/schema-must-not-be-singleton.guard.ts b/frontend/src/app/shared/guards/schema-must-not-be-singleton.guard.ts index 909a7aeb8..13c4d565f 100644 --- a/frontend/src/app/shared/guards/schema-must-not-be-singleton.guard.ts +++ b/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() diff --git a/frontend/src/app/shared/guards/unset-app.guard.spec.ts b/frontend/src/app/shared/guards/unset-app.guard.spec.ts index 5ce1a806f..a23916013 100644 --- a/frontend/src/app/shared/guards/unset-app.guard.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/interceptors/auth.interceptor.spec.ts b/frontend/src/app/shared/interceptors/auth.interceptor.spec.ts index d6c63d691..8cb24eb10 100644 --- a/frontend/src/app/shared/interceptors/auth.interceptor.spec.ts +++ b/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', () => { diff --git a/frontend/src/app/shared/interceptors/auth.interceptor.ts b/frontend/src/app/shared/interceptors/auth.interceptor.ts index 909dd1b17..92c71d6cc 100644 --- a/frontend/src/app/shared/interceptors/auth.interceptor.ts +++ b/frontend/src/app/shared/interceptors/auth.interceptor.ts @@ -8,9 +8,9 @@ import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Router } from '@angular/router'; -import { ApiUrlConfig, ErrorDto } from '@app/framework'; import { EMPTY, Observable, throwError } from 'rxjs'; import { catchError, switchMap, take } from 'rxjs/operators'; +import { ApiUrlConfig, ErrorDto } from '@app/framework'; import { AuthService, Profile } from './../services/auth.service'; @Injectable() diff --git a/frontend/src/app/shared/module.ts b/frontend/src/app/shared/module.ts index e75cbf1d1..386d097f0 100644 --- a/frontend/src/app/shared/module.ts +++ b/frontend/src/app/shared/module.ts @@ -9,9 +9,9 @@ import { DragDropModule } from '@angular/cdk/drag-drop'; import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { ModuleWithProviders, NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; -import { SqxFrameworkModule } from '@app/framework'; import { MentionModule } from 'angular-mentions'; import { NgxDocViewerModule } from 'ngx-doc-viewer'; +import { SqxFrameworkModule } from '@app/framework'; import { AppFormComponent, AppLanguagesService, AppMustExistGuard, AppsService, AppsState, AssetComponent, AssetDialogComponent, AssetFolderComponent, AssetFolderDialogComponent, AssetFolderDropdownComponent, AssetFolderDropdownItemComponent, AssetHistoryComponent, AssetPathComponent, AssetPreviewUrlPipe, AssetScriptsState, AssetsListComponent, AssetsSelectorComponent, AssetsService, AssetsState, AssetTextEditorComponent, AssetUploaderComponent, AssetUploaderState, AssetUrlPipe, AuthInterceptor, AuthService, AutoSaveService, BackupsService, BackupsState, ClientsService, ClientsState, CommentComponent, CommentsComponent, CommentsService, ContentListCellDirective, ContentListFieldComponent, ContentListHeaderComponent, ContentListWidthPipe, ContentMustExistGuard, ContentsColumnsPipe, ContentSelectorComponent, ContentSelectorItemComponent, ContentsService, ContentsState, ContentStatusComponent, ContentValueComponent, ContentValueEditorComponent, ContributorsService, ContributorsState, FileIconPipe, FilterComparisonComponent, FilterLogicalComponent, FilterNodeComponent, GeolocationEditorComponent, GraphQlService, HelpComponent, HelpMarkdownPipe, HelpService, HistoryComponent, HistoryListComponent, HistoryMessagePipe, HistoryService, ImageCropperComponent, ImageFocusPointComponent, LanguagesService, LanguagesState, LoadAppsGuard, LoadLanguagesGuard, LoadSchemasGuard, MarkdownEditorComponent, MustBeAuthenticatedGuard, MustBeNotAuthenticatedGuard, NewsService, NotifoComponent, PlansService, PlansState, PreviewableType, QueryComponent, QueryListComponent, QueryPathComponent, ReferenceInputComponent, RichEditorComponent, RolesService, RolesState, RuleEventsState, RuleMustExistGuard, RuleSimulatorState, RulesService, RulesState, SavedQueriesComponent, SchemaCategoryComponent, SchemaMustExistGuard, SchemaMustExistPublishedGuard, SchemaMustNotBeSingletonGuard, SchemasService, SchemasState, SchemaTagSource, SearchFormComponent, SearchService, SortingComponent, StockPhotoService, TableHeaderComponent, TranslationsService, UIService, UIState, UnsetAppGuard, UsagesService, UserDtoPicture, UserIdPicturePipe, UserNamePipe, UserNameRefPipe, UserPicturePipe, UserPictureRefPipe, UsersProviderService, UsersService, WatchingUsersComponent, WorkflowsService, WorkflowsState } from './declarations'; @NgModule({ diff --git a/frontend/src/app/shared/services/app-languages.service.ts b/frontend/src/app/shared/services/app-languages.service.ts index 110aa5b4d..4d9130a47 100644 --- a/frontend/src/app/shared/services/app-languages.service.ts +++ b/frontend/src/app/shared/services/app-languages.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, Version, Versioned } from '@app/framework'; export class AppLanguageDto { public readonly _links: ResourceLinks; diff --git a/frontend/src/app/shared/services/apps.service.ts b/frontend/src/app/shared/services/apps.service.ts index 43a6cb72f..b626a0b2a 100644 --- a/frontend/src/app/shared/services/apps.service.ts +++ b/frontend/src/app/shared/services/apps.service.ts @@ -7,9 +7,9 @@ import { HttpClient, HttpErrorResponse, HttpEventType, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, DateTime, ErrorDto, getLinkUrl, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, StringHelper, Types, Version, Versioned } from '@app/framework'; import { Observable, throwError } from 'rxjs'; import { catchError, filter, map, tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, DateTime, ErrorDto, getLinkUrl, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, StringHelper, Types, Version, Versioned } from '@app/framework'; export class AppDto { public readonly _links: ResourceLinks; diff --git a/frontend/src/app/shared/services/assets.service.ts b/frontend/src/app/shared/services/assets.service.ts index 95263faa0..f7d64ff11 100644 --- a/frontend/src/app/shared/services/assets.service.ts +++ b/frontend/src/app/shared/services/assets.service.ts @@ -7,9 +7,9 @@ import { HttpClient, HttpErrorResponse, HttpEventType, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, DateTime, ErrorDto, getLinkUrl, hasAnyLink, HTTP, Metadata, pretifyError, Resource, ResourceLinks, ResultSet, StringHelper, Types, Version, Versioned } from '@app/framework'; import { Observable, throwError } from 'rxjs'; import { catchError, filter, map, tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, DateTime, ErrorDto, getLinkUrl, hasAnyLink, HTTP, Metadata, pretifyError, Resource, ResourceLinks, ResultSet, StringHelper, Types, Version, Versioned } from '@app/framework'; import { Query, sanitize } from './../state/query'; import { AuthService } from './auth.service'; diff --git a/frontend/src/app/shared/services/auth.service.ts b/frontend/src/app/shared/services/auth.service.ts index f5f3e71c4..d9c23f52f 100644 --- a/frontend/src/app/shared/services/auth.service.ts +++ b/frontend/src/app/shared/services/auth.service.ts @@ -6,10 +6,10 @@ */ import { Injectable } from '@angular/core'; -import { ApiUrlConfig, Types } from '@app/framework'; import { Log, User, UserManager, WebStorageStateStore } from 'oidc-client'; import { concat, Observable, Observer, of, ReplaySubject, throwError, TimeoutError } from 'rxjs'; import { delay, mergeMap, retryWhen, take, timeout } from 'rxjs/operators'; +import { ApiUrlConfig, Types } from '@app/framework'; export class Profile { public get id(): string { diff --git a/frontend/src/app/shared/services/autosave.service.spec.ts b/frontend/src/app/shared/services/autosave.service.spec.ts index d72094050..d66cedc1c 100644 --- a/frontend/src/app/shared/services/autosave.service.spec.ts +++ b/frontend/src/app/shared/services/autosave.service.spec.ts @@ -5,8 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AutoSaveService, LocalStoreService, Version } from '@app/shared/internal'; import { IMock, It, Mock, Times } from 'typemoq'; +import { AutoSaveService, LocalStoreService, Version } from '@app/shared/internal'; describe('AutoSaveService', () => { let localStore: IMock; diff --git a/frontend/src/app/shared/services/backups.service.ts b/frontend/src/app/shared/services/backups.service.ts index 993ff6f2f..2973e5da1 100644 --- a/frontend/src/app/shared/services/backups.service.ts +++ b/frontend/src/app/shared/services/backups.service.ts @@ -7,9 +7,9 @@ import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, DateTime, hasAnyLink, pretifyError, Resource, ResourceLinks, ResultSet, Types } from '@app/framework'; import { Observable, of, throwError } from 'rxjs'; import { catchError, map, tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, DateTime, hasAnyLink, pretifyError, Resource, ResourceLinks, ResultSet, Types } from '@app/framework'; export class BackupsDto extends ResultSet { public get canCreate() { diff --git a/frontend/src/app/shared/services/clients.service.ts b/frontend/src/app/shared/services/clients.service.ts index 03563ac65..a9a6ec625 100644 --- a/frontend/src/app/shared/services/clients.service.ts +++ b/frontend/src/app/shared/services/clients.service.ts @@ -7,9 +7,9 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; import { map, tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, Version, Versioned } from '@app/framework'; export class ClientDto { public readonly _links: ResourceLinks; diff --git a/frontend/src/app/shared/services/comments.service.ts b/frontend/src/app/shared/services/comments.service.ts index 46455ee03..12747e498 100644 --- a/frontend/src/app/shared/services/comments.service.ts +++ b/frontend/src/app/shared/services/comments.service.ts @@ -7,9 +7,9 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig, DateTime, Model, pretifyError, Version } from '@app/framework'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { ApiUrlConfig, DateTime, Model, pretifyError, Version } from '@app/framework'; export class CommentsDto extends Model { constructor( diff --git a/frontend/src/app/shared/services/contents.service.ts b/frontend/src/app/shared/services/contents.service.ts index f8e6ee4e4..5f8988236 100644 --- a/frontend/src/app/shared/services/contents.service.ts +++ b/frontend/src/app/shared/services/contents.service.ts @@ -7,9 +7,9 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, DateTime, ErrorDto, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, ResultSet, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; import { map, tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, DateTime, ErrorDto, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, ResultSet, Version, Versioned } from '@app/framework'; import { Query, sanitize, StatusInfo } from './../state/query'; import { parseField, RootFieldDto } from './schemas.service'; diff --git a/frontend/src/app/shared/services/contributors.service.ts b/frontend/src/app/shared/services/contributors.service.ts index 79ebde218..a84aaba53 100644 --- a/frontend/src/app/shared/services/contributors.service.ts +++ b/frontend/src/app/shared/services/contributors.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, Version, Versioned } from '@app/framework'; export class ContributorDto { public readonly _links: ResourceLinks; diff --git a/frontend/src/app/shared/services/graphql.service.ts b/frontend/src/app/shared/services/graphql.service.ts index b069d5aca..953fac14f 100644 --- a/frontend/src/app/shared/services/graphql.service.ts +++ b/frontend/src/app/shared/services/graphql.service.ts @@ -7,8 +7,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig } from '@app/framework'; import { Observable } from 'rxjs'; +import { ApiUrlConfig } from '@app/framework'; @Injectable() export class GraphQlService { diff --git a/frontend/src/app/shared/services/history.service.ts b/frontend/src/app/shared/services/history.service.ts index 28586f27a..0dd9c168c 100644 --- a/frontend/src/app/shared/services/history.service.ts +++ b/frontend/src/app/shared/services/history.service.ts @@ -7,9 +7,9 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig, DateTime, pretifyError, Version } from '@app/framework'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; +import { ApiUrlConfig, DateTime, pretifyError, Version } from '@app/framework'; import { UsersProviderService } from './users-provider.service'; export class HistoryEventDto { diff --git a/frontend/src/app/shared/services/languages.service.ts b/frontend/src/app/shared/services/languages.service.ts index 7bbfb31a3..41872280e 100644 --- a/frontend/src/app/shared/services/languages.service.ts +++ b/frontend/src/app/shared/services/languages.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig, pretifyError } from '@app/framework'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { ApiUrlConfig, pretifyError } from '@app/framework'; export class LanguageDto { constructor( diff --git a/frontend/src/app/shared/services/news.service.ts b/frontend/src/app/shared/services/news.service.ts index ff3743ef5..316611449 100644 --- a/frontend/src/app/shared/services/news.service.ts +++ b/frontend/src/app/shared/services/news.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig, pretifyError } from '@app/framework'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { ApiUrlConfig, pretifyError } from '@app/framework'; export class FeatureDto { constructor( diff --git a/frontend/src/app/shared/services/plans.service.ts b/frontend/src/app/shared/services/plans.service.ts index b3ab1ea8f..4664a9234 100644 --- a/frontend/src/app/shared/services/plans.service.ts +++ b/frontend/src/app/shared/services/plans.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, HTTP, mapVersioned, pretifyError, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, HTTP, mapVersioned, pretifyError, Version, Versioned } from '@app/framework'; export class PlanDto { constructor( diff --git a/frontend/src/app/shared/services/roles.service.ts b/frontend/src/app/shared/services/roles.service.ts index cd2f8d11b..2b186ce36 100644 --- a/frontend/src/app/shared/services/roles.service.ts +++ b/frontend/src/app/shared/services/roles.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, hasAnyLink, HTTP, mapVersioned, pretifyError, Resource, ResourceLinks, Version, Versioned } from '@app/framework'; export class RoleDto { public readonly _links: ResourceLinks; diff --git a/frontend/src/app/shared/services/rules.service.ts b/frontend/src/app/shared/services/rules.service.ts index 135fed567..d6cf6b574 100644 --- a/frontend/src/app/shared/services/rules.service.ts +++ b/frontend/src/app/shared/services/rules.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, DateTime, hasAnyLink, HTTP, Model, pretifyError, Resource, ResourceLinks, ResultSet, Version } from '@app/framework'; import { Observable } from 'rxjs'; import { map, tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, DateTime, hasAnyLink, HTTP, Model, pretifyError, Resource, ResourceLinks, ResultSet, Version } from '@app/framework'; export type RuleElementMetadataDto = Readonly<{ description: string; diff --git a/frontend/src/app/shared/services/schemas.service.ts b/frontend/src/app/shared/services/schemas.service.ts index b733c819a..2eeb00f7d 100644 --- a/frontend/src/app/shared/services/schemas.service.ts +++ b/frontend/src/app/shared/services/schemas.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, DateTime, hasAnyLink, HTTP, pretifyError, Resource, ResourceLinks, StringHelper, Types, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; import { map, tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, DateTime, hasAnyLink, HTTP, pretifyError, Resource, ResourceLinks, StringHelper, Types, Version, Versioned } from '@app/framework'; import { createProperties, FieldPropertiesDto } from './schemas.types'; export const MetaFields = { diff --git a/frontend/src/app/shared/services/search.service.ts b/frontend/src/app/shared/services/search.service.ts index 588a42518..5fde15e6c 100644 --- a/frontend/src/app/shared/services/search.service.ts +++ b/frontend/src/app/shared/services/search.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig, pretifyError, ResourceLinks } from '@app/framework'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { ApiUrlConfig, pretifyError, ResourceLinks } from '@app/framework'; export class SearchResultDto { public readonly _links: ResourceLinks; diff --git a/frontend/src/app/shared/services/translations.service.ts b/frontend/src/app/shared/services/translations.service.ts index 0ad3c97bb..c1fadef2b 100644 --- a/frontend/src/app/shared/services/translations.service.ts +++ b/frontend/src/app/shared/services/translations.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig, pretifyError } from '@app/framework'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { ApiUrlConfig, pretifyError } from '@app/framework'; export class TranslationDto { constructor( diff --git a/frontend/src/app/shared/services/ui.service.ts b/frontend/src/app/shared/services/ui.service.ts index a73655e83..1c5bec011 100644 --- a/frontend/src/app/shared/services/ui.service.ts +++ b/frontend/src/app/shared/services/ui.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig } from '@app/framework'; import { Observable, of } from 'rxjs'; import { catchError } from 'rxjs/operators'; +import { ApiUrlConfig } from '@app/framework'; export type UISettingsDto = Readonly<{ canCreateApps: boolean }>; diff --git a/frontend/src/app/shared/services/usages.service.ts b/frontend/src/app/shared/services/usages.service.ts index 58c58f5fc..590c241e0 100644 --- a/frontend/src/app/shared/services/usages.service.ts +++ b/frontend/src/app/shared/services/usages.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig, DateTime, pretifyError } from '@app/framework'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { ApiUrlConfig, DateTime, pretifyError } from '@app/framework'; export class CallsUsageDto { constructor( diff --git a/frontend/src/app/shared/services/users-provider.service.spec.ts b/frontend/src/app/shared/services/users-provider.service.spec.ts index 5beca6a3a..4582a4215 100644 --- a/frontend/src/app/shared/services/users-provider.service.spec.ts +++ b/frontend/src/app/shared/services/users-provider.service.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AuthService, Profile, UserDto, UsersProviderService, UsersService } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, Mock, Times } from 'typemoq'; +import { AuthService, Profile, UserDto, UsersProviderService, UsersService } from '@app/shared/internal'; describe('UsersProviderService', () => { let authService: IMock; diff --git a/frontend/src/app/shared/services/users.service.ts b/frontend/src/app/shared/services/users.service.ts index 2fc0203d3..de15e9efa 100644 --- a/frontend/src/app/shared/services/users.service.ts +++ b/frontend/src/app/shared/services/users.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ApiUrlConfig, pretifyError, ResourceLinks } from '@app/framework'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { ApiUrlConfig, pretifyError, ResourceLinks } from '@app/framework'; export class UserDto { constructor( diff --git a/frontend/src/app/shared/services/workflows.service.ts b/frontend/src/app/shared/services/workflows.service.ts index 42b00aee5..90988e2ac 100644 --- a/frontend/src/app/shared/services/workflows.service.ts +++ b/frontend/src/app/shared/services/workflows.service.ts @@ -7,9 +7,9 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { AnalyticsService, ApiUrlConfig, compareStrings, hasAnyLink, HTTP, mapVersioned, Model, pretifyError, Resource, ResourceLinks, StringHelper, Version, Versioned } from '@app/framework'; import { Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; +import { AnalyticsService, ApiUrlConfig, compareStrings, hasAnyLink, HTTP, mapVersioned, Model, pretifyError, Resource, ResourceLinks, StringHelper, Version, Versioned } from '@app/framework'; export class WorkflowDto extends Model { public readonly _links: ResourceLinks; diff --git a/frontend/src/app/shared/state/apps.state.spec.ts b/frontend/src/app/shared/state/apps.state.spec.ts index 41132efd6..fec5f4e7e 100644 --- a/frontend/src/app/shared/state/apps.state.spec.ts +++ b/frontend/src/app/shared/state/apps.state.spec.ts @@ -5,9 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AppsService, AppsState, DialogService } from '@app/shared/internal'; import { firstValueFrom, of, throwError } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; +import { AppsService, AppsState, DialogService } from '@app/shared/internal'; import { createApp, createAppSettings } from './../services/apps.service.spec'; describe('AppsState', () => { diff --git a/frontend/src/app/shared/state/apps.state.ts b/frontend/src/app/shared/state/apps.state.ts index 4c5b485a0..d66a91f40 100644 --- a/frontend/src/app/shared/state/apps.state.ts +++ b/frontend/src/app/shared/state/apps.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, shareSubscribed, State, Types } from '@app/framework'; import { Observable, of } from 'rxjs'; import { catchError, map, switchMap, tap } from 'rxjs/operators'; +import { DialogService, shareSubscribed, State, Types } from '@app/framework'; import { AppDto, AppSettingsDto, AppsService, CreateAppDto, UpdateAppDto, UpdateAppSettingsDto } from './../services/apps.service'; interface Snapshot { diff --git a/frontend/src/app/shared/state/asset-scripts.state.spec.ts b/frontend/src/app/shared/state/asset-scripts.state.spec.ts index 124c64b0a..32d526c76 100644 --- a/frontend/src/app/shared/state/asset-scripts.state.spec.ts +++ b/frontend/src/app/shared/state/asset-scripts.state.spec.ts @@ -5,14 +5,14 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DialogService, versioned } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { DialogService, versioned } from '@app/shared/internal'; import { AppsService, AssetScriptsPayload } from '../services/apps.service'; import { createAssetScripts } from '../services/apps.service.spec'; -import { AssetScriptsState } from './asset-scripts.state'; import { TestValues } from './_test-helpers'; +import { AssetScriptsState } from './asset-scripts.state'; describe('AssetScriptsState', () => { const { diff --git a/frontend/src/app/shared/state/asset-scripts.state.ts b/frontend/src/app/shared/state/asset-scripts.state.ts index f2032dc27..66f6adecb 100644 --- a/frontend/src/app/shared/state/asset-scripts.state.ts +++ b/frontend/src/app/shared/state/asset-scripts.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, Resource, shareSubscribed, State, Version } from '@app/framework'; import { Observable } from 'rxjs'; import { finalize, tap } from 'rxjs/operators'; +import { DialogService, Resource, shareSubscribed, State, Version } from '@app/framework'; import { AppsService, AssetScripts, AssetScriptsPayload } from '../services/apps.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/asset-uploader.state.spec.ts b/frontend/src/app/shared/state/asset-uploader.state.spec.ts index bc63e30ce..fd7675407 100644 --- a/frontend/src/app/shared/state/asset-uploader.state.spec.ts +++ b/frontend/src/app/shared/state/asset-uploader.state.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AssetsService, AssetsState, AssetUploaderState, DialogService, ofForever } from '@app/shared/internal'; import { lastValueFrom, NEVER, of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, Mock } from 'typemoq'; +import { AssetsService, AssetsState, AssetUploaderState, DialogService, ofForever } from '@app/shared/internal'; import { createAsset } from './../services/assets.service.spec'; import { TestValues } from './_test-helpers'; diff --git a/frontend/src/app/shared/state/asset-uploader.state.ts b/frontend/src/app/shared/state/asset-uploader.state.ts index ef35dc15b..0132f2a03 100644 --- a/frontend/src/app/shared/state/asset-uploader.state.ts +++ b/frontend/src/app/shared/state/asset-uploader.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, MathHelper, State, Types } from '@app/framework'; import { Observable, Subject } from 'rxjs'; import { map, publishReplay, refCount, takeUntil } from 'rxjs/operators'; +import { DialogService, MathHelper, State, Types } from '@app/framework'; import { AssetDto, AssetsService } from './../services/assets.service'; import { AppsState } from './apps.state'; import { AssetsState } from './assets.state'; diff --git a/frontend/src/app/shared/state/assets.forms.ts b/frontend/src/app/shared/state/assets.forms.ts index c947f279b..e0d576887 100644 --- a/frontend/src/app/shared/state/assets.forms.ts +++ b/frontend/src/app/shared/state/assets.forms.ts @@ -6,8 +6,8 @@ */ import { FormControl, Validators } from '@angular/forms'; -import { Form, Mutable, TemplatedFormArray, Types, ExtendedFormGroup } from '@app/framework'; import slugify from 'slugify'; +import { Form, Mutable, TemplatedFormArray, Types, ExtendedFormGroup } from '@app/framework'; import { AnnotateAssetDto, AssetDto, AssetFolderDto, RenameAssetFolderDto, RenameAssetTagDto } from './../services/assets.service'; export class AnnotateAssetForm extends Form { diff --git a/frontend/src/app/shared/state/assets.state.spec.ts b/frontend/src/app/shared/state/assets.state.spec.ts index 2ed7b7280..befce3de2 100644 --- a/frontend/src/app/shared/state/assets.state.spec.ts +++ b/frontend/src/app/shared/state/assets.state.spec.ts @@ -5,11 +5,11 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ErrorDto } from '@app/framework'; -import { AssetFoldersDto, AssetsDto, AssetsService, AssetsState, DialogService, MathHelper, versioned } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { ErrorDto } from '@app/framework'; +import { AssetFoldersDto, AssetsDto, AssetsService, AssetsState, DialogService, MathHelper, versioned } from '@app/shared/internal'; import { createAsset, createAssetFolder } from './../services/assets.service.spec'; import { TestValues } from './_test-helpers'; diff --git a/frontend/src/app/shared/state/assets.state.ts b/frontend/src/app/shared/state/assets.state.ts index 9fed25ed6..4332d0183 100644 --- a/frontend/src/app/shared/state/assets.state.ts +++ b/frontend/src/app/shared/state/assets.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { compareStrings, DialogService, ErrorDto, getPagingInfo, ListState, MathHelper, shareSubscribed, State, Types } from '@app/framework'; import { EMPTY, forkJoin, Observable, of, throwError } from 'rxjs'; import { catchError, finalize, switchMap, tap } from 'rxjs/operators'; +import { compareStrings, DialogService, ErrorDto, getPagingInfo, ListState, MathHelper, shareSubscribed, State, Types } from '@app/framework'; import { AnnotateAssetDto, AssetDto, AssetFolderDto, AssetFoldersDto, AssetsService, RenameAssetFolderDto } from './../services/assets.service'; import { AppsState } from './apps.state'; import { Query } from './query'; diff --git a/frontend/src/app/shared/state/backups.state.spec.ts b/frontend/src/app/shared/state/backups.state.spec.ts index 2db71d98d..af6ac2693 100644 --- a/frontend/src/app/shared/state/backups.state.spec.ts +++ b/frontend/src/app/shared/state/backups.state.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { BackupsDto, BackupsService, BackupsState, DialogService } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { BackupsDto, BackupsService, BackupsState, DialogService } from '@app/shared/internal'; import { createBackup } from './../services/backups.service.spec'; import { TestValues } from './_test-helpers'; diff --git a/frontend/src/app/shared/state/backups.state.ts b/frontend/src/app/shared/state/backups.state.ts index e9fbf7120..337391b68 100644 --- a/frontend/src/app/shared/state/backups.state.ts +++ b/frontend/src/app/shared/state/backups.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, shareSubscribed, State } from '@app/framework'; import { Observable } from 'rxjs'; import { finalize, tap } from 'rxjs/operators'; +import { DialogService, shareSubscribed, State } from '@app/framework'; import { BackupDto, BackupsService } from './../services/backups.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/clients.state.spec.ts b/frontend/src/app/shared/state/clients.state.spec.ts index eec44cf2b..ef028df53 100644 --- a/frontend/src/app/shared/state/clients.state.spec.ts +++ b/frontend/src/app/shared/state/clients.state.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ClientsPayload, ClientsService, ClientsState, DialogService, versioned } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { ClientsPayload, ClientsService, ClientsState, DialogService, versioned } from '@app/shared/internal'; import { createClients } from './../services/clients.service.spec'; import { TestValues } from './_test-helpers'; diff --git a/frontend/src/app/shared/state/clients.state.ts b/frontend/src/app/shared/state/clients.state.ts index 4a83a5d9f..7c3e40677 100644 --- a/frontend/src/app/shared/state/clients.state.ts +++ b/frontend/src/app/shared/state/clients.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, shareSubscribed, State, Version } from '@app/framework'; import { Observable } from 'rxjs'; import { finalize, tap } from 'rxjs/operators'; +import { DialogService, shareSubscribed, State, Version } from '@app/framework'; import { ClientDto, ClientsPayload, ClientsService, CreateClientDto, UpdateClientDto } from './../services/clients.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/comments.state.spec.ts b/frontend/src/app/shared/state/comments.state.spec.ts index ee0d29df6..77d42475a 100644 --- a/frontend/src/app/shared/state/comments.state.spec.ts +++ b/frontend/src/app/shared/state/comments.state.spec.ts @@ -5,9 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { CommentDto, CommentsDto, CommentsService, CommentsState, DialogService, Version } from '@app/shared/internal'; import { of } from 'rxjs'; import { IMock, Mock } from 'typemoq'; +import { CommentDto, CommentsDto, CommentsService, CommentsState, DialogService, Version } from '@app/shared/internal'; import { TestValues } from './_test-helpers'; describe('CommentsState', () => { diff --git a/frontend/src/app/shared/state/comments.state.ts b/frontend/src/app/shared/state/comments.state.ts index 0348376ac..e58609ce8 100644 --- a/frontend/src/app/shared/state/comments.state.ts +++ b/frontend/src/app/shared/state/comments.state.ts @@ -5,9 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DateTime, DialogService, shareSubscribed, State, Version } from '@app/framework'; import { Observable } from 'rxjs'; import { map, tap } from 'rxjs/operators'; +import { DateTime, DialogService, shareSubscribed, State, Version } from '@app/framework'; import { CommentDto, CommentsService } from './../services/comments.service'; interface Snapshot { diff --git a/frontend/src/app/shared/state/contents.forms.spec.ts b/frontend/src/app/shared/state/contents.forms.spec.ts index 7906aff9c..795850cb9 100644 --- a/frontend/src/app/shared/state/contents.forms.spec.ts +++ b/frontend/src/app/shared/state/contents.forms.spec.ts @@ -11,9 +11,9 @@ import { AbstractControl, FormArray } from '@angular/forms'; import { MathHelper } from '@app/framework'; import { AppLanguageDto, createProperties, EditContentForm, getContentValue, HtmlValue, LanguageDto, RootFieldDto } from '@app/shared/internal'; import { FieldRule, SchemaDto } from './../services/schemas.service'; +import { TestValues } from './_test-helpers'; import { ComponentForm, FieldArrayForm } from './contents.forms'; import { PartitionConfig } from './contents.forms-helpers'; -import { TestValues } from './_test-helpers'; const { createField, diff --git a/frontend/src/app/shared/state/contents.forms.ts b/frontend/src/app/shared/state/contents.forms.ts index 8ca02e03f..af1099455 100644 --- a/frontend/src/app/shared/state/contents.forms.ts +++ b/frontend/src/app/shared/state/contents.forms.ts @@ -6,9 +6,9 @@ */ import { FormControl, FormGroup, Validators } from '@angular/forms'; +import { BehaviorSubject, distinctUntilChanged, Observable } from 'rxjs'; import { debounceTimeSafe, Form, FormArrayTemplate, TemplatedFormArray, Types, ExtendedFormGroup, value$ } from '@app/framework'; import { FormGroupTemplate, TemplatedFormGroup } from '@app/framework/angular/forms/templated-form-group'; -import { BehaviorSubject, distinctUntilChanged, Observable } from 'rxjs'; import { AppLanguageDto } from './../services/app-languages.service'; import { LanguageDto } from './../services/languages.service'; import { FieldDto, RootFieldDto, SchemaDto, TableField } from './../services/schemas.service'; diff --git a/frontend/src/app/shared/state/contents.state.ts b/frontend/src/app/shared/state/contents.state.ts index ee5766a15..c27f19329 100644 --- a/frontend/src/app/shared/state/contents.state.ts +++ b/frontend/src/app/shared/state/contents.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, ErrorDto, getPagingInfo, ListState, shareSubscribed, State, Types, Version, Versioned } from '@app/framework'; import { EMPTY, Observable, of } from 'rxjs'; import { catchError, finalize, map, switchMap, tap } from 'rxjs/operators'; +import { DialogService, ErrorDto, getPagingInfo, ListState, shareSubscribed, State, Types, Version, Versioned } from '@app/framework'; import { BulkResultDto, BulkUpdateJobDto, ContentDto, ContentsDto, ContentsService } from './../services/contents.service'; import { AppsState } from './apps.state'; import { SavedQuery } from './queries'; diff --git a/frontend/src/app/shared/state/contributors.forms.ts b/frontend/src/app/shared/state/contributors.forms.ts index 853a795b6..1ee61949f 100644 --- a/frontend/src/app/shared/state/contributors.forms.ts +++ b/frontend/src/app/shared/state/contributors.forms.ts @@ -6,8 +6,8 @@ */ import { FormControl, Validators } from '@angular/forms'; -import { Form, hasNoValue$, Types, ExtendedFormGroup, value$ } from '@app/framework'; import { debounceTime, map, shareReplay } from 'rxjs/operators'; +import { Form, hasNoValue$, Types, ExtendedFormGroup, value$ } from '@app/framework'; import { AssignContributorDto } from './../services/contributors.service'; import { UserDto } from './../services/users.service'; diff --git a/frontend/src/app/shared/state/contributors.state.spec.ts b/frontend/src/app/shared/state/contributors.state.spec.ts index a9f00de00..580c6893c 100644 --- a/frontend/src/app/shared/state/contributors.state.spec.ts +++ b/frontend/src/app/shared/state/contributors.state.spec.ts @@ -5,11 +5,11 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ErrorDto } from '@app/framework'; -import { ContributorDto, ContributorsPayload, ContributorsService, ContributorsState, DialogService, versioned } from '@app/shared/internal'; import { EMPTY, of, throwError } from 'rxjs'; import { catchError, onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { ErrorDto } from '@app/framework'; +import { ContributorDto, ContributorsPayload, ContributorsService, ContributorsState, DialogService, versioned } from '@app/shared/internal'; import { createContributors } from './../services/contributors.service.spec'; import { TestValues } from './_test-helpers'; diff --git a/frontend/src/app/shared/state/contributors.state.ts b/frontend/src/app/shared/state/contributors.state.ts index f10520b3c..c0f65aac8 100644 --- a/frontend/src/app/shared/state/contributors.state.ts +++ b/frontend/src/app/shared/state/contributors.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, ErrorDto, getPagingInfo, ListState, shareMapSubscribed, shareSubscribed, State, Types, Version } from '@app/framework'; import { EMPTY, Observable, throwError } from 'rxjs'; import { catchError, finalize, tap } from 'rxjs/operators'; +import { DialogService, ErrorDto, getPagingInfo, ListState, shareMapSubscribed, shareSubscribed, State, Types, Version } from '@app/framework'; import { AssignContributorDto, ContributorDto, ContributorsPayload, ContributorsService } from './../services/contributors.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/languages.state.spec.ts b/frontend/src/app/shared/state/languages.state.spec.ts index 253a44248..8275b4573 100644 --- a/frontend/src/app/shared/state/languages.state.spec.ts +++ b/frontend/src/app/shared/state/languages.state.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AppLanguagesPayload, AppLanguagesService, DialogService, LanguageDto, LanguagesService, LanguagesState, versioned } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { AppLanguagesPayload, AppLanguagesService, DialogService, LanguageDto, LanguagesService, LanguagesState, versioned } from '@app/shared/internal'; import { createLanguages } from './../services/app-languages.service.spec'; import { TestValues } from './_test-helpers'; diff --git a/frontend/src/app/shared/state/languages.state.ts b/frontend/src/app/shared/state/languages.state.ts index 5fa081846..6e808d594 100644 --- a/frontend/src/app/shared/state/languages.state.ts +++ b/frontend/src/app/shared/state/languages.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, shareMapSubscribed, shareSubscribed, State, Version } from '@app/framework'; import { forkJoin, Observable } from 'rxjs'; import { finalize, map, shareReplay, tap } from 'rxjs/operators'; +import { DialogService, shareMapSubscribed, shareSubscribed, State, Version } from '@app/framework'; import { AppLanguageDto, AppLanguagesPayload, AppLanguagesService, UpdateAppLanguageDto } from './../services/app-languages.service'; import { LanguageDto, LanguagesService } from './../services/languages.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/plans.state.spec.ts b/frontend/src/app/shared/state/plans.state.spec.ts index 8b0757dfe..0fc436936 100644 --- a/frontend/src/app/shared/state/plans.state.spec.ts +++ b/frontend/src/app/shared/state/plans.state.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DialogService, PlanDto, PlansService, PlansState, versioned } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { DialogService, PlanDto, PlansService, PlansState, versioned } from '@app/shared/internal'; import { TestValues } from './_test-helpers'; describe('PlansState', () => { diff --git a/frontend/src/app/shared/state/plans.state.ts b/frontend/src/app/shared/state/plans.state.ts index 2a412c01e..0eef9ca6b 100644 --- a/frontend/src/app/shared/state/plans.state.ts +++ b/frontend/src/app/shared/state/plans.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, shareSubscribed, State, Version } from '@app/framework'; import { Observable } from 'rxjs'; import { finalize, tap } from 'rxjs/operators'; +import { DialogService, shareSubscribed, State, Version } from '@app/framework'; import { AuthService } from './../services/auth.service'; import { PlanDto, PlansService } from './../services/plans.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/queries.spec.ts b/frontend/src/app/shared/state/queries.spec.ts index 827c53c8a..2b944958c 100644 --- a/frontend/src/app/shared/state/queries.spec.ts +++ b/frontend/src/app/shared/state/queries.spec.ts @@ -5,9 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Queries, SavedQuery, UIState } from '@app/shared/internal'; import { BehaviorSubject } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; +import { Queries, SavedQuery, UIState } from '@app/shared/internal'; describe('Queries', () => { const prefix = 'schemas.my-schema'; diff --git a/frontend/src/app/shared/state/queries.ts b/frontend/src/app/shared/state/queries.ts index af640d82b..845ae91bc 100644 --- a/frontend/src/app/shared/state/queries.ts +++ b/frontend/src/app/shared/state/queries.ts @@ -5,9 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { compareStrings, Types } from '@app/framework'; import { Observable } from 'rxjs'; import { map, shareReplay } from 'rxjs/operators'; +import { compareStrings, Types } from '@app/framework'; import { deserializeQuery, equalsQuery, Query } from './query'; import { UIState } from './ui.state'; diff --git a/frontend/src/app/shared/state/resolvers.spec.ts b/frontend/src/app/shared/state/resolvers.spec.ts index 3d29d7090..341339b6a 100644 --- a/frontend/src/app/shared/state/resolvers.spec.ts +++ b/frontend/src/app/shared/state/resolvers.spec.ts @@ -5,13 +5,13 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { UIOptions } from '@app/framework'; import { firstValueFrom, of, throwError } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; +import { UIOptions } from '@app/framework'; import { ContentsDto, ContentsService } from '../services/contents.service'; import { createContent } from '../services/contents.service.spec'; -import { ResolveContents } from './resolvers'; import { TestValues } from './_test-helpers'; +import { ResolveContents } from './resolvers'; describe('ResolveContents', () => { const { diff --git a/frontend/src/app/shared/state/resolvers.ts b/frontend/src/app/shared/state/resolvers.ts index 2b7c1e447..152ab2313 100644 --- a/frontend/src/app/shared/state/resolvers.ts +++ b/frontend/src/app/shared/state/resolvers.ts @@ -9,8 +9,8 @@ import { Injectable } from '@angular/core'; import { Observable, from, of, shareReplay } from 'rxjs'; import { UIOptions } from '@app/framework'; import { AssetDto, AssetsDto, AssetsService } from './../services/assets.service'; -import { AppsState } from './apps.state'; import { ContentDto, ContentsDto, ContentsService } from './../services/contents.service'; +import { AppsState } from './apps.state'; abstract class ResolverBase }> { private readonly items: { [id: string]: Deferred } = {}; diff --git a/frontend/src/app/shared/state/roles.state.spec.ts b/frontend/src/app/shared/state/roles.state.spec.ts index 1b1794f01..85e702106 100644 --- a/frontend/src/app/shared/state/roles.state.spec.ts +++ b/frontend/src/app/shared/state/roles.state.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DialogService, RolesPayload, RolesService, RolesState, versioned } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { DialogService, RolesPayload, RolesService, RolesState, versioned } from '@app/shared/internal'; import { createRoles } from './../services/roles.service.spec'; import { TestValues } from './_test-helpers'; diff --git a/frontend/src/app/shared/state/roles.state.ts b/frontend/src/app/shared/state/roles.state.ts index a7613c4df..0fc2b438d 100644 --- a/frontend/src/app/shared/state/roles.state.ts +++ b/frontend/src/app/shared/state/roles.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, shareSubscribed, State, Version } from '@app/framework'; import { Observable } from 'rxjs'; import { finalize, tap } from 'rxjs/operators'; +import { DialogService, shareSubscribed, State, Version } from '@app/framework'; import { CreateRoleDto, RoleDto, RolesPayload, RolesService, UpdateRoleDto } from './../services/roles.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/rule-events.state.spec.ts b/frontend/src/app/shared/state/rule-events.state.spec.ts index e1779bc5b..e27e2471f 100644 --- a/frontend/src/app/shared/state/rule-events.state.spec.ts +++ b/frontend/src/app/shared/state/rule-events.state.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DialogService, RuleEventsDto, RuleEventsState, RulesService } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { DialogService, RuleEventsDto, RuleEventsState, RulesService } from '@app/shared/internal'; import { createRuleEvent } from './../services/rules.service.spec'; import { TestValues } from './_test-helpers'; diff --git a/frontend/src/app/shared/state/rule-events.state.ts b/frontend/src/app/shared/state/rule-events.state.ts index f01bf2f83..3c108f480 100644 --- a/frontend/src/app/shared/state/rule-events.state.ts +++ b/frontend/src/app/shared/state/rule-events.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, getPagingInfo, hasAnyLink, ListState, ResourceLinks, shareSubscribed, State } from '@app/framework'; import { EMPTY, Observable } from 'rxjs'; import { finalize, tap } from 'rxjs/operators'; +import { DialogService, getPagingInfo, hasAnyLink, ListState, ResourceLinks, shareSubscribed, State } from '@app/framework'; import { RuleEventDto, RulesService } from './../services/rules.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/rule-simulator.state.spec.ts b/frontend/src/app/shared/state/rule-simulator.state.spec.ts index 3290d7b94..ad1457d4f 100644 --- a/frontend/src/app/shared/state/rule-simulator.state.spec.ts +++ b/frontend/src/app/shared/state/rule-simulator.state.spec.ts @@ -5,14 +5,14 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DialogService, RulesService } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { DialogService, RulesService } from '@app/shared/internal'; import { SimulatedRuleEventsDto } from '../services/rules.service'; import { createSimulatedRuleEvent } from './../services/rules.service.spec'; -import { RuleSimulatorState } from './rule-simulator.state'; import { TestValues } from './_test-helpers'; +import { RuleSimulatorState } from './rule-simulator.state'; describe('RuleSimulatorState', () => { const { diff --git a/frontend/src/app/shared/state/rule-simulator.state.ts b/frontend/src/app/shared/state/rule-simulator.state.ts index 01aa14746..7e7ad6fe0 100644 --- a/frontend/src/app/shared/state/rule-simulator.state.ts +++ b/frontend/src/app/shared/state/rule-simulator.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, ListState, shareSubscribed, State } from '@app/framework'; import { EMPTY, Observable } from 'rxjs'; import { finalize, tap } from 'rxjs/operators'; +import { DialogService, ListState, shareSubscribed, State } from '@app/framework'; import { RulesService, SimulatedRuleEventDto } from './../services/rules.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/rules.state.spec.ts b/frontend/src/app/shared/state/rules.state.spec.ts index 8ed99e776..3d0555eca 100644 --- a/frontend/src/app/shared/state/rules.state.spec.ts +++ b/frontend/src/app/shared/state/rules.state.spec.ts @@ -5,14 +5,14 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DialogService, RulesDto, RulesService, versioned } from '@app/shared/internal'; import { firstValueFrom, of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { DialogService, RulesDto, RulesService, versioned } from '@app/shared/internal'; import { RuleDto } from './../services/rules.service'; import { createRule } from './../services/rules.service.spec'; -import { RulesState } from './rules.state'; import { TestValues } from './_test-helpers'; +import { RulesState } from './rules.state'; describe('RulesState', () => { const { diff --git a/frontend/src/app/shared/state/rules.state.ts b/frontend/src/app/shared/state/rules.state.ts index 66a42be55..b6358191c 100644 --- a/frontend/src/app/shared/state/rules.state.ts +++ b/frontend/src/app/shared/state/rules.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, shareSubscribed, State } from '@app/framework'; import { Observable, of } from 'rxjs'; import { finalize, map, tap } from 'rxjs/operators'; +import { DialogService, shareSubscribed, State } from '@app/framework'; import { RuleDto, RulesService, UpsertRuleDto } from './../services/rules.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/schema-tag-source.ts b/frontend/src/app/shared/state/schema-tag-source.ts index e1b92843d..12ec5b474 100644 --- a/frontend/src/app/shared/state/schema-tag-source.ts +++ b/frontend/src/app/shared/state/schema-tag-source.ts @@ -6,8 +6,8 @@ */ import { Injectable } from '@angular/core'; -import { TagConverter, TagValue } from '@app/framework'; import { map, shareReplay } from 'rxjs/operators'; +import { TagConverter, TagValue } from '@app/framework'; import { SchemaDto } from './../services/schemas.service'; import { SchemasState } from './schemas.state'; diff --git a/frontend/src/app/shared/state/schemas.forms.ts b/frontend/src/app/shared/state/schemas.forms.ts index e31383fcb..0aa6fe02b 100644 --- a/frontend/src/app/shared/state/schemas.forms.ts +++ b/frontend/src/app/shared/state/schemas.forms.ts @@ -8,8 +8,8 @@ /* eslint-disable no-useless-escape */ import { AbstractControl, FormControl, Validators } from '@angular/forms'; -import { Form, TemplatedFormArray, ExtendedFormGroup, ValidatorsEx, value$ } from '@app/framework'; import { map } from 'rxjs/operators'; +import { Form, TemplatedFormArray, ExtendedFormGroup, ValidatorsEx, value$ } from '@app/framework'; import { AddFieldDto, CreateSchemaDto, FieldRule, SchemaDto, SchemaPropertiesDto, SynchronizeSchemaDto, UpdateSchemaDto } from './../services/schemas.service'; import { createProperties, FieldPropertiesDto, FieldPropertiesVisitor } from './../services/schemas.types'; diff --git a/frontend/src/app/shared/state/schemas.state.spec.ts b/frontend/src/app/shared/state/schemas.state.spec.ts index 6c3bfd696..34c58793b 100644 --- a/frontend/src/app/shared/state/schemas.state.spec.ts +++ b/frontend/src/app/shared/state/schemas.state.spec.ts @@ -5,13 +5,13 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DialogService, SchemaDto, SchemasService, UpdateSchemaCategoryDto, versioned } from '@app/shared/internal'; import { firstValueFrom, of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { DialogService, SchemaDto, SchemasService, UpdateSchemaCategoryDto, versioned } from '@app/shared/internal'; import { createSchema } from './../services/schemas.service.spec'; -import { getCategoryTree, SchemasState } from './schemas.state'; import { TestValues } from './_test-helpers'; +import { getCategoryTree, SchemasState } from './schemas.state'; describe('SchemasState', () => { const { diff --git a/frontend/src/app/shared/state/schemas.state.ts b/frontend/src/app/shared/state/schemas.state.ts index 9e6825d51..babf29a82 100644 --- a/frontend/src/app/shared/state/schemas.state.ts +++ b/frontend/src/app/shared/state/schemas.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, shareMapSubscribed, shareSubscribed, State, Version } from '@app/framework'; import { EMPTY, Observable, of } from 'rxjs'; import { catchError, finalize, tap } from 'rxjs/operators'; +import { DialogService, shareMapSubscribed, shareSubscribed, State, Version } from '@app/framework'; import { AddFieldDto, CreateSchemaDto, FieldDto, FieldRule, NestedFieldDto, RootFieldDto, SchemaDto, SchemasService, UpdateFieldDto, UpdateSchemaDto, UpdateUIFields } from './../services/schemas.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/table-fields.spec.ts b/frontend/src/app/shared/state/table-fields.spec.ts index d17360a6a..2a20decdc 100644 --- a/frontend/src/app/shared/state/table-fields.spec.ts +++ b/frontend/src/app/shared/state/table-fields.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DateTime, Version } from '@app/framework'; -import { createProperties, MetaFields, RootFieldDto, SchemaDto, TableField, TableFields, UIState } from '@app/shared/internal'; import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; +import { DateTime, Version } from '@app/framework'; +import { createProperties, MetaFields, RootFieldDto, SchemaDto, TableField, TableFields, UIState } from '@app/shared/internal'; describe('TableFields', () => { let uiState: IMock; diff --git a/frontend/src/app/shared/state/ui.state.spec.ts b/frontend/src/app/shared/state/ui.state.spec.ts index b3201a869..d66b61638 100644 --- a/frontend/src/app/shared/state/ui.state.spec.ts +++ b/frontend/src/app/shared/state/ui.state.spec.ts @@ -5,9 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ResourceLinks, ResourcesDto, UIService, UIState, UsersService } from '@app/shared/internal'; import { of } from 'rxjs'; import { IMock, Mock } from 'typemoq'; +import { ResourceLinks, ResourcesDto, UIService, UIState, UsersService } from '@app/shared/internal'; import { TestValues } from './_test-helpers'; describe('UIState', () => { diff --git a/frontend/src/app/shared/state/ui.state.ts b/frontend/src/app/shared/state/ui.state.ts index 62b59c6e4..e105b5b10 100644 --- a/frontend/src/app/shared/state/ui.state.ts +++ b/frontend/src/app/shared/state/ui.state.ts @@ -6,8 +6,8 @@ */ import { Injectable } from '@angular/core'; -import { defined, hasAnyLink, State, Types } from '@app/framework'; import { distinctUntilChanged, filter, map } from 'rxjs/operators'; +import { defined, hasAnyLink, State, Types } from '@app/framework'; import { UIService } from './../services/ui.service'; import { UsersService } from './../services/users.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shared/state/workflows.state.spec.ts b/frontend/src/app/shared/state/workflows.state.spec.ts index df4d1b1a3..33d88df2a 100644 --- a/frontend/src/app/shared/state/workflows.state.spec.ts +++ b/frontend/src/app/shared/state/workflows.state.spec.ts @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { DialogService, versioned, WorkflowsPayload, WorkflowsService, WorkflowsState } from '@app/shared/internal'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; +import { DialogService, versioned, WorkflowsPayload, WorkflowsService, WorkflowsState } from '@app/shared/internal'; import { createWorkflows } from './../services/workflows.service.spec'; import { TestValues } from './_test-helpers'; diff --git a/frontend/src/app/shared/state/workflows.state.ts b/frontend/src/app/shared/state/workflows.state.ts index d5486b77b..4b5b905ce 100644 --- a/frontend/src/app/shared/state/workflows.state.ts +++ b/frontend/src/app/shared/state/workflows.state.ts @@ -6,9 +6,9 @@ */ import { Injectable } from '@angular/core'; -import { DialogService, shareSubscribed, State, Version } from '@app/framework'; import { Observable } from 'rxjs'; import { finalize, tap } from 'rxjs/operators'; +import { DialogService, shareSubscribed, State, Version } from '@app/framework'; import { WorkflowDto, WorkflowsPayload, WorkflowsService } from './../services/workflows.service'; import { AppsState } from './apps.state'; diff --git a/frontend/src/app/shell/pages/internal/apps-menu.component.ts b/frontend/src/app/shell/pages/internal/apps-menu.component.ts index 6e1e01385..4707ab551 100644 --- a/frontend/src/app/shell/pages/internal/apps-menu.component.ts +++ b/frontend/src/app/shell/pages/internal/apps-menu.component.ts @@ -9,9 +9,9 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { AppDto, AppsState, DialogModel, ModalModel, Title, TitleService, UIState } from '@app/shared'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; +import { AppDto, AppsState, DialogModel, ModalModel, Title, TitleService, UIState } from '@app/shared'; @Component({ selector: 'sqx-apps-menu', diff --git a/frontend/src/app/shell/pages/internal/search-menu.component.ts b/frontend/src/app/shell/pages/internal/search-menu.component.ts index 2302dc356..e39587f0e 100644 --- a/frontend/src/app/shell/pages/internal/search-menu.component.ts +++ b/frontend/src/app/shell/pages/internal/search-menu.component.ts @@ -7,8 +7,8 @@ import { ChangeDetectionStrategy, Component, Injectable, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { ApiUrlConfig, AppsState, AutocompleteComponent, AutocompleteSource, SearchResultDto, SearchService, Types } from '@app/shared/internal'; import { Observable, of } from 'rxjs'; +import { ApiUrlConfig, AppsState, AutocompleteComponent, AutocompleteSource, SearchResultDto, SearchService, Types } from '@app/shared/internal'; @Injectable() export class SearchSource implements AutocompleteSource {