diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html index e9e153dfe..8d5b7be9b 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html @@ -1,4 +1,4 @@ - +
- + diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index ff0e8f244..d500a2c43 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -98,7 +98,6 @@ export class UserListingScreenComponent extends ListingComponent implement private async _loadData() { this.entitiesService.setEntities(await this.userService.loadAllUsers()); - await this.userService.loadAllUsers(); this._computeStats(); this._loadingService.stop(); } diff --git a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts index fbdeb4479..c6705fb29 100644 --- a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.ts @@ -4,7 +4,6 @@ import { UserService } from '@services/user.service'; import { Toaster } from '@iqser/common-ui'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Dossier } from '@state/model/dossier'; -import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossiersService } from '../../services/dossiers.service'; @Component({ diff --git a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index 48eb7f0b9..915d29570 100644 --- a/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -4,7 +4,7 @@
- +
-
+
diff --git a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts index dffaa52ad..998b8c106 100644 --- a/apps/red-ui/src/app/modules/dossier/dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/dossiers.module.ts @@ -34,7 +34,6 @@ import { ChangeLegalBasisDialogComponent } from './dialogs/change-legal-basis-di import { PageExclusionComponent } from './components/page-exclusion/page-exclusion.component'; import { RecategorizeImageDialogComponent } from './dialogs/recategorize-image-dialog/recategorize-image-dialog.component'; import { EditDossierAttributesComponent } from './dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component'; -import { DossiersService } from './services/dossiers.service'; import { SearchScreenComponent } from './screens/search-screen/search-screen.component'; import { EditDossierDeletedDocumentsComponent } from './dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component'; import { AnnotationsListComponent } from './components/file-workload/components/annotations-list/annotations-list.component'; diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts index 6e8dffd17..800e4f9d7 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts @@ -337,6 +337,7 @@ export class ConfigService { }); } + // eslint-disable-next-line @typescript-eslint/no-unused-vars private _unassignFn = (reloadDossiers: () => Promise) => async (file: File) => { // TODO console.log('unassign', file); diff --git a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.html b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.html deleted file mode 100644 index fd93d24b0..000000000 --- a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.html +++ /dev/null @@ -1,3 +0,0 @@ -
{{ title }}
- - diff --git a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss deleted file mode 100644 index 5e4fa5fc4..000000000 --- a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.scss +++ /dev/null @@ -1,37 +0,0 @@ -@use 'variables'; -@use 'common-mixins'; - -:host { - display: block; - min-width: 200px; - max-width: 200px; - background-color: variables.$grey-2; - border-right: 1px solid variables.$separator; - box-sizing: border-box; - padding: 8px; - height: 100%; - overflow: auto; - @include common-mixins.no-scroll-bar; - - .all-caps-label { - padding: 16px; - } - - ::ng-deep.item { - margin-bottom: 4px; - border-radius: 20px; - padding: 9px 16px; - cursor: pointer; - transition: background-color 0.2s; - font-weight: 500; - - &:not(.active):hover { - background-color: rgba(variables.$primary, 0.2); - } - - &.active { - background-color: variables.$primary; - color: variables.$white; - } - } -} diff --git a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.ts b/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.ts deleted file mode 100644 index ceb39fb1d..000000000 --- a/apps/red-ui/src/app/modules/shared/components/side-nav/side-nav.component.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Component, Input } from '@angular/core'; - -@Component({ - selector: 'redaction-side-nav', - templateUrl: './side-nav.component.html', - styleUrls: ['./side-nav.component.scss'] -}) -export class SideNavComponent { - @Input() title: string; - - constructor() {} -} diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index 3cffa1235..97ff6f7a2 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -17,7 +17,6 @@ import { MomentDateAdapter } from '@angular/material-moment-adapter'; import { SelectComponent } from './components/select/select.component'; import { NavigateLastDossiersScreenDirective } from './directives/navigate-last-dossiers-screen.directive'; import { DictionaryManagerComponent } from './components/dictionary-manager/dictionary-manager.component'; -import { SideNavComponent } from './components/side-nav/side-nav.component'; import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { AssignUserDropdownComponent } from './components/assign-user-dropdown/assign-user-dropdown.component'; import { DatePipe } from './pipes/date.pipe'; @@ -35,7 +34,6 @@ const components = [ SimpleDoughnutChartComponent, DictionaryAnnotationIconComponent, SelectComponent, - SideNavComponent, DictionaryManagerComponent, AssignUserDropdownComponent, TypeFilterComponent, diff --git a/libs/common-ui b/libs/common-ui index 057fbfd2a..0d7ed3db2 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 057fbfd2a8fe8a6b9432e03042f2cb5ed092fa0e +Subproject commit 0d7ed3db2fc8a37ada0666bf459925ecb55cc844