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

RED-6973: Fix multiple editing.

Browse Source
This commit is contained in:
Nicoleta Panaghiu 2023-07-20 16:11:53 +03:00
parent 32dba8e609
commit 3afabf5a10
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/red-ui/src/app/modules/dossier-overview/components/file-attribute/file-attribute.component.ts
View File

@ -26,14 +26,14 @@ export class FileAttributeComponent extends BaseFormComponent implements OnDestr
closedDatepicker = true; closedDatepicker = true;
readonly #subscriptions = new Subscription(); readonly #subscriptions = new Subscription();
readonly shouldClose$ = this.fileAttributesService.isEditingFileAttribute$.pipe( readonly shouldClose$ = this.fileAttributesService.isEditingFileAttribute$.pipe(
filter(value => value === true),
tap(value => { tap(value => {
if ( if (
value && (value &&
!!this.file && !!this.file &&
!!this.fileAttribute && !!this.fileAttribute &&
(this.fileAttribute.id !== this.fileAttributesService.openAttributeEdit$.value || (this.fileAttribute.id !== this.fileAttributesService.openAttributeEdit$.value ||
this.file.fileId !== this.fileAttributesService.fileEdit$.value) this.file.fileId !== this.fileAttributesService.fileEdit$.value)) ||
!this.fileAttributesService.openAttributeEdits$.value.length
) { ) {
this.close(); this.close();
} }

2
apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.html
View File

@ -1,4 +1,4 @@
<div class="workflow-item"> <div class="workflow-item" (mousedown)="fileAttributesService.resetEdit()">
<div class="details-wrapper"> <div class="details-wrapper">
<div class="details"> <div class="details">
<div [matTooltip]="file.filename" [routerLink]="file.routerLink" class="filename pointer" matTooltipPosition="above"> <div [matTooltip]="file.filename" [routerLink]="file.routerLink" class="filename pointer" matTooltipPosition="above">

3
apps/red-ui/src/app/modules/dossier-overview/components/workflow-item/workflow-item.component.ts
View File

@ -1,6 +1,7 @@
import { ChangeDetectorRef, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { ChangeDetectorRef, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
import { Dossier, File, IFileAttributeConfig } from '@red/domain'; import { Dossier, File, IFileAttributeConfig } from '@red/domain';
import { Debounce } from '@iqser/common-ui'; import { Debounce } from '@iqser/common-ui';
import { FileAttributesService } from '@services/entity-services/file-attributes.service';
@Component({ @Component({
selector: 'redaction-workflow-item [file] [dossier] [displayedAttributes]', selector: 'redaction-workflow-item [file] [dossier] [displayedAttributes]',
@ -15,7 +16,7 @@ export class WorkflowItemComponent implements OnInit {
@ViewChild('actionsWrapper', { static: true }) private _actionsWrapper: ElementRef; @ViewChild('actionsWrapper', { static: true }) private _actionsWrapper: ElementRef;
constructor(private readonly _changeRef: ChangeDetectorRef) {} constructor(readonly fileAttributesService: FileAttributesService, private readonly _changeRef: ChangeDetectorRef) {}
ngOnInit(): void { ngOnInit(): void {
const _observer = new ResizeObserver((entries: ResizeObserverEntry[]) => { const _observer = new ResizeObserver((entries: ResizeObserverEntry[]) => {

6
apps/red-ui/src/app/services/entity-services/file-attributes.service.ts
View File

@ -35,6 +35,12 @@ export class FileAttributesService extends EntitiesService<IFileAttributeConfig,
setFileEdit(fileId: string) { setFileEdit(fileId: string) {
this.fileEdit$.next(fileId); this.fileEdit$.next(fileId);
} }
resetEdit() {
this.openAttributeEdits$.next([]);
this.fileEdit$.next('');
this.openAttributeEdit$.next('');
}
/** /**
* Get the file attributes that can be used at importing csv. * Get the file attributes that can be used at importing csv.
*/ */