From 8cea5be778abc63a83da6ab01ecfc2123ea66032 Mon Sep 17 00:00:00 2001 From: markuczy Date: Mon, 11 Mar 2024 09:18:20 +0100 Subject: [PATCH] refactor: moved all core files to top level --- libs/angular-accelerator/src/index.ts | 44 +++++++++---------- .../{core => }/angular-accelerator.module.ts | 2 +- .../column-group-selection.component.html | 0 .../column-group-selection.component.scss | 0 .../column-group-selection.component.ts | 2 +- ...ustom-group-column-selector.component.html | 0 ...ustom-group-column-selector.component.scss | 0 ...om-group-column-selector.component.spec.ts | 0 ...group-column-selector.component.stories.ts | 2 +- .../custom-group-column-selector.component.ts | 17 ++++--- .../data-layout-selection.component.html | 0 .../data-layout-selection.component.scss | 0 .../data-layout-selection.component.spec.ts | 0 .../data-layout-selection.component.ts | 0 .../data-list-grid-sorting.component.html | 0 .../data-list-grid-sorting.component.scss | 0 .../data-list-grid-sorting.component.spec.ts | 0 .../data-list-grid-sorting.component.ts | 6 +-- .../data-list-grid.component.html | 0 .../data-list-grid.component.scss | 0 .../data-list-grid.component.spec.ts | 6 +-- .../data-list-grid.component.ts | 10 ++--- .../data-sort-base/data-sort-base.ts | 17 +++---- .../data-table/data-table.component.html | 0 .../data-table/data-table.component.scss | 0 .../data-table/data-table.component.spec.ts | 4 +- .../data-table.component.stories.ts | 2 +- .../data-table/data-table.component.ts | 8 ++-- .../data-view/data-view.component.css | 0 .../data-view/data-view.component.html | 0 .../data-view/data-view.component.spec.ts | 4 +- .../data-view/data-view.component.ts | 6 +-- .../components/diagram/diagram.component.html | 0 .../components/diagram/diagram.component.scss | 0 .../diagram/diagram.component.spec.ts | 4 +- .../diagram/diagram.component.stories.ts | 4 +- .../components/diagram/diagram.component.ts | 4 +- .../group-by-count-diagram.component.html | 0 .../group-by-count-diagram.component.spec.ts | 6 +-- ...roup-by-count-diagram.component.stories.ts | 4 +- .../group-by-count-diagram.component.ts | 8 ++-- .../interactive-data-view.component.css | 0 .../interactive-data-view.component.html | 0 .../interactive-data-view.component.spec.ts | 8 ++-- .../interactive-data-view.component.ts | 6 +-- .../page-header/page-header.component.html | 0 .../page-header/page-header.component.scss | 0 .../page-header/page-header.component.spec.ts | 8 ++-- .../page-header.component.stories.ts | 0 .../page-header/page-header.component.ts | 6 +-- .../search-config.component.html | 0 .../search-config.component.scss | 0 .../search-config.component.spec.ts | 4 +- .../search-config/search-config.component.ts | 2 +- .../search-header.component.html | 0 .../search-header.component.scss | 0 .../search-header.component.spec.ts | 2 +- .../search-header/search-header.component.ts | 2 +- .../directives/if-permission.directive.ts | 2 +- .../src/lib/{core => }/pipes/dynamic.pipe.ts | 0 .../{core => }/pipes/relative-date.pipe.ts | 0 .../src/lib/{core => }/primeng.module.ts | 0 .../{core => }/storybook-breadcrumb.module.ts | 4 +- .../{core => }/storybook-translate.module.ts | 4 +- .../src/lib/{core => }/utils/colorutils.ts | 0 .../src/lib/{core => }/utils/dateutils.ts | 0 .../src/lib/{core => }/utils/objectutils.ts | 0 .../lib/{core => }/utils/primeicon.utils.ts | 0 68 files changed, 103 insertions(+), 105 deletions(-) rename libs/angular-accelerator/src/lib/{core => }/angular-accelerator.module.ts (98%) rename libs/angular-accelerator/src/lib/{core => }/components/column-group-selection/column-group-selection.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/column-group-selection/column-group-selection.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/column-group-selection/column-group-selection.component.ts (96%) rename libs/angular-accelerator/src/lib/{core => }/components/custom-group-column-selector/custom-group-column-selector.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/custom-group-column-selector/custom-group-column-selector.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/custom-group-column-selector/custom-group-column-selector.component.spec.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/components/custom-group-column-selector/custom-group-column-selector.component.stories.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/custom-group-column-selector/custom-group-column-selector.component.ts (85%) rename libs/angular-accelerator/src/lib/{core => }/components/data-layout-selection/data-layout-selection.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-layout-selection/data-layout-selection.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-layout-selection/data-layout-selection.component.spec.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-layout-selection/data-layout-selection.component.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-list-grid-sorting/data-list-grid-sorting.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-list-grid-sorting/data-list-grid-sorting.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-list-grid-sorting/data-list-grid-sorting.component.spec.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-list-grid-sorting/data-list-grid-sorting.component.ts (92%) rename libs/angular-accelerator/src/lib/{core => }/components/data-list-grid/data-list-grid.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-list-grid/data-list-grid.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-list-grid/data-list-grid.component.spec.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/data-list-grid/data-list-grid.component.ts (96%) rename libs/angular-accelerator/src/lib/{core => }/components/data-sort-base/data-sort-base.ts (92%) rename libs/angular-accelerator/src/lib/{core => }/components/data-table/data-table.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-table/data-table.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-table/data-table.component.spec.ts (99%) rename libs/angular-accelerator/src/lib/{core => }/components/data-table/data-table.component.stories.ts (98%) rename libs/angular-accelerator/src/lib/{core => }/components/data-table/data-table.component.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/data-view/data-view.component.css (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-view/data-view.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/data-view/data-view.component.spec.ts (99%) rename libs/angular-accelerator/src/lib/{core => }/components/data-view/data-view.component.ts (98%) rename libs/angular-accelerator/src/lib/{core => }/components/diagram/diagram.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/diagram/diagram.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/diagram/diagram.component.spec.ts (99%) rename libs/angular-accelerator/src/lib/{core => }/components/diagram/diagram.component.stories.ts (95%) rename libs/angular-accelerator/src/lib/{core => }/components/diagram/diagram.component.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/group-by-count-diagram/group-by-count-diagram.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/group-by-count-diagram/group-by-count-diagram.component.spec.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/group-by-count-diagram/group-by-count-diagram.component.stories.ts (96%) rename libs/angular-accelerator/src/lib/{core => }/components/group-by-count-diagram/group-by-count-diagram.component.ts (93%) rename libs/angular-accelerator/src/lib/{core => }/components/interactive-data-view/interactive-data-view.component.css (100%) rename libs/angular-accelerator/src/lib/{core => }/components/interactive-data-view/interactive-data-view.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/interactive-data-view/interactive-data-view.component.spec.ts (99%) rename libs/angular-accelerator/src/lib/{core => }/components/interactive-data-view/interactive-data-view.component.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/page-header/page-header.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/page-header/page-header.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/page-header/page-header.component.spec.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/page-header/page-header.component.stories.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/components/page-header/page-header.component.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/search-config/search-config.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/search-config/search-config.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/search-config/search-config.component.spec.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/search-config/search-config.component.ts (93%) rename libs/angular-accelerator/src/lib/{core => }/components/search-header/search-header.component.html (100%) rename libs/angular-accelerator/src/lib/{core => }/components/search-header/search-header.component.scss (100%) rename libs/angular-accelerator/src/lib/{core => }/components/search-header/search-header.component.spec.ts (97%) rename libs/angular-accelerator/src/lib/{core => }/components/search-header/search-header.component.ts (98%) rename libs/angular-accelerator/src/lib/{core => }/directives/if-permission.directive.ts (95%) rename libs/angular-accelerator/src/lib/{core => }/pipes/dynamic.pipe.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/pipes/relative-date.pipe.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/primeng.module.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/storybook-breadcrumb.module.ts (83%) rename libs/angular-accelerator/src/lib/{core => }/storybook-translate.module.ts (91%) rename libs/angular-accelerator/src/lib/{core => }/utils/colorutils.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/utils/dateutils.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/utils/objectutils.ts (100%) rename libs/angular-accelerator/src/lib/{core => }/utils/primeicon.utils.ts (100%) diff --git a/libs/angular-accelerator/src/index.ts b/libs/angular-accelerator/src/index.ts index 96b976d3..71056b03 100644 --- a/libs/angular-accelerator/src/index.ts +++ b/libs/angular-accelerator/src/index.ts @@ -1,20 +1,20 @@ // directives -export * from './lib/core/directives/if-permission.directive' +export * from './lib/directives/if-permission.directive' // components -export * from './lib/core/components/column-group-selection/column-group-selection.component' -export * from './lib/core/components/custom-group-column-selector/custom-group-column-selector.component' -export * from './lib/core/components/data-layout-selection/data-layout-selection.component' -export * from './lib/core/components/data-list-grid/data-list-grid.component' -export * from './lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component' -export * from './lib/core/components/data-table/data-table.component' -export * from './lib/core/components/data-view/data-view.component' -export * from './lib/core/components/diagram/diagram.component' -export * from './lib/core/components/group-by-count-diagram/group-by-count-diagram.component' -export * from './lib/core/components/interactive-data-view/interactive-data-view.component' -export * from './lib/core/components/page-header/page-header.component' -export * from './lib/core/components/search-config/search-config.component' -export * from './lib/core/components/search-header/search-header.component' +export * from './lib/components/column-group-selection/column-group-selection.component' +export * from './lib/components/custom-group-column-selector/custom-group-column-selector.component' +export * from './lib/components/data-layout-selection/data-layout-selection.component' +export * from './lib/components/data-list-grid/data-list-grid.component' +export * from './lib/components/data-list-grid-sorting/data-list-grid-sorting.component' +export * from './lib/components/data-table/data-table.component' +export * from './lib/components/data-view/data-view.component' +export * from './lib/components/diagram/diagram.component' +export * from './lib/components/group-by-count-diagram/group-by-count-diagram.component' +export * from './lib/components/interactive-data-view/interactive-data-view.component' +export * from './lib/components/page-header/page-header.component' +export * from './lib/components/search-config/search-config.component' +export * from './lib/components/search-header/search-header.component' // services export * from './lib/services/app-state.service' @@ -22,8 +22,8 @@ export * from './lib/services/breadcrumb.service' export * from './lib/services/user.service' // pipes -export * from './lib/core/pipes/dynamic.pipe' -export * from './lib/core/pipes/relative-date.pipe' +export * from './lib/pipes/dynamic.pipe' +export * from './lib/pipes/relative-date.pipe' // models export * from './lib/model/breadcrumb-menu-item.model' @@ -38,14 +38,14 @@ export * from './lib/model/diagram-type' export * from './lib/model/search-config' // core -export * from './lib/core/angular-accelerator.module' -// export * from './lib/core/primeng.module' +export * from './lib/angular-accelerator.module' +// export * from './lib/primeng.module' // functions export * from './lib/functions/flatten-object' // utils -export * from './lib/core/utils/colorutils' -export * from './lib/core/utils/dateutils' -export * from './lib/core/utils/objectutils' -export * from './lib/core/utils/primeicon.utils' +export * from './lib/utils/colorutils' +export * from './lib/utils/dateutils' +export * from './lib/utils/objectutils' +export * from './lib/utils/primeicon.utils' diff --git a/libs/angular-accelerator/src/lib/core/angular-accelerator.module.ts b/libs/angular-accelerator/src/lib/angular-accelerator.module.ts similarity index 98% rename from libs/angular-accelerator/src/lib/core/angular-accelerator.module.ts rename to libs/angular-accelerator/src/lib/angular-accelerator.module.ts index 22d43b45..6919e552 100644 --- a/libs/angular-accelerator/src/lib/core/angular-accelerator.module.ts +++ b/libs/angular-accelerator/src/lib/angular-accelerator.module.ts @@ -21,7 +21,7 @@ import { DynamicPipe } from './pipes/dynamic.pipe' import { RelativeDatePipe } from './pipes/relative-date.pipe' import { IfPermissionDirective } from './directives/if-permission.directive' -import { UserService } from '../services/user.service' +import { UserService } from './services/user.service' export class AngularAcceleratorMissingTranslationHandler implements MissingTranslationHandler { handle(params: MissingTranslationHandlerParams) { diff --git a/libs/angular-accelerator/src/lib/core/components/column-group-selection/column-group-selection.component.html b/libs/angular-accelerator/src/lib/components/column-group-selection/column-group-selection.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/column-group-selection/column-group-selection.component.html rename to libs/angular-accelerator/src/lib/components/column-group-selection/column-group-selection.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/column-group-selection/column-group-selection.component.scss b/libs/angular-accelerator/src/lib/components/column-group-selection/column-group-selection.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/column-group-selection/column-group-selection.component.scss rename to libs/angular-accelerator/src/lib/components/column-group-selection/column-group-selection.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/column-group-selection/column-group-selection.component.ts b/libs/angular-accelerator/src/lib/components/column-group-selection/column-group-selection.component.ts similarity index 96% rename from libs/angular-accelerator/src/lib/core/components/column-group-selection/column-group-selection.component.ts rename to libs/angular-accelerator/src/lib/components/column-group-selection/column-group-selection.component.ts index 91e14d4b..e04e0959 100644 --- a/libs/angular-accelerator/src/lib/core/components/column-group-selection/column-group-selection.component.ts +++ b/libs/angular-accelerator/src/lib/components/column-group-selection/column-group-selection.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' import { BehaviorSubject, combineLatest, map, Observable } from 'rxjs' -import { DataTableColumn } from '../../../model/data-table-column.model' +import { DataTableColumn } from '../../model/data-table-column.model' export type GroupSelectionChangedEvent = { activeColumns: DataTableColumn[]; groupKey: string } @Component({ diff --git a/libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.html b/libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.html rename to libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.scss b/libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.scss rename to libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.spec.ts b/libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.spec.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.spec.ts rename to libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.spec.ts diff --git a/libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.stories.ts b/libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.stories.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.stories.ts rename to libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.stories.ts index fa5f0812..89c76979 100644 --- a/libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.stories.ts +++ b/libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.stories.ts @@ -5,7 +5,7 @@ import { ButtonModule } from 'primeng/button' import { importProvidersFrom } from '@angular/core' import { BrowserModule } from '@angular/platform-browser' import { BrowserAnimationsModule } from '@angular/platform-browser/animations' -import { ColumnType } from '../../../model/column-type.model' +import { ColumnType } from '../../model/column-type.model' import { DropdownModule } from 'primeng/dropdown' import { DialogModule } from 'primeng/dialog' import { PickListModule } from 'primeng/picklist' diff --git a/libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.ts b/libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.ts similarity index 85% rename from libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.ts rename to libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.ts index 009ea997..cce9182d 100644 --- a/libs/angular-accelerator/src/lib/core/components/custom-group-column-selector/custom-group-column-selector.component.ts +++ b/libs/angular-accelerator/src/lib/components/custom-group-column-selector/custom-group-column-selector.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from '@angular/core' import { TranslateService } from '@ngx-translate/core' -import { DataTableColumn } from '../../../model/data-table-column.model' +import { DataTableColumn } from '../../model/data-table-column.model' export type ColumnSelectionChangedEvent = { activeColumns: DataTableColumn[] } export type ActionColumnChangedEvent = { @@ -69,14 +69,17 @@ export class CustomGroupColumnSelectorComponent { onSaveClick() { this.visible = false - const colIdsBefore = this.displayedColumns.map(column => column.id) - const colIdsAfter = this.displayedColumnsModel.map(column => column.id) - - if(!colIdsAfter.every((colId, i) => colId === colIdsBefore[i])) { + const colIdsBefore = this.displayedColumns.map((column) => column.id) + const colIdsAfter = this.displayedColumnsModel.map((column) => column.id) + + if (!colIdsAfter.every((colId, i) => colId === colIdsBefore[i])) { this.columnSelectionChanged.emit({ activeColumns: [...this.displayedColumnsModel] }) } - - if(this.frozenActionColumn != this.frozenActionColumnModel || this.actionColumnPosition != this.actionColumnPositionModel) { + + if ( + this.frozenActionColumn != this.frozenActionColumnModel || + this.actionColumnPosition != this.actionColumnPositionModel + ) { this.actionColumnConfigChanged.emit({ frozenActionColumn: this.frozenActionColumnModel, actionColumnPosition: this.actionColumnPositionModel, diff --git a/libs/angular-accelerator/src/lib/core/components/data-layout-selection/data-layout-selection.component.html b/libs/angular-accelerator/src/lib/components/data-layout-selection/data-layout-selection.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-layout-selection/data-layout-selection.component.html rename to libs/angular-accelerator/src/lib/components/data-layout-selection/data-layout-selection.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/data-layout-selection/data-layout-selection.component.scss b/libs/angular-accelerator/src/lib/components/data-layout-selection/data-layout-selection.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-layout-selection/data-layout-selection.component.scss rename to libs/angular-accelerator/src/lib/components/data-layout-selection/data-layout-selection.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/data-layout-selection/data-layout-selection.component.spec.ts b/libs/angular-accelerator/src/lib/components/data-layout-selection/data-layout-selection.component.spec.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-layout-selection/data-layout-selection.component.spec.ts rename to libs/angular-accelerator/src/lib/components/data-layout-selection/data-layout-selection.component.spec.ts diff --git a/libs/angular-accelerator/src/lib/core/components/data-layout-selection/data-layout-selection.component.ts b/libs/angular-accelerator/src/lib/components/data-layout-selection/data-layout-selection.component.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-layout-selection/data-layout-selection.component.ts rename to libs/angular-accelerator/src/lib/components/data-layout-selection/data-layout-selection.component.ts diff --git a/libs/angular-accelerator/src/lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component.html b/libs/angular-accelerator/src/lib/components/data-list-grid-sorting/data-list-grid-sorting.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component.html rename to libs/angular-accelerator/src/lib/components/data-list-grid-sorting/data-list-grid-sorting.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component.scss b/libs/angular-accelerator/src/lib/components/data-list-grid-sorting/data-list-grid-sorting.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component.scss rename to libs/angular-accelerator/src/lib/components/data-list-grid-sorting/data-list-grid-sorting.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component.spec.ts b/libs/angular-accelerator/src/lib/components/data-list-grid-sorting/data-list-grid-sorting.component.spec.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component.spec.ts rename to libs/angular-accelerator/src/lib/components/data-list-grid-sorting/data-list-grid-sorting.component.spec.ts diff --git a/libs/angular-accelerator/src/lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component.ts b/libs/angular-accelerator/src/lib/components/data-list-grid-sorting/data-list-grid-sorting.component.ts similarity index 92% rename from libs/angular-accelerator/src/lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component.ts rename to libs/angular-accelerator/src/lib/components/data-list-grid-sorting/data-list-grid-sorting.component.ts index 16ee27a9..c5c30d82 100644 --- a/libs/angular-accelerator/src/lib/core/components/data-list-grid-sorting/data-list-grid-sorting.component.ts +++ b/libs/angular-accelerator/src/lib/components/data-list-grid-sorting/data-list-grid-sorting.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' -import { DataSortDirection } from '../../../model/data-sort-direction' +import { DataSortDirection } from '../../model/data-sort-direction' import { BehaviorSubject } from 'rxjs' -import { DataColumnNameId } from '../../../model/data-column-name-id.model' -import { DataTableColumn } from '../../../model/data-table-column.model' +import { DataColumnNameId } from '../../model/data-column-name-id.model' +import { DataTableColumn } from '../../model/data-table-column.model' @Component({ selector: 'ocx-data-list-grid-sorting', diff --git a/libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.html b/libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.html rename to libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.scss b/libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.scss rename to libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.spec.ts b/libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.spec.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.spec.ts rename to libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.spec.ts index e4e62cc3..1eaf6afc 100644 --- a/libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.spec.ts +++ b/libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.spec.ts @@ -4,9 +4,9 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core' import { DataListGridComponent } from './data-list-grid.component' import { PrimeNgModule } from '../../primeng.module' import { TranslateTestingModule } from 'ngx-translate-testing' -import { ColumnType } from '../../../model/column-type.model' -import { DataListGridHarness } from '../../../../../testing/data-list-grid.harness' -import { DataTableHarness } from '../../../../../testing/data-table.harness' +import { ColumnType } from '../../model/column-type.model' +import { DataListGridHarness } from '../../../../testing/data-list-grid.harness' +import { DataTableHarness } from '../../../../testing/data-table.harness' import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed' import { ActivatedRoute, RouterModule } from '@angular/router' import { AngularAcceleratorModule } from '../../angular-accelerator.module' diff --git a/libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.ts b/libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.ts similarity index 96% rename from libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.ts rename to libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.ts index 7f6176ac..8e9a2482 100644 --- a/libs/angular-accelerator/src/lib/core/components/data-list-grid/data-list-grid.component.ts +++ b/libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.ts @@ -15,12 +15,12 @@ import { Router } from '@angular/router' import { TranslateService } from '@ngx-translate/core' import { MenuItem, PrimeIcons } from 'primeng/api' import { BehaviorSubject, Observable, combineLatest, map, mergeMap } from 'rxjs' -import { DataAction } from '../../../model/data-action' -import { DataSortDirection } from '../../../model/data-sort-direction' -import { DataTableColumn } from '../../../model/data-table-column.model' +import { DataAction } from '../../model/data-action' +import { DataSortDirection } from '../../model/data-sort-direction' +import { DataTableColumn } from '../../model/data-table-column.model' import { MfeInfo } from '@onecx/integration-interface' -import { AppStateService } from '../../../services/app-state.service' -import { UserService } from '../../../services/user.service' +import { AppStateService } from '../../services/app-state.service' +import { UserService } from '../../services/user.service' import { ObjectUtils } from '../../utils/objectutils' import { DataSortBase } from '../data-sort-base/data-sort-base' import { Filter, Row } from '../data-table/data-table.component' diff --git a/libs/angular-accelerator/src/lib/core/components/data-sort-base/data-sort-base.ts b/libs/angular-accelerator/src/lib/components/data-sort-base/data-sort-base.ts similarity index 92% rename from libs/angular-accelerator/src/lib/core/components/data-sort-base/data-sort-base.ts rename to libs/angular-accelerator/src/lib/components/data-sort-base/data-sort-base.ts index 91bc0b1f..6ae21b46 100644 --- a/libs/angular-accelerator/src/lib/core/components/data-sort-base/data-sort-base.ts +++ b/libs/angular-accelerator/src/lib/components/data-sort-base/data-sort-base.ts @@ -1,9 +1,9 @@ import { TranslateService } from '@ngx-translate/core' import { Observable, map, of } from 'rxjs' -import { flattenObject } from '../../../functions/flatten-object' -import { ColumnType } from '../../../model/column-type.model' -import { DataSortDirection } from '../../../model/data-sort-direction' -import { DataTableColumn } from '../../../model/data-table-column.model' +import { flattenObject } from '../../functions/flatten-object' +import { ColumnType } from '../../model/column-type.model' +import { DataSortDirection } from '../../model/data-sort-direction' +import { DataTableColumn } from '../../model/data-table-column.model' import { ListGridData } from '../../components/data-list-grid/data-list-grid.component' import { Row, Filter } from '../../components/data-table/data-table.component' import { ObjectUtils } from '../../utils/objectutils' @@ -14,12 +14,7 @@ export class DataSortBase { constructor(protected locale: string, protected translateService: TranslateService) {} translateItems( - [items, filters, sortColumn, sortDirection]: [ - RowListGridData[], - Filter[], - string, - DataSortDirection, - ], + [items, filters, sortColumn, sortDirection]: [RowListGridData[], Filter[], string, DataSortDirection], columns: DataTableColumn[], clientSideFiltering: boolean, clientSideSorting: boolean @@ -126,7 +121,7 @@ export class DataSortBase { createCompareFunction( translatedColValues: Record, sortColumn: string, - sortDirection: DataSortDirection, + sortDirection: DataSortDirection ): (a: Record, b: Record) => number { let direction = 0 if (sortDirection === DataSortDirection.ASCENDING) { diff --git a/libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.html b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.html rename to libs/angular-accelerator/src/lib/components/data-table/data-table.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.scss b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.scss rename to libs/angular-accelerator/src/lib/components/data-table/data-table.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.spec.ts b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.spec.ts similarity index 99% rename from libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.spec.ts rename to libs/angular-accelerator/src/lib/components/data-table/data-table.component.spec.ts index 24aabb0d..af714f05 100644 --- a/libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.spec.ts +++ b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.spec.ts @@ -4,10 +4,10 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core' import { DataTableComponent, Row } from './data-table.component' import { PrimeNgModule } from '../../primeng.module' import { TranslateTestingModule } from 'ngx-translate-testing' -import { ColumnType } from '../../../model/column-type.model' +import { ColumnType } from '../../model/column-type.model' import { AngularAcceleratorModule } from '../../angular-accelerator.module' import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed' -import { DataTableHarness } from '../../../../../testing' +import { DataTableHarness } from '../../../../testing' import { PTableCheckboxHarness } from '@onecx/angular-testing' describe('DataTableComponent', () => { diff --git a/libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.stories.ts b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.stories.ts similarity index 98% rename from libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.stories.ts rename to libs/angular-accelerator/src/lib/components/data-table/data-table.component.stories.ts index 1403e018..8b7e78a3 100644 --- a/libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.stories.ts +++ b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.stories.ts @@ -7,7 +7,7 @@ import { MultiSelectModule } from 'primeng/multiselect' import { importProvidersFrom } from '@angular/core' import { BrowserModule } from '@angular/platform-browser' import { BrowserAnimationsModule } from '@angular/platform-browser/animations' -import { ColumnType } from '../../../model/column-type.model' +import { ColumnType } from '../../model/column-type.model' type DataTableInputTypes = Pick const DataTableComponentSBConfig: Meta = { title: 'DataTableComponent', diff --git a/libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.ts b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.ts rename to libs/angular-accelerator/src/lib/components/data-table/data-table.component.ts index e81deccf..a4bf749d 100644 --- a/libs/angular-accelerator/src/lib/core/components/data-table/data-table.component.ts +++ b/libs/angular-accelerator/src/lib/components/data-table/data-table.component.ts @@ -14,10 +14,10 @@ import { Router } from '@angular/router' import { TranslateService } from '@ngx-translate/core' import { SelectItem } from 'primeng/api' import { BehaviorSubject, Observable, combineLatest, map, mergeMap, of } from 'rxjs' -import { ColumnType } from '../../../model/column-type.model' -import { DataAction } from '../../../model/data-action' -import { DataSortDirection } from '../../../model/data-sort-direction' -import { DataTableColumn } from '../../../model/data-table-column.model' +import { ColumnType } from '../../model/column-type.model' +import { DataAction } from '../../model/data-action' +import { DataSortDirection } from '../../model/data-sort-direction' +import { DataTableColumn } from '../../model/data-table-column.model' import { DataSortBase } from '../data-sort-base/data-sort-base' type Primitive = number | string | boolean | bigint | Date diff --git a/libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.css b/libs/angular-accelerator/src/lib/components/data-view/data-view.component.css similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.css rename to libs/angular-accelerator/src/lib/components/data-view/data-view.component.css diff --git a/libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.html b/libs/angular-accelerator/src/lib/components/data-view/data-view.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.html rename to libs/angular-accelerator/src/lib/components/data-view/data-view.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.spec.ts b/libs/angular-accelerator/src/lib/components/data-view/data-view.component.spec.ts similarity index 99% rename from libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.spec.ts rename to libs/angular-accelerator/src/lib/components/data-view/data-view.component.spec.ts index 537d0ac4..8ce177eb 100644 --- a/libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.spec.ts +++ b/libs/angular-accelerator/src/lib/components/data-view/data-view.component.spec.ts @@ -7,8 +7,8 @@ import { TranslateTestingModule } from 'ngx-translate-testing' import { HttpClientTestingModule } from '@angular/common/http/testing' import { DataTableComponent } from '../data-table/data-table.component' import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed' -import { DataListGridHarness, DataTableHarness, DataViewHarness } from '../../../../../testing' -import { ColumnType } from '../../../model/column-type.model' +import { DataListGridHarness, DataTableHarness, DataViewHarness } from '../../../../testing' +import { ColumnType } from '../../model/column-type.model' import { AngularAcceleratorModule } from '../../angular-accelerator.module' describe('DataViewComponent', () => { diff --git a/libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.ts b/libs/angular-accelerator/src/lib/components/data-view/data-view.component.ts similarity index 98% rename from libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.ts rename to libs/angular-accelerator/src/lib/components/data-view/data-view.component.ts index 6abf645d..9c37be50 100644 --- a/libs/angular-accelerator/src/lib/core/components/data-view/data-view.component.ts +++ b/libs/angular-accelerator/src/lib/components/data-view/data-view.component.ts @@ -12,9 +12,9 @@ import { } from '@angular/core' import { DataListGridComponent, ListGridData } from '../data-list-grid/data-list-grid.component' import { Row, Filter, Sort, DataTableComponent } from '../data-table/data-table.component' -import { DataTableColumn } from '../../../model/data-table-column.model' -import { DataSortDirection } from '../../../model/data-sort-direction' -import { DataAction } from '../../../model/data-action' +import { DataTableColumn } from '../../model/data-table-column.model' +import { DataSortDirection } from '../../model/data-sort-direction' +import { DataAction } from '../../model/data-action' export type RowListGridData = ListGridData & Row @Component({ diff --git a/libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.html b/libs/angular-accelerator/src/lib/components/diagram/diagram.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.html rename to libs/angular-accelerator/src/lib/components/diagram/diagram.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.scss b/libs/angular-accelerator/src/lib/components/diagram/diagram.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.scss rename to libs/angular-accelerator/src/lib/components/diagram/diagram.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.spec.ts b/libs/angular-accelerator/src/lib/components/diagram/diagram.component.spec.ts similarity index 99% rename from libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.spec.ts rename to libs/angular-accelerator/src/lib/components/diagram/diagram.component.spec.ts index 2a3e2d80..c0b22080 100644 --- a/libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.spec.ts +++ b/libs/angular-accelerator/src/lib/components/diagram/diagram.component.spec.ts @@ -6,8 +6,8 @@ import 'jest-canvas-mock' import { TranslateTestingModule } from 'ngx-translate-testing' import { ChartModule } from 'primeng/chart' import { MessageModule } from 'primeng/message' -import { DiagramHarness, TestbedHarnessEnvironment } from '../../../../../testing' -import { DiagramType } from '../../../model/diagram-type' +import { DiagramHarness, TestbedHarnessEnvironment } from '../../../../testing' +import { DiagramType } from '../../model/diagram-type' import { DiagramComponent, DiagramLayouts } from './diagram.component' import { PrimeIcons } from 'primeng/api' import { SelectButtonModule } from 'primeng/selectbutton' diff --git a/libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.stories.ts b/libs/angular-accelerator/src/lib/components/diagram/diagram.component.stories.ts similarity index 95% rename from libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.stories.ts rename to libs/angular-accelerator/src/lib/components/diagram/diagram.component.stories.ts index 6c5474a4..d666e866 100644 --- a/libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.stories.ts +++ b/libs/angular-accelerator/src/lib/components/diagram/diagram.component.stories.ts @@ -9,8 +9,8 @@ import { SkeletonModule } from 'primeng/skeleton' import { DynamicPipe } from '../../pipes/dynamic.pipe' import { StorybookTranslateModule } from '../../storybook-translate.module' import { DiagramComponent } from './diagram.component' -import { DiagramType } from '../../../model/diagram-type' -import { DiagramData } from '../../../model/diagram-data' +import { DiagramType } from '../../model/diagram-type' +import { DiagramData } from '../../model/diagram-data' import { ChartModule } from 'primeng/chart' import { SelectButtonModule } from 'primeng/selectbutton' import { FormsModule } from '@angular/forms' diff --git a/libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.ts b/libs/angular-accelerator/src/lib/components/diagram/diagram.component.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.ts rename to libs/angular-accelerator/src/lib/components/diagram/diagram.component.ts index f050e15c..c50b2ef3 100644 --- a/libs/angular-accelerator/src/lib/core/components/diagram/diagram.component.ts +++ b/libs/angular-accelerator/src/lib/components/diagram/diagram.component.ts @@ -3,8 +3,8 @@ import { TranslateService } from '@ngx-translate/core' import { ChartData, ChartOptions } from 'chart.js' import * as d3 from 'd3-scale-chromatic' import { PrimeIcons } from 'primeng/api' -import { DiagramData } from '../../../model/diagram-data' -import { DiagramType } from '../../../model/diagram-type' +import { DiagramData } from '../../model/diagram-data' +import { DiagramType } from '../../model/diagram-type' import { ColorUtils } from '../../utils/colorutils' import { PrimeIcon } from '../../utils/primeicon.utils' diff --git a/libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.html b/libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.html rename to libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.spec.ts b/libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.spec.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.spec.ts rename to libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.spec.ts index 5fd0e03d..efe50d59 100644 --- a/libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.spec.ts +++ b/libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.spec.ts @@ -8,11 +8,11 @@ import { TranslateTestingModule } from 'ngx-translate-testing' import { ChartModule } from 'primeng/chart' import { MessageModule } from 'primeng/message' import { firstValueFrom, of } from 'rxjs' -import { DiagramHarness } from '../../../../../testing' -import { ColumnType } from '../../../model/column-type.model' +import { DiagramHarness } from '../../../../testing' +import { ColumnType } from '../../model/column-type.model' import { DiagramComponent } from '../diagram/diagram.component' import { GroupByCountDiagramComponent } from './group-by-count-diagram.component' -import { DiagramType } from '../../../model/diagram-type' +import { DiagramType } from '../../model/diagram-type' describe('GroupByCountDiagramComponent', () => { let translateService: TranslateService diff --git a/libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.stories.ts b/libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.stories.ts similarity index 96% rename from libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.stories.ts rename to libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.stories.ts index 11b11ad9..d9ece2c4 100644 --- a/libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.stories.ts +++ b/libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.stories.ts @@ -8,12 +8,12 @@ import { MenuModule } from 'primeng/menu' import { SkeletonModule } from 'primeng/skeleton' import { DynamicPipe } from '../../pipes/dynamic.pipe' import { StorybookTranslateModule } from '../../storybook-translate.module' -import { DiagramType } from '../../../model/diagram-type' +import { DiagramType } from '../../model/diagram-type' import { ChartModule } from 'primeng/chart' import { SelectButtonModule } from 'primeng/selectbutton' import { GroupByCountDiagramComponent } from './group-by-count-diagram.component' import { DiagramComponent } from '../diagram/diagram.component' -import { ColumnType } from '../../../model/column-type.model' +import { ColumnType } from '../../model/column-type.model' export default { title: 'GroupByCountDiagramComponent', diff --git a/libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.ts b/libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.ts similarity index 93% rename from libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.ts rename to libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.ts index 48f4d702..932513ef 100644 --- a/libs/angular-accelerator/src/lib/core/components/group-by-count-diagram/group-by-count-diagram.component.ts +++ b/libs/angular-accelerator/src/lib/components/group-by-count-diagram/group-by-count-diagram.component.ts @@ -1,11 +1,11 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' -import { ColumnType } from '../../../model/column-type.model' -import { DiagramColumn } from '../../../model/diagram-column' +import { ColumnType } from '../../model/column-type.model' +import { DiagramColumn } from '../../model/diagram-column' import { ObjectUtils } from '../../utils/objectutils' import { BehaviorSubject, Observable, combineLatest, map, mergeMap, of } from 'rxjs' import { TranslateService } from '@ngx-translate/core' -import { DiagramData } from '../../../model/diagram-data' -import { DiagramType } from '../../../model/diagram-type' +import { DiagramData } from '../../model/diagram-data' +import { DiagramType } from '../../model/diagram-type' @Component({ selector: 'ocx-group-by-count-diagram', diff --git a/libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.css b/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.css similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.css rename to libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.css diff --git a/libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.html b/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.html rename to libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.spec.ts b/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.spec.ts similarity index 99% rename from libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.spec.ts rename to libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.spec.ts index 895cb820..c72b8682 100644 --- a/libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.spec.ts +++ b/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.spec.ts @@ -12,7 +12,7 @@ import { TranslateModule } from '@ngx-translate/core' import { HarnessLoader, parallel, TestElement } from '@angular/cdk/testing' import { AngularAcceleratorModule } from '../../angular-accelerator.module' import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed' -import { ColumnType } from '../../../model/column-type.model' +import { ColumnType } from '../../model/column-type.model' import { DataViewHarness, ColumnGroupSelectionHarness, @@ -23,7 +23,7 @@ import { DefaultGridItemHarness, DefaultListItemHarness, InteractiveDataViewHarness, -} from '../../../../../testing' +} from '../../../../testing' import { PDropdownHarness, PButtonHarness, @@ -39,8 +39,8 @@ import { TranslateTestingModule } from 'ngx-translate-testing' import { NoopAnimationsModule } from '@angular/platform-browser/animations' import { DateUtils } from '../../utils/dateutils' import { HttpClientModule } from '@angular/common/http' -import { UserService } from '../../../services/user.service' -import { MockUserService } from '../../../../../mocks/mock-user-service' +import { UserService } from '../../services/user.service' +import { MockUserService } from '../../../../mocks/mock-user-service' describe('InteractiveDataViewComponent', () => { let component: InteractiveDataViewComponent diff --git a/libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.ts b/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.ts rename to libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.ts index 65cbb6e8..4732d682 100644 --- a/libs/angular-accelerator/src/lib/core/components/interactive-data-view/interactive-data-view.component.ts +++ b/libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.ts @@ -1,6 +1,6 @@ import { Component, ContentChild, EventEmitter, Input, OnInit, Output, TemplateRef, ViewChild } from '@angular/core' -import { DataTableColumn } from '../../../model/data-table-column.model' -import { DataSortDirection } from '../../../model/data-sort-direction' +import { DataTableColumn } from '../../model/data-table-column.model' +import { DataSortDirection } from '../../model/data-sort-direction' import { Filter, Row, Sort } from '../data-table/data-table.component' import { DataViewComponent, RowListGridData } from '../data-view/data-view.component' import { GroupSelectionChangedEvent } from '../column-group-selection/column-group-selection.component' @@ -8,7 +8,7 @@ import { ActionColumnChangedEvent, ColumnSelectionChangedEvent, } from '../custom-group-column-selector/custom-group-column-selector.component' -import { DataAction } from '../../../model/data-action' +import { DataAction } from '../../model/data-action' @Component({ selector: 'ocx-interactive-data-view', diff --git a/libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.html b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.html rename to libs/angular-accelerator/src/lib/components/page-header/page-header.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.scss b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.scss rename to libs/angular-accelerator/src/lib/components/page-header/page-header.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.spec.ts b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.spec.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.spec.ts rename to libs/angular-accelerator/src/lib/components/page-header/page-header.component.spec.ts index 735aac0d..8a71f046 100644 --- a/libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.spec.ts +++ b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.spec.ts @@ -6,10 +6,10 @@ import { TranslateTestingModule } from 'ngx-translate-testing' import { BreadcrumbModule } from 'primeng/breadcrumb' import { MenuModule } from 'primeng/menu' import { ButtonModule } from 'primeng/button' -import { AppStateService } from '../../../services/app-state.service' -import { UserService } from '../../../services/user.service' -import { MockUserService } from '../../../../../mocks/mock-user-service' -import { PageHeaderHarness, TestbedHarnessEnvironment } from '../../../../../testing' +import { AppStateService } from '../../services/app-state.service' +import { UserService } from '../../services/user.service' +import { MockUserService } from '../../../../mocks/mock-user-service' +import { PageHeaderHarness, TestbedHarnessEnvironment } from '../../../../testing' import { DynamicPipe } from '../../pipes/dynamic.pipe' import { PrimeIcons } from 'primeng/api' import { NoopAnimationsModule } from '@angular/platform-browser/animations' diff --git a/libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.stories.ts b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.stories.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.stories.ts rename to libs/angular-accelerator/src/lib/components/page-header/page-header.component.stories.ts diff --git a/libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.ts b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.ts rename to libs/angular-accelerator/src/lib/components/page-header/page-header.component.ts index 4ad11e35..b78b128a 100644 --- a/libs/angular-accelerator/src/lib/core/components/page-header/page-header.component.ts +++ b/libs/angular-accelerator/src/lib/components/page-header/page-header.component.ts @@ -13,10 +13,10 @@ import { } from '@angular/core' import { MenuItem, PrimeIcons } from 'primeng/api' import { concat, map, Observable, of } from 'rxjs' -import { BreadcrumbService } from '../../../services/breadcrumb.service' +import { BreadcrumbService } from '../../services/breadcrumb.service' import { TranslateService } from '@ngx-translate/core' -import { AppStateService } from '../../../services/app-state.service' -import { UserService } from '../../../services/user.service' +import { AppStateService } from '../../services/app-state.service' +import { UserService } from '../../services/user.service' import { PrimeIcon } from '../../utils/primeicon.utils' /** diff --git a/libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.html b/libs/angular-accelerator/src/lib/components/search-config/search-config.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.html rename to libs/angular-accelerator/src/lib/components/search-config/search-config.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.scss b/libs/angular-accelerator/src/lib/components/search-config/search-config.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.scss rename to libs/angular-accelerator/src/lib/components/search-config/search-config.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.spec.ts b/libs/angular-accelerator/src/lib/components/search-config/search-config.component.spec.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.spec.ts rename to libs/angular-accelerator/src/lib/components/search-config/search-config.component.spec.ts index b4d32461..30f319ec 100644 --- a/libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.spec.ts +++ b/libs/angular-accelerator/src/lib/components/search-config/search-config.component.spec.ts @@ -5,9 +5,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing' import { NoopAnimationsModule } from '@angular/platform-browser/animations' import { TranslateService } from '@ngx-translate/core' import { MessageModule } from 'primeng/message' -import { SearchConfigPrimitive, SearchConfig } from '../../../model/search-config' +import { SearchConfigPrimitive, SearchConfig } from '../../model/search-config' import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed' -import { SearchConfigHarness } from '../../../../../testing' +import { SearchConfigHarness } from '../../../../testing' import { PrimeNgModule } from '../../primeng.module' import { ReactiveFormsModule } from '@angular/forms' diff --git a/libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.ts b/libs/angular-accelerator/src/lib/components/search-config/search-config.component.ts similarity index 93% rename from libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.ts rename to libs/angular-accelerator/src/lib/components/search-config/search-config.component.ts index 884af52c..44e2ece4 100644 --- a/libs/angular-accelerator/src/lib/core/components/search-config/search-config.component.ts +++ b/libs/angular-accelerator/src/lib/components/search-config/search-config.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' -import { SearchConfig } from '../../../model/search-config' +import { SearchConfig } from '../../model/search-config' import { FormControl, FormGroup } from '@angular/forms' @Component({ diff --git a/libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.html b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.html similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.html rename to libs/angular-accelerator/src/lib/components/search-header/search-header.component.html diff --git a/libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.scss b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.scss similarity index 100% rename from libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.scss rename to libs/angular-accelerator/src/lib/components/search-header/search-header.component.scss diff --git a/libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.spec.ts b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.spec.ts similarity index 97% rename from libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.spec.ts rename to libs/angular-accelerator/src/lib/components/search-header/search-header.component.spec.ts index 719faa00..bcd14fc5 100644 --- a/libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.spec.ts +++ b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.spec.ts @@ -6,7 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing' import { HttpClientTestingModule } from '@angular/common/http/testing' import { ButtonModule } from 'primeng/button' import { BreadcrumbModule } from 'primeng/breadcrumb' -import { AppStateService } from '../../../services/app-state.service' +import { AppStateService } from '../../services/app-state.service' import { AngularAcceleratorModule } from '../../angular-accelerator.module' describe('SearchHeaderComponent', () => { diff --git a/libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.ts b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts similarity index 98% rename from libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.ts rename to libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts index e93520af..0b2b40d9 100644 --- a/libs/angular-accelerator/src/lib/core/components/search-header/search-header.component.ts +++ b/libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts @@ -10,7 +10,7 @@ import { ViewChild, } from '@angular/core' import { Action } from '../page-header/page-header.component' -import { SearchConfig } from '../../../model/search-config' +import { SearchConfig } from '../../model/search-config' /** * To trigger the search when Enter key is pressed inside a search parameter field, diff --git a/libs/angular-accelerator/src/lib/core/directives/if-permission.directive.ts b/libs/angular-accelerator/src/lib/directives/if-permission.directive.ts similarity index 95% rename from libs/angular-accelerator/src/lib/core/directives/if-permission.directive.ts rename to libs/angular-accelerator/src/lib/directives/if-permission.directive.ts index 279293ad..8fdf132b 100644 --- a/libs/angular-accelerator/src/lib/core/directives/if-permission.directive.ts +++ b/libs/angular-accelerator/src/lib/directives/if-permission.directive.ts @@ -1,5 +1,5 @@ import { Directive, ElementRef, Input, OnInit, Optional, Renderer2, TemplateRef, ViewContainerRef } from '@angular/core' -import { UserService } from '../../services/user.service' +import { UserService } from '../services/user.service' @Directive({ selector: '[ocxIfPermission], [ocxIfNotPermission]' }) export class IfPermissionDirective implements OnInit { diff --git a/libs/angular-accelerator/src/lib/core/pipes/dynamic.pipe.ts b/libs/angular-accelerator/src/lib/pipes/dynamic.pipe.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/pipes/dynamic.pipe.ts rename to libs/angular-accelerator/src/lib/pipes/dynamic.pipe.ts diff --git a/libs/angular-accelerator/src/lib/core/pipes/relative-date.pipe.ts b/libs/angular-accelerator/src/lib/pipes/relative-date.pipe.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/pipes/relative-date.pipe.ts rename to libs/angular-accelerator/src/lib/pipes/relative-date.pipe.ts diff --git a/libs/angular-accelerator/src/lib/core/primeng.module.ts b/libs/angular-accelerator/src/lib/primeng.module.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/primeng.module.ts rename to libs/angular-accelerator/src/lib/primeng.module.ts diff --git a/libs/angular-accelerator/src/lib/core/storybook-breadcrumb.module.ts b/libs/angular-accelerator/src/lib/storybook-breadcrumb.module.ts similarity index 83% rename from libs/angular-accelerator/src/lib/core/storybook-breadcrumb.module.ts rename to libs/angular-accelerator/src/lib/storybook-breadcrumb.module.ts index 927892e4..594e6691 100644 --- a/libs/angular-accelerator/src/lib/core/storybook-breadcrumb.module.ts +++ b/libs/angular-accelerator/src/lib/storybook-breadcrumb.module.ts @@ -1,6 +1,6 @@ import { Inject, ModuleWithProviders, NgModule } from '@angular/core' -import { BreadCrumbMenuItem } from '../model/breadcrumb-menu-item.model' -import { BreadcrumbService } from '../services/breadcrumb.service' +import { BreadCrumbMenuItem } from './model/breadcrumb-menu-item.model' +import { BreadcrumbService } from './services/breadcrumb.service' import { StorybookTranslateModule } from './storybook-translate.module' @NgModule({ diff --git a/libs/angular-accelerator/src/lib/core/storybook-translate.module.ts b/libs/angular-accelerator/src/lib/storybook-translate.module.ts similarity index 91% rename from libs/angular-accelerator/src/lib/core/storybook-translate.module.ts rename to libs/angular-accelerator/src/lib/storybook-translate.module.ts index dcf895b4..40ed9906 100644 --- a/libs/angular-accelerator/src/lib/core/storybook-translate.module.ts +++ b/libs/angular-accelerator/src/lib/storybook-translate.module.ts @@ -1,7 +1,7 @@ import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core' import { NgModule, importProvidersFrom } from '@angular/core' import { HttpClient, HttpClientModule } from '@angular/common/http' -import { provideAppStateServiceMock } from '../../../mocks' +import { provideAppStateServiceMock } from '../../mocks' import { TranslateCombinedLoader } from './utils/translate.combined.loader' import { TranslateHttpLoader } from '@ngx-translate/http-loader' @@ -30,7 +30,7 @@ export class StorybookTranslateModule { constructor(translateService: TranslateService) { const lang = translateService.getBrowserLang() const supportedLanguages = ['de', 'en'] - if(lang && supportedLanguages.includes(lang)) { + if (lang && supportedLanguages.includes(lang)) { translateService.use(lang) } else { translateService.use('en') diff --git a/libs/angular-accelerator/src/lib/core/utils/colorutils.ts b/libs/angular-accelerator/src/lib/utils/colorutils.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/utils/colorutils.ts rename to libs/angular-accelerator/src/lib/utils/colorutils.ts diff --git a/libs/angular-accelerator/src/lib/core/utils/dateutils.ts b/libs/angular-accelerator/src/lib/utils/dateutils.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/utils/dateutils.ts rename to libs/angular-accelerator/src/lib/utils/dateutils.ts diff --git a/libs/angular-accelerator/src/lib/core/utils/objectutils.ts b/libs/angular-accelerator/src/lib/utils/objectutils.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/utils/objectutils.ts rename to libs/angular-accelerator/src/lib/utils/objectutils.ts diff --git a/libs/angular-accelerator/src/lib/core/utils/primeicon.utils.ts b/libs/angular-accelerator/src/lib/utils/primeicon.utils.ts similarity index 100% rename from libs/angular-accelerator/src/lib/core/utils/primeicon.utils.ts rename to libs/angular-accelerator/src/lib/utils/primeicon.utils.ts