Updated common - side nav

This commit is contained in:
Adina Țeudan 2021-10-05 22:46:44 +03:00
parent 6ab180d9d8
commit 760a446fd5
11 changed files with 6 additions and 62 deletions

View File

@ -1,4 +1,4 @@
<redaction-side-nav [title]="translations[type] | translate">
<iqser-side-nav [title]="translations[type] | translate">
<ng-container *ngFor="let item of items[type]">
<div
*ngIf="!item.hideIf"
@ -10,4 +10,4 @@
{{ item.label | translate }}
</div>
</ng-container>
</redaction-side-nav>
</iqser-side-nav>

View File

@ -98,7 +98,6 @@ export class UserListingScreenComponent extends ListingComponent<User> implement
private async _loadData() {
this.entitiesService.setEntities(await this.userService.loadAllUsers());
await this.userService.loadAllUsers();
this._computeStats();
this._loadingService.stop();
}

View File

@ -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({

View File

@ -4,7 +4,7 @@
</div>
<div class="dialog-content">
<redaction-side-nav [title]="'edit-dossier-dialog.side-nav-title' | translate">
<iqser-side-nav [title]="'edit-dossier-dialog.side-nav-title' | translate">
<div
(click)="changeTab(item.key)"
*ngFor="let item of navItems"
@ -12,7 +12,7 @@
[translate]="item.sideNavTitle || item.title"
class="item"
></div>
</redaction-side-nav>
</iqser-side-nav>
<div>
<div [class.no-actions]="!showActionButtons" [class.no-padding]="noPaddingTab" class="content">
<div *ngIf="showHeading" class="heading">

View File

@ -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';

View File

@ -337,6 +337,7 @@ export class ConfigService {
});
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
private _unassignFn = (reloadDossiers: () => Promise<void>) => async (file: File) => {
// TODO
console.log('unassign', file);

View File

@ -1,3 +0,0 @@
<div class="all-caps-label">{{ title }}</div>
<ng-content></ng-content>

View File

@ -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;
}
}
}

View File

@ -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() {}
}

View File

@ -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,

@ -1 +1 @@
Subproject commit 057fbfd2a8fe8a6b9432e03042f2cb5ed092fa0e
Subproject commit 0d7ed3db2fc8a37ada0666bf459925ecb55cc844