From 1ba99def410ca90f0553fa83cfdb489fdd86be80 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 26 Jun 2024 15:31:30 +0300 Subject: [PATCH] RED-8748 - fixed revert value dialog --- ...able-structured-component-value.component.ts | 1 - .../revert-value-dialog.component.scss | 6 ++++-- .../services/viewer-header.service.ts | 17 ++++------------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.ts b/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.ts index 0eda86d99..971b6aa6e 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/components/editable-structured-component-value/editable-structured-component-value.component.ts @@ -8,7 +8,6 @@ import { CircleButtonComponent, IconButtonComponent, IconButtonTypes, IqserDialo import { TranslateModule } from '@ngx-translate/core'; import { IComponentLogEntry } from '@red/domain'; import { RevertValueDialogComponent } from '../../dialogs/docu-mine/revert-value-dialog/revert-value-dialog.component'; -import { FileDataService } from '../../services/file-data.service'; @Component({ selector: 'redaction-editable-structured-component-value [entry] [canEdit]', diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/revert-value-dialog/revert-value-dialog.component.scss b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/revert-value-dialog/revert-value-dialog.component.scss index 8519d67fc..1ae4acaaf 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/revert-value-dialog/revert-value-dialog.component.scss +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/docu-mine/revert-value-dialog/revert-value-dialog.component.scss @@ -6,7 +6,8 @@ display: flex; div { - flex-grow: 1; + flex: 1; + overflow: hidden; .header { font-weight: bold; @@ -16,11 +17,12 @@ margin-top: 10px; padding: 10px 0 10px 15px; width: 90%; + height: 100%; background: var(--iqser-grey-8); p { margin: 0; - height: 16px; + min-height: 16px; } } } diff --git a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts index d77cf2660..2c6453be6 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts +++ b/apps/red-ui/src/app/modules/pdf-viewer/services/viewer-header.service.ts @@ -275,15 +275,6 @@ export class ViewerHeaderService { updateElements(): void { this._pdf.instance?.UI.setHeaderItems(header => { - let deletedDividers = 0; - if (this.#isDocumine) { - const secondHeaderElement = header.getItems()[1] as IHeaderElement; - if (secondHeaderElement.type === 'divider') { - header.getItems().splice(1, 1); - deletedDividers = 1; - } - } - const enabledItems: IHeaderElement[] = []; const groups: HeaderElementType[][] = [ [HeaderElements.COMPARE_BUTTON, HeaderElements.CLOSE_COMPARE_BUTTON], @@ -302,15 +293,15 @@ export class ViewerHeaderService { groups.forEach(group => this.#pushGroup(enabledItems, group)); const loadAllAnnotationsButton = this.#buttons.get(HeaderElements.LOAD_ALL_ANNOTATIONS); - let startButtons = 11 - deletedDividers; - let deleteCount = 15 - deletedDividers; + let startButtons = 11; + let deleteCount = 15; if (this.#isEnabled(HeaderElements.LOAD_ALL_ANNOTATIONS)) { if (!header.getItems().includes(loadAllAnnotationsButton)) { header.get('leftPanelButton').insertAfter(loadAllAnnotationsButton); } - startButtons = 12 - deletedDividers; - deleteCount = 16 - deletedDividers; + startButtons = 12; + deleteCount = 16; } else { header.delete(HeaderElements.LOAD_ALL_ANNOTATIONS); }