Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Updated common

Browse Source
This commit is contained in:
Adina Țeudan 2021-10-04 22:47:48 +03:00
parent 45da2e2c74
commit 1ee8873a9c
25 changed files with 31 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/admin/screens/audit/audit-screen.component.html
View File

@ -23,7 +23,7 @@
<iqser-table
[headerTemplate]="headerTemplate"
[itemSize]="80"
[noDataIcon]="'red:document'"
[noDataIcon]="'iqser:document'"
[noDataText]="'audit-screen.no-data.title' | translate"
[totalSize]="logs?.totalHits || 0"
>

2
apps/red-ui/src/app/modules/admin/screens/dictionary-overview/dictionary-overview-screen.component.html
View File

@ -32,7 +32,7 @@
(action)="fileInput.click()"
*ngIf="currentUser.isAdmin"
[tooltip]="'dictionary-overview.action.upload' | translate"
icon="red:upload"
icon="iqser:upload"
tooltipPosition="below"
></iqser-circle-button>

2
apps/red-ui/src/app/modules/admin/screens/digital-signature/digital-signature-screen.component.html
View File

@ -21,7 +21,7 @@
*ngIf="!hasDigitalSignatureSet"
[buttonLabel]="'digital-signature-screen.no-data.action' | translate"
[text]="'digital-signature-screen.no-data.title' | translate"
buttonIcon="red:upload"
buttonIcon="iqser:upload"
></iqser-empty-state>
<div [class.hidden]="!hasDigitalSignatureSet" class="iqser-input-group required w-300">

2
apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.html
View File

@ -60,7 +60,7 @@
*ngIf="currentUser.isAdmin"
[tooltip]="'file-attributes-listing.upload-csv' | translate"
[type]="circleButtonTypes.dark"
icon="red:upload"
icon="iqser:upload"
tooltipPosition="above"
></iqser-circle-button>

2
apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/file-attributes-listing-screen.component.ts
View File

