Reorganize more files

apps/red-ui/src/app/app.module.ts

@@ -38,7 +38,7 @@ import { ServiceWorkerModule } from '@angular/service-worker';
 import { environment } from '../environments/environment';
 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 { FullPageLoadingIndicatorComponent } from './components/full-page-loading-indicator/full-page-loading-indicator.component';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { InitialsAvatarComponent } from './components/initials-avatar/initials-avatar.component';
 import { StatusBarComponent } from './components/status-bar/status-bar.component';
@@ -59,17 +59,17 @@ import { ManualAnnotationDialogComponent } from './dialogs/manual-redaction-dial
 import { ToastComponent } from './components/toast/toast.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 { ProjectDetailsComponent } from './components/project-details/project-details.component';
 import { PageIndicatorComponent } from './screens/file/page-indicator/page-indicator.component';
 import { NeedsWorkBadgeComponent } from './components/needs-work-badge/needs-work-badge.component';
-import { ProjectListingEmptyComponent } from './screens/empty-states/project-listing-empty/project-listing-empty.component';
+import { ProjectListingEmptyComponent } from './components/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 { ProjectListingDetailsComponent } from './components/project-listing-details/project-listing-details.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 { ProjectOverviewBulkActionsComponent } from './components/bulk-actions/project-overview-bulk-actions.component';
 import { HttpCacheInterceptor } from '@redaction/red-cache';
 import { HiddenActionComponent } from './components/hidden-action/hidden-action.component';
 import { IconButtonComponent } from './components/buttons/icon-button/icon-button.component';
@@ -78,7 +78,7 @@ import { CircleButtonComponent } from './components/buttons/circle-button/circle
 import { ChevronButtonComponent } from './components/buttons/chevron-button/chevron-button.component';
 import { DictionaryListingScreenComponent } from './screens/admin/dictionary-listing-screen/dictionary-listing-screen.component';
 import { SyncWidthDirective } from './utils/sync-width.directive';
-import { AddEditDictionaryDialogComponent } from './screens/admin/dictionary-listing-screen/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component';
+import { AddEditDictionaryDialogComponent } from './dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component';
 import { DictionaryOverviewScreenComponent } from './screens/admin/dictionary-overview-screen/dictionary-overview-screen.component';
 import { ColorPickerModule } from 'ngx-color-picker';
 import { AceEditorModule } from 'ng2-ace-editor';
@@ -90,10 +90,10 @@ import { RulesScreenComponent } from './screens/admin/rules-screen/rules-screen.
 import { WatermarkScreenComponent } from './screens/admin/watermark-screen/watermark-screen.component';
 import { PdfViewerScreenComponent } from './screens/pdf-viewer-screen/pdf-viewer-screen.component';
 import { HtmlDebugScreenComponent } from './screens/html-debug-screen/html-debug-screen.component';
-import { ProjectListingActionsComponent } from './screens/project-listing-screen/project-listing-actions/project-listing-actions.component';
+import { ProjectListingActionsComponent } from './components/project-listing-actions/project-listing-actions.component';
 import { HasScrollbarDirective } from './utils/has-scrollbar.directive';
 import { RuleSetsListingScreenComponent } from './screens/admin/rule-sets-listing-screen/rule-sets-listing-screen.component';
-import { AddEditRuleSetDialogComponent } from './screens/admin/rule-sets-listing-screen/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component';
+import { AddEditRuleSetDialogComponent } from './dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component';
 import { RuleSetActionsComponent } from './components/rule-set-actions/rule-set-actions.component';
 import { TabsComponent } from './components/rule-set-view-switch/tabs.component';
 import { MatSliderModule } from '@angular/material/slider';
@@ -102,13 +102,13 @@ import { KeycloakService } from 'keycloak-angular';
 import { FileDownloadBtnComponent } from './components/buttons/file-download-btn/file-download-btn.component';
 import { LicenseInformationScreenComponent } from './screens/admin/license-information-screen/license-information-screen.component';
 import { DefaultColorsScreenComponent } from './screens/admin/default-colors-screen/default-colors-screen.component';
