Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SF-3111 Fix question dialog verse reference error message overlap #2960

Merged
merged 1 commit into from
Jan 23, 2025
Merged

SF-3111 Fix question dialog verse reference error message overlap #2960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...Forge.Scripture/ClientApp/src/app/checking/question-dialog/question-dialog.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@ <h1 mat-dialog-title class="dialog-title dialog-icon-title">
[projectDoc]="projectDoc"
></app-checking-text>
</div>
<app-text-and-audio #input [input]="question" [textLabel]="t('question')"></app-text-and-audio>
<div class="attachments">
<app-attach-audio [textAndAudio]="input"></app-attach-audio>
<div>
<app-text-and-audio #input [input]="question" [textLabel]="t('question')"></app-text-and-audio>
<div class="attachments">
<app-attach-audio [textAndAudio]="input"></app-attach-audio>
</div>
</div>
</mat-dialog-content>
<mat-dialog-actions [align]="'end'">
Expand Down
7 changes: 5 additions & 2 deletions ...Forge.Scripture/ClientApp/src/app/checking/question-dialog/question-dialog.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

.mat-mdc-dialog-content.content-padding {
padding-top: 0.5em;
display: flex;
flex-direction: column;
row-gap: 1em;
}

.dialog-title {
Expand All @@ -15,7 +18,7 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
column-gap: 1em;
gap: 1em;
justify-content: center;
}

Expand All @@ -36,7 +39,7 @@ mat-form-field {

.text-container {
height: 10em;
margin-bottom: 3em;
margin-bottom: 2em;
app-checking-text {
position: relative;
}
Expand Down
25 changes: 12 additions & 13 deletions ....XForge.Scripture/ClientApp/src/app/checking/question-dialog/question-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, Inject, OnInit, ViewChild } from '@angular/core';
import { AbstractControl, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { Component, DestroyRef, Inject, OnInit, ViewChild } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';
import { translate } from '@ngneat/transloco';
import { VerseRef } from '@sillsdev/scripture';
Expand All @@ -8,7 +9,6 @@ import { Question } from 'realtime-server/lib/esm/scriptureforge/models/question
import { toStartAndEndVerseRefs } from 'realtime-server/lib/esm/scriptureforge/models/verse-ref-data';
import { DialogService } from 'xforge-common/dialog.service';
import { I18nService } from 'xforge-common/i18n.service';
import { SubscriptionDisposable } from 'xforge-common/subscription-disposable';
import { QuestionDoc } from '../../core/models/question-doc';
import { SFProjectProfileDoc } from '../../core/models/sf-project-profile-doc';
import { TextDocId } from '../../core/models/text-doc';
Expand Down Expand Up @@ -41,17 +41,17 @@ export interface QuestionDialogResult {
templateUrl: './question-dialog.component.html',
styleUrls: ['./question-dialog.component.scss']
})
export class QuestionDialogComponent extends SubscriptionDisposable implements OnInit {
export class QuestionDialogComponent implements OnInit {
@ViewChild(TextAndAudioComponent) textAndAudio?: TextAndAudioComponent;
modeLabel =
this.data && this.data.questionDoc != null
? translate('question_dialog.edit_question')
: translate('question_dialog.new_question');
parentAndStartMatcher = new ParentAndStartErrorStateMatcher();
versesForm: UntypedFormGroup = new UntypedFormGroup(
versesForm: FormGroup = new FormGroup(
{
scriptureStart: new UntypedFormControl('', [Validators.required, SFValidators.verseStr(this.data.textsByBookId)]),
scriptureEnd: new UntypedFormControl('', [SFValidators.verseStr(this.data.textsByBookId)])
scriptureStart: new FormControl('', [Validators.required, SFValidators.verseStr(this.data.textsByBookId)]),
scriptureEnd: new FormControl('', [SFValidators.verseStr(this.data.textsByBookId)])
},
SFValidators.verseStartBeforeEnd
);
Expand All @@ -63,10 +63,9 @@ export class QuestionDialogComponent extends SubscriptionDisposable implements O
private readonly dialogRef: MatDialogRef<QuestionDialogComponent, QuestionDialogResult | 'close'>,
@Inject(MAT_DIALOG_DATA) private data: QuestionDialogData,
readonly i18n: I18nService,
readonly dialogService: DialogService
) {
super();
}
readonly dialogService: DialogService,
private readonly destroyRef: DestroyRef
) {}

get scriptureStart(): AbstractControl {
return this.versesForm.controls.scriptureStart;
Expand Down Expand Up @@ -138,7 +137,7 @@ export class QuestionDialogComponent extends SubscriptionDisposable implements O
// set initial enabled/disabled state for scriptureEnd
this.updateScriptureEndEnabled();

this.subscribe(this.scriptureStart.valueChanges, () => {
this.scriptureStart.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {
if (this.scriptureStart.valid) {
this.updateSelection();
} else {
Expand All @@ -147,7 +146,7 @@ export class QuestionDialogComponent extends SubscriptionDisposable implements O
// update enabled/disabled state for scriptureEnd
this.updateScriptureEndEnabled();
});
this.subscribe(this.scriptureEnd.valueChanges, () => {
this.scriptureEnd.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {
if (this.scriptureEnd.valid) {
this.updateSelection();
} else {
Expand Down
Loading