Merge branch 'RED-9777' into 'master'

RED-9777: added help button on edit and remove annotation dialogs.

See merge request redactmanager/red-ui!546
This commit is contained in:
Valentin-Gabriel Mihai 2024-08-14 10:50:16 +02:00
commit 95c273e7b2
5 changed files with 22 additions and 3 deletions

View File

@ -52,6 +52,8 @@
</iqser-icon-button> </iqser-icon-button>
<div [translate]="'edit-redaction.dialog.actions.cancel'" class="all-caps-label cancel" mat-dialog-close></div> <div [translate]="'edit-redaction.dialog.actions.cancel'" class="all-caps-label cancel" mat-dialog-close></div>
<iqser-help-button></iqser-help-button>
</div> </div>
</form> </form>

View File

@ -1,6 +1,13 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { FormBuilder, ReactiveFormsModule, UntypedFormGroup } from '@angular/forms'; import { FormBuilder, ReactiveFormsModule, UntypedFormGroup } from '@angular/forms';
import { CircleButtonComponent, HasScrollbarDirective, IconButtonComponent, IconButtonTypes, IqserDialogComponent } from '@iqser/common-ui'; import {
CircleButtonComponent,
HasScrollbarDirective,
HelpButtonComponent,
IconButtonComponent,
IconButtonTypes,
IqserDialogComponent,
} from '@iqser/common-ui';
import { Dictionary, Dossier, SuperTypes } from '@red/domain'; import { Dictionary, Dossier, SuperTypes } from '@red/domain';
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
import { DictionaryService } from '@services/entity-services/dictionary.service'; import { DictionaryService } from '@services/entity-services/dictionary.service';
@ -33,6 +40,7 @@ import { MatDialogClose } from '@angular/material/dialog';
IconButtonComponent, IconButtonComponent,
CircleButtonComponent, CircleButtonComponent,
MatDialogClose, MatDialogClose,
HelpButtonComponent,
], ],
}) })
export class EditAnnotationDialogComponent export class EditAnnotationDialogComponent

View File

@ -60,6 +60,7 @@
</iqser-icon-button> </iqser-icon-button>
<div [translate]="'remove-annotation.dialog.actions.cancel'" class="all-caps-label cancel" mat-dialog-close></div> <div [translate]="'remove-annotation.dialog.actions.cancel'" class="all-caps-label cancel" mat-dialog-close></div>
<iqser-help-button></iqser-help-button>
</div> </div>
</form> </form>

View File

@ -6,7 +6,14 @@ import { MatDialogClose } from '@angular/material/dialog';
import { DetailsRadioOption } from '@common-ui/inputs/details-radio/details-radio-option'; import { DetailsRadioOption } from '@common-ui/inputs/details-radio/details-radio-option';
import { DetailsRadioComponent } from '@common-ui/inputs/details-radio/details-radio.component'; import { DetailsRadioComponent } from '@common-ui/inputs/details-radio/details-radio.component';
import { ReplaceNbspPipe } from '@common-ui/pipes/replace-nbsp.pipe'; import { ReplaceNbspPipe } from '@common-ui/pipes/replace-nbsp.pipe';
import { CircleButtonComponent, HasScrollbarDirective, IconButtonComponent, IconButtonTypes, IqserDialogComponent } from '@iqser/common-ui'; import {
CircleButtonComponent,
HasScrollbarDirective,
HelpButtonComponent,
IconButtonComponent,
IconButtonTypes,
IqserDialogComponent,
} from '@iqser/common-ui';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { getRemoveRedactionOptions } from '../../../utils/dialog-options'; import { getRemoveRedactionOptions } from '../../../utils/dialog-options';
import { RemoveAnnotationData, RemoveAnnotationOption, RemoveAnnotationOptions, RemoveAnnotationResult } from '../../../utils/dialog-types'; import { RemoveAnnotationData, RemoveAnnotationOption, RemoveAnnotationOptions, RemoveAnnotationResult } from '../../../utils/dialog-types';
@ -28,6 +35,7 @@ import { RemoveAnnotationData, RemoveAnnotationOption, RemoveAnnotationOptions,
CircleButtonComponent, CircleButtonComponent,
MatDialogClose, MatDialogClose,
NgIf, NgIf,
HelpButtonComponent,
], ],
}) })
export class RemoveAnnotationDialogComponent extends IqserDialogComponent< export class RemoveAnnotationDialogComponent extends IqserDialogComponent<

@ -1 +1 @@
Subproject commit 6547eb2ad53d9df97a08210d7edb6d849e59d998 Subproject commit 0ca5e7e2ad7ca2b788f7234d7a38a3b810d9b31a