-import { EditColorDialogComponent } from './screens/admin/default-colors-screen/edit-color-dialog/edit-color-dialog.component';
+import { EditColorDialogComponent } from './dialogs/edit-color-dialog/edit-color-dialog.component';
 import { DownloadsListScreenComponent } from './screens/downloads-list-screen/downloads-list-screen.component';
 import { DigitalSignatureScreenComponent } from './screens/admin/digital-signature-screen/digital-signature-screen.component';
 import { ScrollingModule } from '@angular/cdk/scrolling';
 import { RemoveAnnotationsDialogComponent } from './dialogs/remove-annotations-dialog/remove-annotations-dialog.component';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
-import { ComboChartComponent, ComboSeriesVerticalComponent } from './screens/admin/license-information-screen/combo-chart';
+import { ComboChartComponent, ComboSeriesVerticalComponent } from './components/combo-chart';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
 import { ForceRedactionDialogComponent } from './dialogs/force-redaction-dialog/force-redaction-dialog.component';
 import { AuditScreenComponent } from './screens/admin/audit-screen/audit-screen.component';
@@ -116,6 +116,7 @@ import { PaginationComponent } from './components/pagination/pagination.componen
 import { FileAttributesListingScreenComponent } from './screens/admin/file-attributes-listing-screen/file-attributes-listing-screen.component';
 import { SearchInputComponent } from './components/search-input/search-input.component';
 import { AppRoutingModule } from './app-routing.module';
