Moved dialogs in separate directory

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

@@ -20,7 +20,7 @@ import { languageInitializer } from './i18n/language.initializer';
 import { LanguageService } from './i18n/language.service';
 import { MatIconModule } from '@angular/material/icon';
 import { IconsModule } from './icons/icons.module';
-import { AddEditProjectDialogComponent } from './screens/project-listing-screen/add-edit-project-dialog/add-edit-project-dialog.component';
+import { AddEditProjectDialogComponent } from './dialogs/add-edit-project-dialog/add-edit-project-dialog.component';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTooltipModule } from '@angular/material/tooltip';
@@ -33,11 +33,11 @@ import { NgpSortModule } from 'ngp-sort-pipe';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSidenavModule } from '@angular/material/sidenav';
-import { FileDetailsDialogComponent } from './screens/file/file-preview-screen/file-details-dialog/file-details-dialog.component';
+import { FileDetailsDialogComponent } from './dialogs/file-details-dialog/file-details-dialog.component';
 import { ToastrModule } from 'ngx-toastr';
 import { ServiceWorkerModule } from '@angular/service-worker';
 import { environment } from '../environments/environment';
-import { ProjectDetailsDialogComponent } from './screens/project-overview-screen/project-details-dialog/project-details-dialog.component';
+import { ProjectDetailsDialogComponent } from './dialogs/project-details-dialog/project-details-dialog.component';
 import { AuthModule } from './auth/auth.module';
 import { FileUploadModule } from './upload/file-upload.module';
 import { FullPageLoadingIndicatorComponent } from './utils/full-page-loading-indicator/full-page-loading-indicator.component';
@@ -48,16 +48,16 @@ import { LogoComponent } from './logo/logo.component';
 import { CompositeRouteGuard } from './utils/composite-route.guard';
 import { AppStateGuard } from './state/app-state.guard';
 import { SimpleDoughnutChartComponent } from './components/simple-doughnut-chart/simple-doughnut-chart.component';
-import { ManualRedactionDialogComponent } from './screens/file/manual-redaction-dialog/manual-redaction-dialog.component';
+import { ManualRedactionDialogComponent } from './dialogs/manual-redaction-dialog/manual-redaction-dialog.component';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
 import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component';
 import { AuthGuard } from './auth/auth.guard';
 import { AuthErrorComponent } from './screens/auth-error/auth-error.component';
 import { RedRoleGuard } from './auth/red-role.guard';
-import { AssignProjectMembersDialogComponent } from './screens/project-overview-screen/project-members-dialog/assign-project-members-dialog.component';
+import { AssignProjectMembersDialogComponent } from './dialogs/assign-project-members-dialog/assign-project-members-dialog.component';
 import { MatListModule } from '@angular/material/list';
