From e3c2c5fe8712ffe0aab87924f739c70314ebac9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Fri, 19 Mar 2021 22:09:59 +0200 Subject: [PATCH] Move items outside of common directory --- apps/red-ui/src/app/app.module.ts | 8 ++++---- .../admin-page-header/admin-breadcrumbs.component.ts | 4 ++-- .../file-download-btn/file-download-btn.component.ts | 2 +- .../file-actions/file-actions.component.html | 0 .../file-actions/file-actions.component.scss | 0 .../file-actions/file-actions.component.ts | 2 +- .../filter/filter.component.html | 0 .../filter/filter.component.scss | 0 .../filter/filter.component.ts | 0 .../filter/model/filter.model.ts | 0 .../filter/utils/filter-utils.ts | 2 +- .../hidden-action/hidden-action.component.html | 0 .../hidden-action/hidden-action.component.scss | 0 .../hidden-action/hidden-action.component.ts | 0 .../initials-avatar/initials-avatar.component.html | 0 .../initials-avatar/initials-avatar.component.scss | 0 .../initials-avatar/initials-avatar.component.ts | 0 .../needs-work-badge/needs-work-badge.component.ts | 2 +- .../rule-set-actions/rule-set-actions.component.ts | 2 +- .../rule-set-view-switch/tabs.component.ts | 4 ++-- .../simple-doughnut-chart.component.ts | 2 +- .../team-members/team-members.component.ts | 2 +- .../components/type-filter/type-filter.component.ts | 2 +- .../force-redaction-dialog.component.ts | 2 +- .../manual-annotation-dialog.component.ts | 2 +- .../admin/audit-screen/audit-screen.component.ts | 2 +- .../default-colors-screen.component.ts | 2 +- .../dictionary-listing-screen.component.ts | 2 +- .../dictionary-overview-screen.component.ts | 2 +- .../digital-signature-screen.component.ts | 2 +- .../file-attributes-listing-screen.component.ts | 2 +- .../license-information-screen.component.ts | 2 +- .../rule-sets-listing-screen.component.ts | 2 +- .../admin/rules-screen/rules-screen.component.ts | 2 +- .../user-listing-screen.component.ts | 2 +- .../watermark-screen/watermark-screen.component.ts | 2 +- .../app/screens/base-screen/base-screen.component.ts | 4 ++-- .../annotation-actions.component.ts | 4 ++-- .../file-preview-screen.component.ts | 8 ++++---- .../app/screens/file/model/file-status.wrapper.ts | 2 +- .../file/page-indicator/page-indicator.component.ts | 2 +- .../screens/file/pdf-viewer/pdf-viewer.component.ts | 4 ++-- .../screens/file/service/annotation-draw.service.ts | 2 +- .../file/service/annotation-processing.service.ts | 6 +++--- .../app/screens/file/service/file-action.service.ts | 2 +- .../file/service/manual-annotation.service.ts | 2 +- .../screens/file/service/pdf-viewer-data.service.ts | 2 +- .../project-listing-actions.component.ts | 4 ++-- .../project-listing-details.component.ts | 2 +- .../project-listing-screen.component.ts | 12 ++++++------ .../bulk-actions/bulk-actions.component.ts | 2 +- .../project-details/project-details.component.ts | 6 +++--- .../project-overview-screen.component.ts | 12 ++++++------ .../src/app/upload-download/file-download.service.ts | 2 +- .../service => utils}/annotation-actions.service.ts | 10 +++++----- .../{common/service => utils}/permissions.service.ts | 8 ++++---- .../sorters/redaction-filter-sorter.ts | 0 .../app/{common => utils}/sorters/status-sorter.ts | 0 .../{common => utils}/sorters/super-type-sorter.ts | 0 .../service => utils}/user-preference.service.ts | 0 60 files changed, 77 insertions(+), 77 deletions(-) rename apps/red-ui/src/app/{common => components}/file-actions/file-actions.component.html (100%) rename apps/red-ui/src/app/{common => components}/file-actions/file-actions.component.scss (100%) rename apps/red-ui/src/app/{common => components}/file-actions/file-actions.component.ts (98%) rename apps/red-ui/src/app/{common => components}/filter/filter.component.html (100%) rename apps/red-ui/src/app/{common => components}/filter/filter.component.scss (100%) rename apps/red-ui/src/app/{common => components}/filter/filter.component.ts (100%) rename apps/red-ui/src/app/{common => components}/filter/model/filter.model.ts (100%) rename apps/red-ui/src/app/{common => components}/filter/utils/filter-utils.ts (98%) rename apps/red-ui/src/app/{common => components}/hidden-action/hidden-action.component.html (100%) rename apps/red-ui/src/app/{common => components}/hidden-action/hidden-action.component.scss (100%) rename apps/red-ui/src/app/{common => components}/hidden-action/hidden-action.component.ts (100%) rename apps/red-ui/src/app/{common => components}/initials-avatar/initials-avatar.component.html (100%) rename apps/red-ui/src/app/{common => components}/initials-avatar/initials-avatar.component.scss (100%) rename apps/red-ui/src/app/{common => components}/initials-avatar/initials-avatar.component.ts (100%) rename apps/red-ui/src/app/{common/service => utils}/annotation-actions.service.ts (96%) rename apps/red-ui/src/app/{common/service => utils}/permissions.service.ts (96%) rename apps/red-ui/src/app/{common => utils}/sorters/redaction-filter-sorter.ts (100%) rename apps/red-ui/src/app/{common => utils}/sorters/status-sorter.ts (100%) rename apps/red-ui/src/app/{common => utils}/sorters/super-type-sorter.ts (100%) rename apps/red-ui/src/app/{common/service => utils}/user-preference.service.ts (100%) diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 944c3e907..ccf7e55fe 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -40,7 +40,7 @@ import { AuthModule } from './auth/auth.module'; import { FileUploadDownloadModule } from './upload-download/file-upload-download.module'; import { FullPageLoadingIndicatorComponent } from './utils/full-page-loading-indicator/full-page-loading-indicator.component'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { InitialsAvatarComponent } from './common/initials-avatar/initials-avatar.component'; +import { InitialsAvatarComponent } from './components/initials-avatar/initials-avatar.component'; import { StatusBarComponent } from './components/status-bar/status-bar.component'; import { LogoComponent } from './logo/logo.component'; import { SimpleDoughnutChartComponent } from './components/simple-doughnut-chart/simple-doughnut-chart.component'; @@ -57,7 +57,7 @@ import { HumanizePipe } from './utils/humanize.pipe'; import { CommentsComponent } from './components/comments/comments.component'; import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dialog/manual-annotation-dialog.component'; import { ToastComponent } from './components/toast/toast.component'; -import { FilterComponent } from './common/filter/filter.component'; +import { FilterComponent } from './components/filter/filter.component'; import { TableColNameComponent } from './components/table-col-name/table-col-name.component'; import { ProjectDetailsComponent } from './screens/project-overview-screen/project-details/project-details.component'; import { PageIndicatorComponent } from './screens/file/page-indicator/page-indicator.component'; @@ -65,13 +65,13 @@ import { NeedsWorkBadgeComponent } from './components/needs-work-badge/needs-wor import { ProjectListingEmptyComponent } from './screens/empty-states/project-listing-empty/project-listing-empty.component'; import { AnnotationActionsComponent } from './screens/file/annotation-actions/annotation-actions.component'; import { ProjectListingDetailsComponent } from './screens/project-listing-screen/project-listing-details/project-listing-details.component'; -import { FileActionsComponent } from './common/file-actions/file-actions.component'; +import { FileActionsComponent } from './components/file-actions/file-actions.component'; import { TypeAnnotationIconComponent } from './components/type-annotation-icon/type-annotation-icon.component'; import { TypeFilterComponent } from './components/type-filter/type-filter.component'; import { DictionaryAnnotationIconComponent } from './components/dictionary-annotation-icon/dictionary-annotation-icon.component'; import { BulkActionsComponent } from './screens/project-overview-screen/bulk-actions/bulk-actions.component'; import { HttpCacheInterceptor } from '@redaction/red-cache'; -import { HiddenActionComponent } from './common/hidden-action/hidden-action.component'; +import { HiddenActionComponent } from './components/hidden-action/hidden-action.component'; import { IconButtonComponent } from './components/buttons/icon-button/icon-button.component'; import { UserButtonComponent } from './components/buttons/user-button/user-button.component'; import { CircleButtonComponent } from './components/buttons/circle-button/circle-button.component'; diff --git a/apps/red-ui/src/app/components/admin-page-header/admin-breadcrumbs.component.ts b/apps/red-ui/src/app/components/admin-page-header/admin-breadcrumbs.component.ts index c4318ebc3..d81a46fa9 100644 --- a/apps/red-ui/src/app/components/admin-page-header/admin-breadcrumbs.component.ts +++ b/apps/red-ui/src/app/components/admin-page-header/admin-breadcrumbs.component.ts @@ -1,7 +1,7 @@ import { Component, Input } from '@angular/core'; import { AppStateService } from '../../state/app-state.service'; -import { UserPreferenceService } from '../../common/service/user-preference.service'; -import { PermissionsService } from '../../common/service/permissions.service'; +import { UserPreferenceService } from '../../utils/user-preference.service'; +import { PermissionsService } from '../../utils/permissions.service'; @Component({ selector: 'redaction-admin-breadcrumbs', diff --git a/apps/red-ui/src/app/components/buttons/file-download-btn/file-download-btn.component.ts b/apps/red-ui/src/app/components/buttons/file-download-btn/file-download-btn.component.ts index 1686b0f38..21b7edb01 100644 --- a/apps/red-ui/src/app/components/buttons/file-download-btn/file-download-btn.component.ts +++ b/apps/red-ui/src/app/components/buttons/file-download-btn/file-download-btn.component.ts @@ -1,5 +1,5 @@ import { Component, Input } from '@angular/core'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { ProjectWrapper } from '../../../state/model/project.wrapper'; import { FileStatusWrapper } from '../../../screens/file/model/file-status.wrapper'; import { FileDownloadService } from '../../../upload-download/file-download.service'; diff --git a/apps/red-ui/src/app/common/file-actions/file-actions.component.html b/apps/red-ui/src/app/components/file-actions/file-actions.component.html similarity index 100% rename from apps/red-ui/src/app/common/file-actions/file-actions.component.html rename to apps/red-ui/src/app/components/file-actions/file-actions.component.html diff --git a/apps/red-ui/src/app/common/file-actions/file-actions.component.scss b/apps/red-ui/src/app/components/file-actions/file-actions.component.scss similarity index 100% rename from apps/red-ui/src/app/common/file-actions/file-actions.component.scss rename to apps/red-ui/src/app/components/file-actions/file-actions.component.scss diff --git a/apps/red-ui/src/app/common/file-actions/file-actions.component.ts b/apps/red-ui/src/app/components/file-actions/file-actions.component.ts similarity index 98% rename from apps/red-ui/src/app/common/file-actions/file-actions.component.ts rename to apps/red-ui/src/app/components/file-actions/file-actions.component.ts index c8fb60ed6..4d663a7c2 100644 --- a/apps/red-ui/src/app/common/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/components/file-actions/file-actions.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { PermissionsService } from '../service/permissions.service'; +import { PermissionsService } from '../../utils/permissions.service'; import { FileStatusWrapper } from '../../screens/file/model/file-status.wrapper'; import { DialogService } from '../../dialogs/dialog.service'; import { AppStateService } from '../../state/app-state.service'; diff --git a/apps/red-ui/src/app/common/filter/filter.component.html b/apps/red-ui/src/app/components/filter/filter.component.html similarity index 100% rename from apps/red-ui/src/app/common/filter/filter.component.html rename to apps/red-ui/src/app/components/filter/filter.component.html diff --git a/apps/red-ui/src/app/common/filter/filter.component.scss b/apps/red-ui/src/app/components/filter/filter.component.scss similarity index 100% rename from apps/red-ui/src/app/common/filter/filter.component.scss rename to apps/red-ui/src/app/components/filter/filter.component.scss diff --git a/apps/red-ui/src/app/common/filter/filter.component.ts b/apps/red-ui/src/app/components/filter/filter.component.ts similarity index 100% rename from apps/red-ui/src/app/common/filter/filter.component.ts rename to apps/red-ui/src/app/components/filter/filter.component.ts diff --git a/apps/red-ui/src/app/common/filter/model/filter.model.ts b/apps/red-ui/src/app/components/filter/model/filter.model.ts similarity index 100% rename from apps/red-ui/src/app/common/filter/model/filter.model.ts rename to apps/red-ui/src/app/components/filter/model/filter.model.ts diff --git a/apps/red-ui/src/app/common/filter/utils/filter-utils.ts b/apps/red-ui/src/app/components/filter/utils/filter-utils.ts similarity index 98% rename from apps/red-ui/src/app/common/filter/utils/filter-utils.ts rename to apps/red-ui/src/app/components/filter/utils/filter-utils.ts index 4b5458596..4941d5baa 100644 --- a/apps/red-ui/src/app/common/filter/utils/filter-utils.ts +++ b/apps/red-ui/src/app/components/filter/utils/filter-utils.ts @@ -1,7 +1,7 @@ import { FilterModel } from '../model/filter.model'; import { FileStatusWrapper } from '../../../screens/file/model/file-status.wrapper'; import { ProjectWrapper } from '../../../state/model/project.wrapper'; -import { PermissionsService } from '../../service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; export function processFilters(oldFilters: FilterModel[], newFilters: FilterModel[]) { copySettings(oldFilters, newFilters); diff --git a/apps/red-ui/src/app/common/hidden-action/hidden-action.component.html b/apps/red-ui/src/app/components/hidden-action/hidden-action.component.html similarity index 100% rename from apps/red-ui/src/app/common/hidden-action/hidden-action.component.html rename to apps/red-ui/src/app/components/hidden-action/hidden-action.component.html diff --git a/apps/red-ui/src/app/common/hidden-action/hidden-action.component.scss b/apps/red-ui/src/app/components/hidden-action/hidden-action.component.scss similarity index 100% rename from apps/red-ui/src/app/common/hidden-action/hidden-action.component.scss rename to apps/red-ui/src/app/components/hidden-action/hidden-action.component.scss diff --git a/apps/red-ui/src/app/common/hidden-action/hidden-action.component.ts b/apps/red-ui/src/app/components/hidden-action/hidden-action.component.ts similarity index 100% rename from apps/red-ui/src/app/common/hidden-action/hidden-action.component.ts rename to apps/red-ui/src/app/components/hidden-action/hidden-action.component.ts diff --git a/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.html b/apps/red-ui/src/app/components/initials-avatar/initials-avatar.component.html similarity index 100% rename from apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.html rename to apps/red-ui/src/app/components/initials-avatar/initials-avatar.component.html diff --git a/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss b/apps/red-ui/src/app/components/initials-avatar/initials-avatar.component.scss similarity index 100% rename from apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.scss rename to apps/red-ui/src/app/components/initials-avatar/initials-avatar.component.scss diff --git a/apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.ts b/apps/red-ui/src/app/components/initials-avatar/initials-avatar.component.ts similarity index 100% rename from apps/red-ui/src/app/common/initials-avatar/initials-avatar.component.ts rename to apps/red-ui/src/app/components/initials-avatar/initials-avatar.component.ts diff --git a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts index 2334c9b48..65b5a007f 100644 --- a/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts +++ b/apps/red-ui/src/app/components/needs-work-badge/needs-work-badge.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { AppStateService } from '../../state/app-state.service'; -import { PermissionsService } from '../../common/service/permissions.service'; +import { PermissionsService } from '../../utils/permissions.service'; import { FileStatusWrapper } from '../../screens/file/model/file-status.wrapper'; import { ProjectWrapper } from '../../state/model/project.wrapper'; diff --git a/apps/red-ui/src/app/components/rule-set-actions/rule-set-actions.component.ts b/apps/red-ui/src/app/components/rule-set-actions/rule-set-actions.component.ts index 902c3387a..5f6d4c15a 100644 --- a/apps/red-ui/src/app/components/rule-set-actions/rule-set-actions.component.ts +++ b/apps/red-ui/src/app/components/rule-set-actions/rule-set-actions.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; import { DialogService } from '../../dialogs/dialog.service'; -import { PermissionsService } from '../../common/service/permissions.service'; +import { PermissionsService } from '../../utils/permissions.service'; import { AppStateService } from '../../state/app-state.service'; import { Router } from '@angular/router'; diff --git a/apps/red-ui/src/app/components/rule-set-view-switch/tabs.component.ts b/apps/red-ui/src/app/components/rule-set-view-switch/tabs.component.ts index 5ddfe29e4..a62a34b73 100644 --- a/apps/red-ui/src/app/components/rule-set-view-switch/tabs.component.ts +++ b/apps/red-ui/src/app/components/rule-set-view-switch/tabs.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { AppStateService } from '../../state/app-state.service'; -import { UserPreferenceService } from '../../common/service/user-preference.service'; -import { PermissionsService } from '../../common/service/permissions.service'; +import { UserPreferenceService } from '../../utils/user-preference.service'; +import { PermissionsService } from '../../utils/permissions.service'; @Component({ selector: 'redaction-tabs', diff --git a/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts b/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts index 4705f8767..9828a12f8 100644 --- a/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts +++ b/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts @@ -1,6 +1,6 @@ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { Color } from '../../utils/types'; -import { FilterModel } from '../../common/filter/model/filter.model'; +import { FilterModel } from '../filter/model/filter.model'; export class DoughnutChartConfig { value: number; diff --git a/apps/red-ui/src/app/components/team-members/team-members.component.ts b/apps/red-ui/src/app/components/team-members/team-members.component.ts index f1f94c557..55e13d956 100644 --- a/apps/red-ui/src/app/components/team-members/team-members.component.ts +++ b/apps/red-ui/src/app/components/team-members/team-members.component.ts @@ -1,5 +1,5 @@ import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { PermissionsService } from '../../common/service/permissions.service'; +import { PermissionsService } from '../../utils/permissions.service'; @Component({ selector: 'redaction-team-members', diff --git a/apps/red-ui/src/app/components/type-filter/type-filter.component.ts b/apps/red-ui/src/app/components/type-filter/type-filter.component.ts index ed7bbc11f..fe3702f18 100644 --- a/apps/red-ui/src/app/components/type-filter/type-filter.component.ts +++ b/apps/red-ui/src/app/components/type-filter/type-filter.component.ts @@ -1,5 +1,5 @@ import { Component, Input, OnInit } from '@angular/core'; -import { FilterModel } from '../../common/filter/model/filter.model'; +import { FilterModel } from '../filter/model/filter.model'; import { AppStateService } from '../../state/app-state.service'; import { DEFAULT_RUL_SET_UUID } from '../../utils/rule-set-default'; diff --git a/apps/red-ui/src/app/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts b/apps/red-ui/src/app/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts index f79ef8af3..fa4fd1e35 100644 --- a/apps/red-ui/src/app/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts +++ b/apps/red-ui/src/app/dialogs/force-redaction-dialog/force-redaction-dialog.component.ts @@ -7,7 +7,7 @@ import { NotificationService } from '../../notification/notification.service'; import { TranslateService } from '@ngx-translate/core'; import { UserService } from '../../user/user.service'; import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service'; -import { PermissionsService } from '../../common/service/permissions.service'; +import { PermissionsService } from '../../utils/permissions.service'; export interface LegalBasisOption { label?: string; diff --git a/apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts b/apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts index 0e27b091c..38ce3848a 100644 --- a/apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts +++ b/apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts @@ -9,7 +9,7 @@ import { UserService } from '../../user/user.service'; import { ManualRedactionEntryWrapper } from '../../screens/file/model/manual-redaction-entry.wrapper'; import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service'; import { ManualAnnotationResponse } from '../../screens/file/model/manual-annotation-response'; -import { PermissionsService } from '../../common/service/permissions.service'; +import { PermissionsService } from '../../utils/permissions.service'; export interface LegalBasisOption { label?: string; diff --git a/apps/red-ui/src/app/screens/admin/audit-screen/audit-screen.component.ts b/apps/red-ui/src/app/screens/admin/audit-screen/audit-screen.component.ts index 0d0dbfae7..7df53cc82 100644 --- a/apps/red-ui/src/app/screens/admin/audit-screen/audit-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/audit-screen/audit-screen.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { FormBuilder, FormGroup } from '@angular/forms'; import { AuditControllerService, AuditResponse, AuditSearchRequest } from '@redaction/red-ui-http'; import { TranslateService } from '@ngx-translate/core'; diff --git a/apps/red-ui/src/app/screens/admin/default-colors-screen/default-colors-screen.component.ts b/apps/red-ui/src/app/screens/admin/default-colors-screen/default-colors-screen.component.ts index eb686c824..7fdaf535b 100644 --- a/apps/red-ui/src/app/screens/admin/default-colors-screen/default-colors-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/default-colors-screen/default-colors-screen.component.ts @@ -3,7 +3,7 @@ import { AppStateService } from '../../../state/app-state.service'; import { Colors, DictionaryControllerService, TypeValue } from '@redaction/red-ui-http'; import { ActivatedRoute } from '@angular/router'; import { SortingOption, SortingService } from '../../../utils/sorting.service'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { DialogService } from '../../../dialogs/dialog.service'; @Component({ diff --git a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.ts b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.ts index b511b141a..fd6b9f05a 100644 --- a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.ts @@ -6,7 +6,7 @@ import { DialogService } from '../../../dialogs/dialog.service'; import { AppStateService } from '../../../state/app-state.service'; import { tap } from 'rxjs/operators'; import { forkJoin } from 'rxjs'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { FormBuilder, FormGroup } from '@angular/forms'; import { debounce } from '../../../utils/debounce'; import { ActivatedRoute } from '@angular/router'; diff --git a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.ts b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.ts index e36ab7b20..e150eb501 100644 --- a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.ts @@ -2,7 +2,7 @@ import { Component, ElementRef, ViewChild } from '@angular/core'; import { DictionaryControllerService, TypeValue } from '@redaction/red-ui-http'; import { DialogService } from '../../../dialogs/dialog.service'; import { AppStateService } from '../../../state/app-state.service'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { ActivatedRoute, Router } from '@angular/router'; import { AceEditorComponent } from 'ng2-ace-editor'; import { debounce } from '../../../utils/debounce'; diff --git a/apps/red-ui/src/app/screens/admin/digital-signature-screen/digital-signature-screen.component.ts b/apps/red-ui/src/app/screens/admin/digital-signature-screen/digital-signature-screen.component.ts index 327553587..bbeb6b39b 100644 --- a/apps/red-ui/src/app/screens/admin/digital-signature-screen/digital-signature-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/digital-signature-screen/digital-signature-screen.component.ts @@ -3,7 +3,7 @@ import { DigitalSignature, DigitalSignatureControllerService } from '@redaction/ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NotificationService, NotificationType } from '../../../notification/notification.service'; import { TranslateService } from '@ngx-translate/core'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { lastIndexOfEnd } from '../../../utils/functions'; @Component({ diff --git a/apps/red-ui/src/app/screens/admin/file-attributes-listing-screen/file-attributes-listing-screen.component.ts b/apps/red-ui/src/app/screens/admin/file-attributes-listing-screen/file-attributes-listing-screen.component.ts index 38e6d3856..e3eecb7c6 100644 --- a/apps/red-ui/src/app/screens/admin/file-attributes-listing-screen/file-attributes-listing-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/file-attributes-listing-screen/file-attributes-listing-screen.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { FormBuilder, FormGroup } from '@angular/forms'; import { FileAttribute, FileAttributesControllerService } from '@redaction/red-ui-http'; import { AppStateService } from '../../../state/app-state.service'; diff --git a/apps/red-ui/src/app/screens/admin/license-information-screen/license-information-screen.component.ts b/apps/red-ui/src/app/screens/admin/license-information-screen/license-information-screen.component.ts index 263d57718..1e5081dba 100644 --- a/apps/red-ui/src/app/screens/admin/license-information-screen/license-information-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/license-information-screen/license-information-screen.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { LicenseReport, LicenseReportControllerService } from '@redaction/red-ui-http'; import { AppConfigService } from '../../../app-config/app-config.service'; import * as moment from 'moment'; diff --git a/apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.ts b/apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.ts index 798199927..7c7b9d617 100644 --- a/apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { SortingOption, SortingService } from '../../../utils/sorting.service'; import { DialogService } from '../../../dialogs/dialog.service'; import { AppStateService } from '../../../state/app-state.service'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { FormBuilder, FormGroup } from '@angular/forms'; import { debounce } from '../../../utils/debounce'; import { RuleSetModel } from '@redaction/red-ui-http'; diff --git a/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.ts b/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.ts index 33be7fbc2..21c30d8d9 100644 --- a/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.ts @@ -1,5 +1,5 @@ import { Component, ElementRef, ViewChild } from '@angular/core'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { AceEditorComponent } from 'ng2-ace-editor'; import { RulesControllerService, RuleSetModel } from '@redaction/red-ui-http'; import { NotificationService, NotificationType } from '../../../notification/notification.service'; diff --git a/apps/red-ui/src/app/screens/admin/user-listing-screen/user-listing-screen.component.ts b/apps/red-ui/src/app/screens/admin/user-listing-screen/user-listing-screen.component.ts index 99d12a890..f987df0de 100644 --- a/apps/red-ui/src/app/screens/admin/user-listing-screen/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/user-listing-screen/user-listing-screen.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { UserService } from '../../../user/user.service'; import { User } from '@redaction/red-ui-http'; import { FormBuilder, FormGroup } from '@angular/forms'; diff --git a/apps/red-ui/src/app/screens/admin/watermark-screen/watermark-screen.component.ts b/apps/red-ui/src/app/screens/admin/watermark-screen/watermark-screen.component.ts index d0238e7f3..c6f6b89f6 100644 --- a/apps/red-ui/src/app/screens/admin/watermark-screen/watermark-screen.component.ts +++ b/apps/red-ui/src/app/screens/admin/watermark-screen/watermark-screen.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import WebViewer, { WebViewerInstance } from '@pdftron/webviewer'; import { AppStateService } from '../../../state/app-state.service'; import { environment } from '../../../../environments/environment'; diff --git a/apps/red-ui/src/app/screens/base-screen/base-screen.component.ts b/apps/red-ui/src/app/screens/base-screen/base-screen.component.ts index 9f9e37fd8..e592b5e7f 100644 --- a/apps/red-ui/src/app/screens/base-screen/base-screen.component.ts +++ b/apps/red-ui/src/app/screens/base-screen/base-screen.component.ts @@ -2,8 +2,8 @@ import { Component } from '@angular/core'; import { UserService } from '../../user/user.service'; import { AppStateService } from '../../state/app-state.service'; import { LanguageService } from '../../i18n/language.service'; -import { PermissionsService } from '../../common/service/permissions.service'; -import { UserPreferenceService } from '../../common/service/user-preference.service'; +import { PermissionsService } from '../../utils/permissions.service'; +import { UserPreferenceService } from '../../utils/user-preference.service'; import { Router } from '@angular/router'; import { AppConfigService } from '../../app-config/app-config.service'; import { Title } from '@angular/platform-browser'; diff --git a/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.ts b/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.ts index a56185a0d..bb07606c9 100644 --- a/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.ts +++ b/apps/red-ui/src/app/screens/file/annotation-actions/annotation-actions.component.ts @@ -1,9 +1,9 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { AnnotationWrapper } from '../model/annotation.wrapper'; import { AppStateService } from '../../../state/app-state.service'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { AnnotationPermissions } from '../model/annotation.permissions'; -import { AnnotationActionsService } from '../../../common/service/annotation-actions.service'; +import { AnnotationActionsService } from '../../../utils/annotation-actions.service'; import { Annotations, WebViewerInstance } from '@pdftron/webviewer'; @Component({ diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts index 54111d07d..31c9a8f79 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts @@ -15,15 +15,15 @@ import { AnnotationData, FileDataModel } from '../model/file-data.model'; import { FileActionService } from '../service/file-action.service'; import { AnnotationDrawService } from '../service/annotation-draw.service'; import { AnnotationProcessingService } from '../service/annotation-processing.service'; -import { FilterModel } from '../../../common/filter/model/filter.model'; +import { FilterModel } from '../../../components/filter/model/filter.model'; import { tap } from 'rxjs/operators'; import { NotificationService } from '../../../notification/notification.service'; import { TranslateService } from '@ngx-translate/core'; import { FileStatusWrapper } from '../model/file-status.wrapper'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { Subscription, timer } from 'rxjs'; -import { handleFilterDelta, processFilters } from '../../../common/filter/utils/filter-utils'; -import { UserPreferenceService } from '../../../common/service/user-preference.service'; +import { handleFilterDelta, processFilters } from '../../../components/filter/utils/filter-utils'; +import { UserPreferenceService } from '../../../utils/user-preference.service'; import { UserService } from '../../../user/user.service'; import { FormBuilder, FormGroup } from '@angular/forms'; import { FileManagementControllerService, StatusControllerService } from '@redaction/red-ui-http'; diff --git a/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts b/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts index 0c827b641..234879708 100644 --- a/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts +++ b/apps/red-ui/src/app/screens/file/model/file-status.wrapper.ts @@ -1,5 +1,5 @@ import { FileStatus } from '@redaction/red-ui-http'; -import { StatusSorter } from '../../../common/sorters/status-sorter'; +import { StatusSorter } from '../../../utils/sorters/status-sorter'; export class FileStatusWrapper { constructor(public fileStatus: FileStatus, public reviewerName: string) {} diff --git a/apps/red-ui/src/app/screens/file/page-indicator/page-indicator.component.ts b/apps/red-ui/src/app/screens/file/page-indicator/page-indicator.component.ts index 29d7fbe39..4045a09c1 100644 --- a/apps/red-ui/src/app/screens/file/page-indicator/page-indicator.component.ts +++ b/apps/red-ui/src/app/screens/file/page-indicator/page-indicator.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import { ViewedPages, ViewedPagesControllerService } from '@redaction/red-ui-http'; import { AppStateService } from '../../../state/app-state.service'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { AppConfigKey, AppConfigService } from '../../../app-config/app-config.service'; import { Subscription } from 'rxjs'; diff --git a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts index 1e23aa9ee..171014c2d 100644 --- a/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts +++ b/apps/red-ui/src/app/screens/file/pdf-viewer/pdf-viewer.component.ts @@ -24,8 +24,8 @@ import { FileStatusWrapper } from '../model/file-status.wrapper'; import { KeycloakService } from 'keycloak-angular'; import { environment } from '../../../../environments/environment'; import { AnnotationDrawService } from '../service/annotation-draw.service'; -import { AnnotationActionsService } from '../../../common/service/annotation-actions.service'; -import { UserPreferenceService } from '../../../common/service/user-preference.service'; +import { AnnotationActionsService } from '../../../utils/annotation-actions.service'; +import { UserPreferenceService } from '../../../utils/user-preference.service'; import { translateQuads } from '../../../utils/pdf-coordinates'; import Tool = Tools.Tool; diff --git a/apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts b/apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts index 64c39f020..b3d23f7c4 100644 --- a/apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts +++ b/apps/red-ui/src/app/screens/file/service/annotation-draw.service.ts @@ -4,7 +4,7 @@ import { Rectangle, RedactionLogControllerService, SectionGrid, SectionRectangle import { hexToRgb } from '../../../utils/functions'; import { AppStateService } from '../../../state/app-state.service'; import { AnnotationWrapper } from '../model/annotation.wrapper'; -import { UserPreferenceService } from '../../../common/service/user-preference.service'; +import { UserPreferenceService } from '../../../utils/user-preference.service'; @Injectable({ providedIn: 'root' diff --git a/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts b/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts index f5943932f..379774b64 100644 --- a/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts +++ b/apps/red-ui/src/app/screens/file/service/annotation-processing.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; import { AppStateService } from '../../../state/app-state.service'; import { AnnotationWrapper } from '../model/annotation.wrapper'; -import { FilterModel } from '../../../common/filter/model/filter.model'; -import { handleCheckedValue } from '../../../common/filter/utils/filter-utils'; -import { SuperTypeSorter } from '../../../common/sorters/super-type-sorter'; +import { FilterModel } from '../../../components/filter/model/filter.model'; +import { handleCheckedValue } from '../../../components/filter/utils/filter-utils'; +import { SuperTypeSorter } from '../../../utils/sorters/super-type-sorter'; import { getFirstRelevantTextPart } from '../../../utils/functions'; @Injectable({ diff --git a/apps/red-ui/src/app/screens/file/service/file-action.service.ts b/apps/red-ui/src/app/screens/file/service/file-action.service.ts index 8b46665ca..bd2e063f3 100644 --- a/apps/red-ui/src/app/screens/file/service/file-action.service.ts +++ b/apps/red-ui/src/app/screens/file/service/file-action.service.ts @@ -4,7 +4,7 @@ import { AppStateService } from '../../../state/app-state.service'; import { UserService } from '../../../user/user.service'; import { FileStatus, ReanalysisControllerService, StatusControllerService } from '@redaction/red-ui-http'; import { FileStatusWrapper } from '../model/file-status.wrapper'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { isArray } from 'rxjs/internal-compatibility'; @Injectable({ diff --git a/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts b/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts index b8237d1b0..80c5a496e 100644 --- a/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts +++ b/apps/red-ui/src/app/screens/file/service/manual-annotation.service.ts @@ -6,7 +6,7 @@ import { NotificationService, NotificationType } from '../../../notification/not import { TranslateService } from '@ngx-translate/core'; import { tap } from 'rxjs/operators'; import { UserService } from '../../../user/user.service'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; @Injectable({ providedIn: 'root' diff --git a/apps/red-ui/src/app/screens/file/service/pdf-viewer-data.service.ts b/apps/red-ui/src/app/screens/file/service/pdf-viewer-data.service.ts index a97e95c0e..9d0378de4 100644 --- a/apps/red-ui/src/app/screens/file/service/pdf-viewer-data.service.ts +++ b/apps/red-ui/src/app/screens/file/service/pdf-viewer-data.service.ts @@ -10,7 +10,7 @@ import { import { FileType } from '../model/file-type'; import { FileDataModel } from '../model/file-data.model'; import { AppStateService } from '../../../state/app-state.service'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { FileStatusWrapper } from '../model/file-status.wrapper'; @Injectable({ diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-actions/project-listing-actions.component.ts b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-actions/project-listing-actions.component.ts index 5344a95b3..cb828511b 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-actions/project-listing-actions.component.ts +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-actions/project-listing-actions.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { ProjectWrapper } from '../../../state/model/project.wrapper'; -import { StatusSorter } from '../../../common/sorters/status-sorter'; +import { StatusSorter } from '../../../utils/sorters/status-sorter'; import { download } from '../../../utils/file-download-utils'; import { computerize } from '../../../utils/functions'; import { FileManagementControllerService } from '@redaction/red-ui-http'; diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-details/project-listing-details.component.ts b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-details/project-listing-details.component.ts index 5ee602320..ac3f1a42c 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-details/project-listing-details.component.ts +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-details/project-listing-details.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { DoughnutChartConfig } from '../../../components/simple-doughnut-chart/simple-doughnut-chart.component'; import { AppStateService } from '../../../state/app-state.service'; -import { FilterModel } from '../../../common/filter/model/filter.model'; +import { FilterModel } from '../../../components/filter/model/filter.model'; @Component({ selector: 'redaction-project-listing-details', diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts index d7736785c..f2ec6af0a 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.ts @@ -5,7 +5,7 @@ import { UserService } from '../../user/user.service'; import { DoughnutChartConfig } from '../../components/simple-doughnut-chart/simple-doughnut-chart.component'; import { groupBy, humanize } from '../../utils/functions'; import { DialogService } from '../../dialogs/dialog.service'; -import { FilterModel } from '../../common/filter/model/filter.model'; +import { FilterModel } from '../../components/filter/model/filter.model'; import { annotationFilterChecker, getFilteredEntities, @@ -13,20 +13,20 @@ import { projectMemberChecker, projectStatusChecker, ruleSetChecker -} from '../../common/filter/utils/filter-utils'; +} from '../../components/filter/utils/filter-utils'; import { TranslateService } from '@ngx-translate/core'; import { SortingOption, SortingService } from '../../utils/sorting.service'; -import { PermissionsService } from '../../common/service/permissions.service'; +import { PermissionsService } from '../../utils/permissions.service'; import { ProjectWrapper } from '../../state/model/project.wrapper'; import { Subscription, timer } from 'rxjs'; import { tap } from 'rxjs/operators'; import { TranslateChartService } from '../../utils/translate-chart.service'; -import { RedactionFilterSorter } from '../../common/sorters/redaction-filter-sorter'; -import { StatusSorter } from '../../common/sorters/status-sorter'; +import { RedactionFilterSorter } from '../../utils/sorters/redaction-filter-sorter'; +import { StatusSorter } from '../../utils/sorters/status-sorter'; import { Router } from '@angular/router'; import { FormBuilder, FormGroup } from '@angular/forms'; import { debounce } from '../../utils/debounce'; -import { FilterComponent } from '../../common/filter/filter.component'; +import { FilterComponent } from '../../components/filter/filter.component'; @Component({ selector: 'redaction-project-listing-screen', diff --git a/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.ts index 52a25d881..158723fa5 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/bulk-actions/bulk-actions.component.ts @@ -3,7 +3,7 @@ import { AppStateService } from '../../../state/app-state.service'; import { UserService } from '../../../user/user.service'; import { FileManagementControllerService, ReanalysisControllerService } from '@redaction/red-ui-http'; import { DialogService } from '../../../dialogs/dialog.service'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { PermissionsService } from '../../../utils/permissions.service'; import { FileStatusWrapper } from '../../file/model/file-status.wrapper'; import { FileActionService } from '../../file/service/file-action.service'; import { Observable } from 'rxjs'; diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.ts index b8c6f55ec..ab6e1b065 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-details/project-details.component.ts @@ -4,10 +4,10 @@ import { groupBy } from '../../../utils/functions'; import { DoughnutChartConfig } from '../../../components/simple-doughnut-chart/simple-doughnut-chart.component'; import { DialogService } from '../../../dialogs/dialog.service'; import { Router } from '@angular/router'; -import { FilterModel } from '../../../common/filter/model/filter.model'; -import { PermissionsService } from '../../../common/service/permissions.service'; +import { FilterModel } from '../../../components/filter/model/filter.model'; +import { PermissionsService } from '../../../utils/permissions.service'; import { TranslateChartService } from '../../../utils/translate-chart.service'; -import { StatusSorter } from '../../../common/sorters/status-sorter'; +import { StatusSorter } from '../../../utils/sorters/status-sorter'; @Component({ selector: 'redaction-project-details', diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts index c30ec9fa2..f82de01c5 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts @@ -9,23 +9,23 @@ import { StatusOverlayService } from '../../upload-download/status-overlay.servi import { DialogService } from '../../dialogs/dialog.service'; import { TranslateService } from '@ngx-translate/core'; import { FileActionService } from '../file/service/file-action.service'; -import { FilterModel } from '../../common/filter/model/filter.model'; +import { FilterModel } from '../../components/filter/model/filter.model'; import * as moment from 'moment'; import { ProjectDetailsComponent } from './project-details/project-details.component'; import { FileStatusWrapper } from '../file/model/file-status.wrapper'; -import { annotationFilterChecker, getFilteredEntities, keyChecker, processFilters } from '../../common/filter/utils/filter-utils'; +import { annotationFilterChecker, getFilteredEntities, keyChecker, processFilters } from '../../components/filter/utils/filter-utils'; import { SortingOption, SortingService } from '../../utils/sorting.service'; -import { PermissionsService } from '../../common/service/permissions.service'; +import { PermissionsService } from '../../utils/permissions.service'; import { UserService } from '../../user/user.service'; import { FileManagementControllerService, FileStatus } from '@redaction/red-ui-http'; import { Subscription, timer } from 'rxjs'; import { tap } from 'rxjs/operators'; -import { RedactionFilterSorter } from '../../common/sorters/redaction-filter-sorter'; -import { StatusSorter } from '../../common/sorters/status-sorter'; +import { RedactionFilterSorter } from '../../utils/sorters/redaction-filter-sorter'; +import { StatusSorter } from '../../utils/sorters/status-sorter'; import { FormBuilder, FormGroup } from '@angular/forms'; import { debounce } from '../../utils/debounce'; import { convertFiles, handleFileDrop } from '../../utils/file-drop-utils'; -import { FilterComponent } from '../../common/filter/filter.component'; +import { FilterComponent } from '../../components/filter/filter.component'; @Component({ selector: 'redaction-project-overview-screen', diff --git a/apps/red-ui/src/app/upload-download/file-download.service.ts b/apps/red-ui/src/app/upload-download/file-download.service.ts index 70956f07f..6038577ad 100644 --- a/apps/red-ui/src/app/upload-download/file-download.service.ts +++ b/apps/red-ui/src/app/upload-download/file-download.service.ts @@ -9,7 +9,7 @@ import { FileStatusWrapper } from '../screens/file/model/file-status.wrapper'; import { mergeMap, tap } from 'rxjs/operators'; import { DownloadStatusWrapper } from './model/download-status.wrapper'; import { AppStateService } from '../state/app-state.service'; -import { PermissionsService } from '../common/service/permissions.service'; +import { PermissionsService } from '../utils/permissions.service'; import { KeycloakService } from 'keycloak-angular'; @Injectable({ diff --git a/apps/red-ui/src/app/common/service/annotation-actions.service.ts b/apps/red-ui/src/app/utils/annotation-actions.service.ts similarity index 96% rename from apps/red-ui/src/app/common/service/annotation-actions.service.ts rename to apps/red-ui/src/app/utils/annotation-actions.service.ts index 20a0f00a3..1abfc4eda 100644 --- a/apps/red-ui/src/app/common/service/annotation-actions.service.ts +++ b/apps/red-ui/src/app/utils/annotation-actions.service.ts @@ -1,13 +1,13 @@ import { EventEmitter, Injectable, NgZone } from '@angular/core'; import { PermissionsService } from './permissions.service'; -import { ManualAnnotationService } from '../../screens/file/service/manual-annotation.service'; -import { DialogService } from '../../dialogs/dialog.service'; -import { AnnotationWrapper } from '../../screens/file/model/annotation.wrapper'; +import { ManualAnnotationService } from '../screens/file/service/manual-annotation.service'; +import { DialogService } from '../dialogs/dialog.service'; +import { AnnotationWrapper } from '../screens/file/model/annotation.wrapper'; import { Observable } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; import { AddRedactionRequest } from '@redaction/red-ui-http'; -import { getFirstRelevantTextPart } from '../../utils/functions'; -import { AnnotationPermissions } from '../../screens/file/model/annotation.permissions'; +import { getFirstRelevantTextPart } from './functions'; +import { AnnotationPermissions } from '../screens/file/model/annotation.permissions'; @Injectable({ providedIn: 'root' diff --git a/apps/red-ui/src/app/common/service/permissions.service.ts b/apps/red-ui/src/app/utils/permissions.service.ts similarity index 96% rename from apps/red-ui/src/app/common/service/permissions.service.ts rename to apps/red-ui/src/app/utils/permissions.service.ts index e75007ba8..4bcc25cb9 100644 --- a/apps/red-ui/src/app/common/service/permissions.service.ts +++ b/apps/red-ui/src/app/utils/permissions.service.ts @@ -1,9 +1,9 @@ import { Injectable } from '@angular/core'; -import { AppStateService } from '../../state/app-state.service'; -import { UserService, UserWrapper } from '../../user/user.service'; -import { FileStatusWrapper } from '../../screens/file/model/file-status.wrapper'; +import { AppStateService } from '../state/app-state.service'; +import { UserService, UserWrapper } from '../user/user.service'; +import { FileStatusWrapper } from '../screens/file/model/file-status.wrapper'; import { User } from '@redaction/red-ui-http'; -import { ProjectWrapper } from '../../state/model/project.wrapper'; +import { ProjectWrapper } from '../state/model/project.wrapper'; @Injectable({ providedIn: 'root' diff --git a/apps/red-ui/src/app/common/sorters/redaction-filter-sorter.ts b/apps/red-ui/src/app/utils/sorters/redaction-filter-sorter.ts similarity index 100% rename from apps/red-ui/src/app/common/sorters/redaction-filter-sorter.ts rename to apps/red-ui/src/app/utils/sorters/redaction-filter-sorter.ts diff --git a/apps/red-ui/src/app/common/sorters/status-sorter.ts b/apps/red-ui/src/app/utils/sorters/status-sorter.ts similarity index 100% rename from apps/red-ui/src/app/common/sorters/status-sorter.ts rename to apps/red-ui/src/app/utils/sorters/status-sorter.ts diff --git a/apps/red-ui/src/app/common/sorters/super-type-sorter.ts b/apps/red-ui/src/app/utils/sorters/super-type-sorter.ts similarity index 100% rename from apps/red-ui/src/app/common/sorters/super-type-sorter.ts rename to apps/red-ui/src/app/utils/sorters/super-type-sorter.ts diff --git a/apps/red-ui/src/app/common/service/user-preference.service.ts b/apps/red-ui/src/app/utils/user-preference.service.ts similarity index 100% rename from apps/red-ui/src/app/common/service/user-preference.service.ts rename to apps/red-ui/src/app/utils/user-preference.service.ts