@ -71,7 +71,7 @@ export class FileAttributesListingScreenComponent extends ListingComponent<FileA
'addEditFileAttribute',
$event,
{ fileAttribute, dossierTemplateId: this._appStateService.activeDossierTemplateId },
async newValue => {
async (newValue: IFileAttributeConfig) => {
this._loadingService.start();
await this._fileAttributesService
.setFileAttributesConfig(newValue, this._appStateService.activeDossierTemplateId)

2
apps/red-ui/src/app/modules/admin/screens/reports/reports-screen.component.html
View File

@ -49,7 +49,7 @@
(action)="fileInput.click()"
*ngIf="permissionsService.isAdmin()"
[tooltip]="'reports-screen.upload-document' | translate"
icon="red:upload"
icon="iqser:upload"
></iqser-circle-button>
</div>

3
apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts
View File

@ -10,9 +10,8 @@ import { AddEditUserDialogComponent } from '../dialogs/add-edit-user-dialog/add-
import { ConfirmDeleteUsersDialogComponent } from '../dialogs/confirm-delete-users-dialog/confirm-delete-users-dialog.component';
import { FileAttributesCsvImportDialogComponent } from '../dialogs/file-attributes-csv-import-dialog/file-attributes-csv-import-dialog.component';
import { ComponentType } from '@angular/cdk/portal';
import { DialogService, largeDialogConfig } from '@shared/services/dialog.service';
import { AddEditDossierAttributeDialogComponent } from '../dialogs/add-edit-dossier-attribute-dialog/add-edit-dossier-attribute-dialog.component';
import { ConfirmationDialogComponent } from '@iqser/common-ui';
import { ConfirmationDialogComponent, DialogService, largeDialogConfig } from '@iqser/common-ui';
type DialogType =
| 'confirm'

2
apps/red-ui/src/app/modules/dossier/components/document-info/document-info.component.html
View File

@ -29,7 +29,7 @@
<span>{{ 'file-preview.tabs.document-info.details.dossier' | translate: { dossierName: dossier.dossierName } }}</span>
</div>
<div>
<mat-icon svgIcon="red:document"></mat-icon>
<mat-icon svgIcon="iqser:document"></mat-icon>
<span>{{ 'file-preview.tabs.document-info.details.pages' | translate: { pages: file.numberOfPages } }}</span>
</div>
<div>

2
apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
View File

@ -139,7 +139,7 @@
[horizontalPadding]="24"
[text]="'file-preview.no-data.title' | translate"
[verticalPadding]="40"
icon="red:document"
icon="iqser:document"
>
<ng-container *ngIf="fileData?.file?.excludedPages?.includes(activeViewerPage)">
{{ 'file-preview.tabs.annotations.page-is' | translate }}

8
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html
View File

@ -55,9 +55,9 @@
*ngIf="!currentAttrValue(attr)"
[disabled]="!canEdit"
[label]="'edit-dossier-dialog.attributes.upload-image' | translate"
class="upload-button"
icon="red:upload"
[type]="iconButtonTypes.dark"
class="upload-button"
icon="iqser:upload"
></iqser-icon-button>
<input
@ -75,14 +75,14 @@
<iqser-circle-button
(action)="deleteAttr(attr)"
[tooltip]="'edit-dossier-dialog.attributes.delete-image' | translate"
icon="red:trash"
[type]="circleButtonTypes.dark"
icon="red:trash"
></iqser-circle-button>
<iqser-circle-button
(action)="fileInputClick(attr)"
[tooltip]="'edit-dossier-dialog.attributes.upload-image' | translate"
icon="red:upload"
[type]="circleButtonTypes.dark"
icon="iqser:upload"
></iqser-circle-button>
</div>
</div>

2
apps/red-ui/src/app/modules/dossier/dialogs/edit-dossier-dialog/deleted-documents/edit-dossier-deleted-documents.component.html
View File

@ -5,7 +5,7 @@
[noDataText]="'edit-dossier-dialog.deleted-documents.no-data.title' | translate"
[selectionEnabled]="true"
[tableItemClasses]="{ disabled: disabledFn }"
noDataIcon="red:document"
noDataIcon="iqser:document"
></iqser-table>
<ng-template #headerTemplate>

2
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details-stats/dossier-details-stats.component.html
View File

@ -1,6 +1,6 @@
<ng-container *ngIf="dossiersService.activeDossier$ | async as dossier">
<div>
<mat-icon svgIcon="red:document"></mat-icon>
<mat-icon svgIcon="iqser:document"></mat-icon>
<span>{{ 'dossier-overview.dossier-details.stats.documents' | translate: { count: dossier.files.length } }}</span>
</div>
<div>

2
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts
View File

@ -283,7 +283,7 @@ export class ConfigService {
filterGroups.push({
slug: 'filesNamesFilter',
label: this._translateService.instant('dossier-overview.filters.label'),
icon: 'red:document',
icon: 'iqser:document',
filters: filesNamesFilters,
checker: keyChecker('filename'),
filterceptionPlaceholder: this._translateService.instant('dossier-overview.filters.search')

12
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html
View File

@ -26,7 +26,7 @@
[tooltip]="'dossier-overview.header-actions.upload-document' | translate"
[type]="circleButtonTypes.primary"
class="ml-14"
icon="red:upload"
icon="iqser:upload"
tooltipPosition="below"
></iqser-circle-button>
</iqser-page-header>
@ -47,8 +47,8 @@
[selectionEnabled]="true"
[showNoDataButton]="true"
[tableItemClasses]="{ disabled: disabledFn, 'last-opened': lastOpenedFn }"
noDataButtonIcon="red:upload"
noDataIcon="red:document"
noDataButtonIcon="iqser:upload"
noDataIcon="iqser:document"
></iqser-table>
<iqser-workflow
@ -62,10 +62,10 @@
[noDataText]="'dossier-overview.no-data.title' | translate"
[showNoDataButton]="true"
addElementColumn="UNASSIGNED"
addElementIcon="red:upload"
addElementIcon="iqser:upload"
itemHeight="56px"
noDataButtonIcon="red:upload"
noDataIcon="red:document"
noDataButtonIcon="iqser:upload"
noDataIcon="iqser:document"
></iqser-workflow>
</div>

2
apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html
View File

@ -9,7 +9,7 @@
</div>
<div class="small-label stats-subtitle">
<div>
<mat-icon svgIcon="red:document"></mat-icon>
<mat-icon svgIcon="iqser:document"></mat-icon>
{{ dossier.filesLength }}
</div>
<div>

2
apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/screen/dossiers-listing-screen.component.ts
View File

@ -109,7 +109,7 @@ export class DossiersListingScreenComponent
}
openAddDossierDialog(): void {
this._dialogService.openDialog('addDossier', null, null, async addResponse => {
this._dialogService.openDialog('addDossier', null, null, async (addResponse: { dossier: Dossier; addMembers: boolean }) => {
await this._router.navigate([`/main/dossiers/${addResponse.dossier.id}`]);
if (addResponse.addMembers) {
this._dialogService.openDialog('editDossier', null, {

6
apps/red-ui/src/app/modules/dossier/services/annotation-actions.service.ts
View File

@ -4,7 +4,7 @@ import { ManualAnnotationService } from './manual-annotation.service';
import { AnnotationWrapper } from '@models/file/annotation.wrapper';
import { Observable } from 'rxjs';
import { TranslateService } from '@ngx-translate/core';
import { AddRedactionRequest } from '@redaction/red-ui-http';
import { AddRedactionRequest, ForceRedactionRequest } from '@redaction/red-ui-http';
import { getFirstRelevantTextPart } from '@utils/functions';
import { AnnotationPermissions } from '@models/file/annotation.permissions';
import { DossiersDialogService } from './dossiers-dialog.service';
@ -44,7 +44,7 @@ export class AnnotationActionsService {
}
forceRedaction($event: MouseEvent, annotations: AnnotationWrapper[], annotationsChanged: EventEmitter<AnnotationWrapper>) {
this._dialogService.openDialog('forceRedaction', $event, null, request => {
this._dialogService.openDialog('forceRedaction', $event, null, (request: ForceRedactionRequest) => {
annotations.forEach(annotation => {
this._processObsAndEmit(
this._manualAnnotationService.forceRedaction({
@ -77,7 +77,7 @@ export class AnnotationActionsService {
annotationsChanged: EventEmitter<AnnotationWrapper>
) {
const data = { annotationsToRemove: annotations, removeFromDictionary };
this._dialogService.openDialog('removeAnnotations', $event, data, result => {
this._dialogService.openDialog('removeAnnotations', $event, data, (result: { comment: string }) => {
annotations.forEach(annotation => {
this._processObsAndEmit(
this._manualAnnotationService.removeOrSuggestRemoveAnnotation(annotation, removeFromDictionary, result.comment),

3
apps/red-ui/src/app/modules/dossier/services/dossiers-dialog.service.ts
View File

@ -12,9 +12,8 @@ import { AssignReviewerApproverDialogComponent } from '../dialogs/assign-reviewe
import { ConfigService } from '@services/config.service';
import { ChangeLegalBasisDialogComponent } from '../dialogs/change-legal-basis-dialog/change-legal-basis-dialog.component';
import { RecategorizeImageDialogComponent } from '../dialogs/recategorize-image-dialog/recategorize-image-dialog.component';
import { DialogService, largeDialogConfig } from '@shared/services/dialog.service';
import { ConfirmationDialogComponent, DialogService, largeDialogConfig } from '@iqser/common-ui';
import { ComponentType } from '@angular/cdk/portal';
import { ConfirmationDialogComponent } from '@iqser/common-ui';
type DialogType =
| 'confirm'

2
apps/red-ui/src/app/modules/icons/icons.module.ts
View File

@ -25,7 +25,6 @@ export class IconsModule {
'comment',
'comment-fill',
'dictionary',
'document',
'double-chevron-right',
'download',
'entries',
@ -67,7 +66,6 @@ export class IconsModule {
'trash',
'under-construction',
'undo',
'upload',
'user',
'visibility',
'visibility-off'

49
apps/red-ui/src/app/modules/shared/services/dialog.service.ts
View File

@ -1,49 +0,0 @@
import { Injectable } from '@angular/core';
import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';
import { ComponentType } from '@angular/cdk/portal';
export const largeDialogConfig: MatDialogConfig = {
width: '90vw',
maxWidth: '90vw',
maxHeight: '90vh',
autoFocus: false
} as const;
export const defaultDialogConfig: MatDialogConfig = {
width: '662px',
maxWidth: '90vw',
autoFocus: false
} as const;
@Injectable()
export abstract class DialogService<T extends string> {
protected readonly _config: {
[key in T]: {
component: ComponentType<any>;
dialogConfig?: MatDialogConfig;
};
};
protected constructor(protected readonly _dialog: MatDialog) {}
openDialog(type: T, $event: MouseEvent, data: any, cb?: Function, finallyCb?: Function): MatDialogRef<any> {
const config = this._config[type];
$event?.stopPropagation();
const ref = this._dialog.open(config.component, {
...defaultDialogConfig,
...(config.dialogConfig || {}),
data
});
ref.afterClosed().subscribe(async result => {
if (result && cb) {
await cb(result);
}
if (finallyCb) {
await finallyCb(result);
}
});
return ref;
}
}

4
apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.html
View File

@ -1,5 +1,5 @@
<section (mouseout)="close()">
<mat-icon svgIcon="red:upload"></mat-icon>
<section (mouseout)="close()" class="file-drop-section">
<mat-icon svgIcon="iqser:upload"></mat-icon>
<div class="heading-xl">
{{ 'dossier-overview.upload-files' | translate }}
</div>

26
apps/red-ui/src/app/modules/upload-download/file-drop/file-drop.component.scss
View File

@ -1,26 +0,0 @@
section {
position: fixed;
top: 0;
bottom: 0;
right: 0;
left: 0;
width: 100vw;
height: 100vh;
z-index: 1000;
padding: 12px;
opacity: 0.7;
background: white;
justify-content: center;
align-items: center;
display: flex;
flex-direction: column;
mat-icon {
height: 60px;
width: 60px;
}
.heading-xl {
margin-top: 24px;
}
}

9
apps/red-ui/src/assets/icons/general/document.svg
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="100px" version="1.1" viewBox="0 0 100 100" width="100px"
xmlns="http://www.w3.org/2000/svg">
<g fill="currentColor" fill-rule="evenodd" id="document" stroke="none" stroke-width="1">
<path
d="M90,0 L90,100 L10,100 L10,0 L90,0 Z M80,10 L20,10 L20,90 L80,90 L80,10 Z M50,60 L50,70 L30,70 L30,60 L50,60 Z M70,40 L70,50 L30,50 L30,40 L70,40 Z M70,20 L70,30 L30,30 L30,20 L70,20 Z"
fill-rule="nonzero" id="Combined-Shape"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 533 B

9
apps/red-ui/src/assets/icons/general/upload.svg
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg height="90px" version="1.1" viewBox="0 0 100 100" width="100px"
xmlns="http://www.w3.org/2000/svg">
<g fill="currentColor" fill-rule="evenodd" id="upload" stroke="none" stroke-width="1">
<path
d="M35,35 L35,45 L15,45 L15,90 L85,90 L85,45 L65,45 L65,35 L95,35 L95,100 L5,100 L5,35 L35,35 Z M50,0 L70,20 L63,27 L55,19 L55,70 L45,70 L45,19 L37,27 L30,20 L50,0 Z"
fill-rule="nonzero" id="Combined-Shape"></path>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 509 B

2
libs/common-ui

@ -1 +1 @@
Subproject commit 88f7d46b73c5965b3b3d913bb328fe90952e55df
Subproject commit 057fbfd2a8fe8a6b9432e03042f2cb5ed092fa0e