-import { AssignOwnerDialogComponent } from './components/project-members-dialog/assign-owner-dialog.component';
+import { AssignOwnerDialogComponent } from './dialogs/assign-owner-dialog/assign-owner-dialog.component';
 
 export function HttpLoaderFactory(httpClient: HttpClient) {
   return new TranslateHttpLoader(httpClient, '/assets/i18n/', '.json');

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

@@ -2,7 +2,7 @@ import {Component, Inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
 import {Project} from "@redaction/red-ui-http";
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";
-import {AppStateService} from "../../../state/app-state.service";
+import {AppStateService} from "../../state/app-state.service";
 
 @Component({
   selector: 'redaction-add-edit-project-dialog',

apps/red-ui/src/app/dialogs/assign-project-members-dialog/assign-project-members-dialog.component.ts

@@ -1,10 +1,10 @@
 import { Component, Inject } from '@angular/core';
 import { Project, ProjectControllerService } from '@redaction/red-ui-http';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { AppStateService, ProjectWrapper } from '../../../state/app-state.service';
-import { UserService } from '../../../user/user.service';
+import { AppStateService, ProjectWrapper } from '../../state/app-state.service';
+import { UserService } from '../../user/user.service';
 import { MatSelectionListChange } from '@angular/material/list';
-import { NotificationService, NotificationType } from '../../../notification/notification.service';
+import { NotificationService, NotificationType } from '../../notification/notification.service';
 
 @Component({
   selector: 'redaction-project-details-dialog',

apps/red-ui/src/app/dialogs/file-details-dialog/file-details-dialog.component.scss

@@ -0,0 +1,2 @@
+@import "../../../assets/styles/red-variables";
+

apps/red-ui/src/app/dialogs/file-details-dialog/file-details-dialog.component.ts

@@ -1,7 +1,7 @@
 import {Component, Inject, OnInit} from '@angular/core';
 import {FileStatus, FileUploadControllerService} from "@redaction/red-ui-http";
 import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
-import {download} from "../../../../utils/file-download-utils";
+import {download} from "../../utils/file-download-utils";
 
 @Component({
   selector: 'redaction-file-details-dialog',

apps/red-ui/src/app/dialogs/manual-redaction-dialog/manual-redaction-dialog.component.ts

@@ -1,6 +1,6 @@
 import {Component, Inject, OnInit} from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";
-import {AppStateService} from "../../../state/app-state.service";
+import {AppStateService} from "../../state/app-state.service";
 import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
 import {
   AddRedactionRequest,
@@ -8,11 +8,11 @@ import {
   ManualRedactionControllerService,
   TypeValue
 } from "@redaction/red-ui-http";
-import {NotificationService, NotificationType} from "../../../notification/notification.service";
+import {NotificationService, NotificationType} from "../../notification/notification.service";
 import {TranslateService} from "@ngx-translate/core";
 import {map} from "rxjs/operators";
 import {Observable} from "rxjs";
-import {UserService} from "../../../user/user.service";
+import {UserService} from "../../user/user.service";
 
 
 @Component({

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

@@ -1,8 +1,8 @@
 import {Component, Inject, OnInit} from '@angular/core';
 import {FileUploadControllerService, ReanalysisControllerService} from "@redaction/red-ui-http";
 import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
-import {download} from "../../../utils/file-download-utils";
-import {ProjectWrapper} from "../../../state/app-state.service";
+import {download} from "../../utils/file-download-utils";
+import {ProjectWrapper} from "../../state/app-state.service";
 
 @Component({
   selector: 'redaction-project-details-dialog',

apps/red-ui/src/app/screens/file/file-preview-screen/file-details-dialog/file-details-dialog.component.scss

@@ -1,2 +0,0 @@
-@import "../../../../../assets/styles/red-variables";
-

apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.scss

@@ -12,9 +12,11 @@ redaction-pdf-viewer {
   }
 }
 
-.download-container {
+.actions-container {
   display: flex;
   justify-content: flex-end;
+  align-items: center;
+  gap: 10px;
 }
 
 .filename {

apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts

@@ -12,12 +12,12 @@ import { TranslateService } from '@ngx-translate/core';
 import {NotificationService, NotificationType} from '../../../notification/notification.service';
 import { MatDialog } from '@angular/material/dialog';
 import { AppStateService } from '../../../state/app-state.service';
-import { FileDetailsDialogComponent } from './file-details-dialog/file-details-dialog.component';
+import { FileDetailsDialogComponent } from '../../../dialogs/file-details-dialog/file-details-dialog.component';
 import { ViewerSyncService } from '../service/viewer-sync.service';
 import { Annotations } from '@pdftron/webviewer';
 import { PdfViewerComponent } from '../pdf-viewer/pdf-viewer.component';
 import { AnnotationUtils } from '../../../utils/annotation-utils';
-import { ManualRedactionDialogComponent } from '../manual-redaction-dialog/manual-redaction-dialog.component';
+import { ManualRedactionDialogComponent } from '../../../dialogs/manual-redaction-dialog/manual-redaction-dialog.component';
 import { UserService } from '../../../user/user.service';
 import { debounce } from '../../../utils/debounce';
 import scrollIntoView from 'scroll-into-view-if-needed';

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

@@ -1,17 +1,17 @@
 import { Component, OnInit } from '@angular/core';
 import { Project, ProjectControllerService } from '@redaction/red-ui-http';
 import { MatDialog } from '@angular/material/dialog';
-import { AddEditProjectDialogComponent } from './add-edit-project-dialog/add-edit-project-dialog.component';
+import { AddEditProjectDialogComponent } from '../../dialogs/add-edit-project-dialog/add-edit-project-dialog.component';
 import { ConfirmationDialogComponent } from '../../common/confirmation-dialog/confirmation-dialog.component';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationService } from '../../notification/notification.service';
 import { AppStateService, ProjectWrapper } from '../../state/app-state.service';
 import { UserService } from '../../user/user.service';
-import { ProjectDetailsDialogComponent } from '../project-overview-screen/project-details-dialog/project-details-dialog.component';
+import { ProjectDetailsDialogComponent } from '../../dialogs/project-details-dialog/project-details-dialog.component';
 import { DoughnutChartConfig } from '../../components/simple-doughnut-chart/simple-doughnut-chart.component';
 import { SortingOption } from '../../utils/types';
 import { groupBy } from '../../utils/functions';
-import { AssignOwnerDialogComponent } from '../../components/project-members-dialog/assign-owner-dialog.component';
+import { AssignOwnerDialogComponent } from '../../dialogs/assign-owner-dialog/assign-owner-dialog.component';
 
 @Component({
   selector: 'redaction-project-listing-screen',

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

@@ -12,17 +12,17 @@ import { TranslateService } from '@ngx-translate/core';
 import { ConfirmationDialogComponent } from '../../common/confirmation-dialog/confirmation-dialog.component';
 import { MatDialog } from '@angular/material/dialog';
 import { AppStateService } from '../../state/app-state.service';
-import { ProjectDetailsDialogComponent } from './project-details-dialog/project-details-dialog.component';
+import { ProjectDetailsDialogComponent } from '../../dialogs/project-details-dialog/project-details-dialog.component';
 import { FileDropOverlayService } from '../../upload/file-drop/service/file-drop-overlay.service';
 import { FileUploadModel } from '../../upload/model/file-upload.model';
 import { FileUploadService } from '../../upload/file-upload.service';
 import { UploadStatusOverlayService } from '../../upload/upload-status-dialog/service/upload-status-overlay.service';
-import { AddEditProjectDialogComponent } from '../project-listing-screen/add-edit-project-dialog/add-edit-project-dialog.component';
+import { AddEditProjectDialogComponent } from '../../dialogs/add-edit-project-dialog/add-edit-project-dialog.component';
 import { UserService } from '../../user/user.service';
 import { SortingOption } from '../../utils/types';
 import { DoughnutChartConfig } from '../../components/simple-doughnut-chart/simple-doughnut-chart.component';
 import { groupBy } from '../../utils/functions';
-import { AssignProjectMembersDialogComponent } from './project-members-dialog/assign-project-members-dialog.component';
+import { AssignProjectMembersDialogComponent } from '../../dialogs/assign-project-members-dialog/assign-project-members-dialog.component';
 
 
 @Component({