+import { AddEditFileAttributeDialogComponent } from './dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component';
 
 export function HttpLoaderFactory(httpClient: HttpClient) {
     return new TranslateHttpLoader(httpClient, '/assets/i18n/', '.json');
@@ -181,7 +182,7 @@ const matImports = [
         TypeAnnotationIconComponent,
         TypeFilterComponent,
         DictionaryAnnotationIconComponent,
-        BulkActionsComponent,
+        ProjectOverviewBulkActionsComponent,
         FileActionsComponent,
         HiddenActionComponent,
         IconButtonComponent,
@@ -218,7 +219,8 @@ const matImports = [
         AuditScreenComponent,
         PaginationComponent,
         FileAttributesListingScreenComponent,
-        SearchInputComponent
+        SearchInputComponent,
+        AddEditFileAttributeDialogComponent
     ],
     imports: [
         BrowserModule,

apps/red-ui/src/app/components/bulk-actions/project-overview-bulk-actions.component.ts

@@ -1,20 +1,20 @@
 import { ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angular/core';
-import { AppStateService } from '../../../state/app-state.service';
-import { UserService } from '../../../user/user.service';
+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 '../../../utils/permissions.service';
-import { FileStatusWrapper } from '../../file/model/file-status.wrapper';
-import { FileActionService } from '../../file/service/file-action.service';
+import { DialogService } from '../../dialogs/dialog.service';
+import { PermissionsService } from '../../utils/permissions.service';
+import { FileStatusWrapper } from '../../screens/file/model/file-status.wrapper';
+import { FileActionService } from '../../screens/file/service/file-action.service';
 import { Observable } from 'rxjs';
-import { StatusOverlayService } from '../../../upload-download/status-overlay.service';
+import { StatusOverlayService } from '../../upload-download/status-overlay.service';
 
 @Component({
-    selector: 'redaction-bulk-actions',
-    templateUrl: './bulk-actions.component.html',
-    styleUrls: ['./bulk-actions.component.scss']
+    selector: 'redaction-project-overview-bulk-actions',
+    templateUrl: './project-overview-bulk-actions.component.html',
+    styleUrls: ['./project-overview-bulk-actions.component.scss']
 })
-export class BulkActionsComponent {
+export class ProjectOverviewBulkActionsComponent {
     @Input() selectedFileIds: string[];
     @Output() private reload = new EventEmitter();
     public loading = false;

apps/red-ui/src/app/components/empty-states/project-listing-empty/project-listing-empty.component.html

@@ -1,12 +1,6 @@
 <div class="empty-state-container">
     <div class="heading-xl" translate="project-listing.no-projects"></div>
-    <button
-        (click)="addProjectRequest.emit()"
-        *ngIf="userService.isManager()"
-        class="add-project-btn"
-        color="primary"
-        mat-flat-button
-    >
+    <button (click)="addProjectRequest.emit()" *ngIf="userService.isManager()" class="add-project-btn" color="primary" mat-flat-button>
         <mat-icon svgIcon="red:plus"></mat-icon>
         <span translate="project-listing.add-new"></span>
     </button>

apps/red-ui/src/app/components/project-details/project-details.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../assets/styles/red-variables';
+@import '../../../assets/styles/red-variables';
 
 .header-wrapper {
     display: flex;

apps/red-ui/src/app/components/project-details/project-details.component.ts

@@ -1,13 +1,13 @@
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { AppStateService } from '../../../state/app-state.service';
-import { groupBy } from '../../../utils/functions';
-import { DoughnutChartConfig } from '../../../components/simple-doughnut-chart/simple-doughnut-chart.component';
-import { DialogService } from '../../../dialogs/dialog.service';
+import { AppStateService } from '../../state/app-state.service';
+import { groupBy } from '../../utils/functions';
+import { DoughnutChartConfig } from '../simple-doughnut-chart/simple-doughnut-chart.component';
+import { DialogService } from '../../dialogs/dialog.service';
 import { Router } from '@angular/router';
-import { FilterModel } from '../../../components/filter/model/filter.model';
-import { PermissionsService } from '../../../utils/permissions.service';
-import { TranslateChartService } from '../../../utils/translate-chart.service';
-import { StatusSorter } from '../../../utils/sorters/status-sorter';
+import { FilterModel } from '../filter/model/filter.model';
+import { PermissionsService } from '../../utils/permissions.service';
+import { TranslateChartService } from '../../utils/translate-chart.service';
+import { StatusSorter } from '../../utils/sorters/status-sorter';
 
 @Component({
     selector: 'redaction-project-details',

apps/red-ui/src/app/components/project-listing-actions/project-listing-actions.component.ts

@@ -1,12 +1,12 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { PermissionsService } from '../../../utils/permissions.service';
-import { ProjectWrapper } from '../../../state/model/project.wrapper';
-import { StatusSorter } from '../../../utils/sorters/status-sorter';
-import { download } from '../../../utils/file-download-utils';
-import { computerize } from '../../../utils/functions';
+import { PermissionsService } from '../../utils/permissions.service';
+import { ProjectWrapper } from '../../state/model/project.wrapper';
+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';
-import { AppStateService } from '../../../state/app-state.service';
-import { DialogService } from '../../../dialogs/dialog.service';
+import { AppStateService } from '../../state/app-state.service';
+import { DialogService } from '../../dialogs/dialog.service';
 
 @Component({
     selector: 'redaction-project-listing-actions',

apps/red-ui/src/app/components/project-listing-details/project-listing-details.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../assets/styles/red-variables';
+@import '../../../assets/styles/red-variables';
 
 :host {
     flex: 1;

apps/red-ui/src/app/components/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 '../../../components/filter/model/filter.model';
+import { DoughnutChartConfig } from '../simple-doughnut-chart/simple-doughnut-chart.component';
+import { AppStateService } from '../../state/app-state.service';
+import { FilterModel } from '../filter/model/filter.model';
 
 @Component({
     selector: 'redaction-project-listing-details',

apps/red-ui/src/app/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.scss

@@ -1,4 +1,4 @@
-@import '../../../../../assets/styles/red-variables';
+@import '../../../assets/styles/red-variables';
 
 .first-row {
     display: flex;

apps/red-ui/src/app/dialogs/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component.ts

@@ -1,10 +1,10 @@
 import { Component, Inject } from '@angular/core';
-import { AppStateService } from '../../../../state/app-state.service';
+import { AppStateService } from '../../state/app-state.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { DictionaryControllerService, TypeValue } from '@redaction/red-ui-http';
 import { Observable } from 'rxjs';
-import { NotificationService, NotificationType } from '../../../../notification/notification.service';
+import { NotificationService, NotificationType } from '../../notification/notification.service';
 import { TranslateService } from '@ngx-translate/core';
 
 @Component({

apps/red-ui/src/app/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html

@@ -0,0 +1 @@
+<p>add-edit-file-attribute-dialog works!</p>

apps/red-ui/src/app/dialogs/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.ts

@@ -0,0 +1,12 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+    selector: 'redaction-add-edit-file-attribute-dialog',
+    templateUrl: './add-edit-file-attribute-dialog.component.html',
+    styleUrls: ['./add-edit-file-attribute-dialog.component.scss']
+})
+export class AddEditFileAttributeDialogComponent implements OnInit {
+    constructor() {}
+
+    ngOnInit(): void {}
+}

apps/red-ui/src/app/dialogs/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component.ts

@@ -1,5 +1,5 @@
 import { Component, Inject } from '@angular/core';
-import { AppStateService } from '../../../../state/app-state.service';
+import { AppStateService } from '../../state/app-state.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import * as moment from 'moment';

apps/red-ui/src/app/dialogs/dialog.service.ts

@@ -21,10 +21,10 @@ import { AnnotationWrapper } from '../screens/file/model/annotation.wrapper';
 import { ManualAnnotationDialogComponent } from './manual-redaction-dialog/manual-annotation-dialog.component';
 import { ManualAnnotationService } from '../screens/file/service/manual-annotation.service';
 import { ProjectWrapper } from '../state/model/project.wrapper';
-import { AddEditDictionaryDialogComponent } from '../screens/admin/dictionary-listing-screen/add-edit-dictionary-dialog/add-edit-dictionary-dialog.component';
-import { AddEditRuleSetDialogComponent } from '../screens/admin/rule-sets-listing-screen/add-edit-rule-set-dialog/add-edit-rule-set-dialog.component';
+import { AddEditDictionaryDialogComponent } from './add-edit-dictionary-dialog/add-edit-dictionary-dialog.component';
+import { AddEditRuleSetDialogComponent } from './add-edit-rule-set-dialog/add-edit-rule-set-dialog.component';
 import { OverwriteFilesDialogComponent } from './overwrite-files-dialog/overwrite-files-dialog.component';
-import { EditColorDialogComponent } from '../screens/admin/default-colors-screen/edit-color-dialog/edit-color-dialog.component';
+import { EditColorDialogComponent } from './edit-color-dialog/edit-color-dialog.component';
 import { RemoveAnnotationsDialogComponent } from './remove-annotations-dialog/remove-annotations-dialog.component';
 import { ForceRedactionDialogComponent } from './force-redaction-dialog/force-redaction-dialog.component';
 

apps/red-ui/src/app/dialogs/edit-color-dialog/edit-color-dialog.component.ts

@@ -1,7 +1,7 @@
 import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { Colors, DictionaryControllerService } from '@redaction/red-ui-http';
-import { NotificationService, NotificationType } from '../../../../notification/notification.service';
+import { NotificationService, NotificationType } from '../../notification/notification.service';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
 

apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html

@@ -112,7 +112,10 @@
                         {{ 'project-overview.table-header.title' | translate: { length: displayedFiles.length || 0 } }}
                     </span>
 
-                    <redaction-bulk-actions [selectedFileIds]="selectedFileIds" (reload)="bulkActionPerformed()"></redaction-bulk-actions>
+                    <redaction-project-overview-bulk-actions
+                        [selectedFileIds]="selectedFileIds"
+                        (reload)="bulkActionPerformed()"
+                    ></redaction-project-overview-bulk-actions>
                 </div>
 
                 <div class="table-header" redactionSyncWidth="table-item" [class.no-data]="noData">

apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts

@@ -11,7 +11,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { FileActionService } from '../file/service/file-action.service';
 import { FilterModel } from '../../components/filter/model/filter.model';
 import * as moment from 'moment';
-import { ProjectDetailsComponent } from './project-details/project-details.component';
+import { ProjectDetailsComponent } from '../../components/project-details/project-details.component';
 import { FileStatusWrapper } from '../file/model/file-status.wrapper';
 import { annotationFilterChecker, getFilteredEntities, keyChecker, processFilters } from '../../components/filter/utils/filter-utils';
 import { SortingOption, SortingService } from '../../utils/sorting.service';