Skip to content
Snippets Groups Projects
Commit abaa1e79 authored by Ruben Bimberg's avatar Ruben Bimberg :computer:
Browse files

Implement fixes

[Ticket: #630][Ticket: #631][Ticket: #632]
parent f19f3723
Branches
Tags
No related merge requests found
...@@ -85,7 +85,10 @@ export class CreateCommentComponent implements OnInit { ...@@ -85,7 +85,10 @@ export class CreateCommentComponent implements OnInit {
openDeeplDialog(body: string, text: string, onClose: (data: string, text: string) => void) { openDeeplDialog(body: string, text: string, onClose: (data: string, text: string) => void) {
this.generateDeeplDelta(body).subscribe(([improvedBody, improvedText]) => { this.generateDeeplDelta(body).subscribe(([improvedBody, improvedText]) => {
this.isSendingToSpacy = false; if (improvedText.replace(/\s+/g, '') === text.replace(/\s+/g, '')) {
onClose(body, text);
return;
}
this.dialog.open(DeepLDialogComponent, { this.dialog.open(DeepLDialogComponent, {
width: '900px', width: '900px',
maxWidth: '100%', maxWidth: '100%',
...@@ -101,6 +104,8 @@ export class CreateCommentComponent implements OnInit { ...@@ -101,6 +104,8 @@ export class CreateCommentComponent implements OnInit {
}).afterClosed().subscribe((res) => { }).afterClosed().subscribe((res) => {
if (res) { if (res) {
onClose(res.body, res.text); onClose(res.body, res.text);
} else {
this.isSendingToSpacy = false;
} }
}); });
}, (_) => { }, (_) => {
......
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
<app-mat-spinner-overlay *ngIf="isLoading"></app-mat-spinner-overlay> <app-mat-spinner-overlay *ngIf="isLoading"></app-mat-spinner-overlay>
</div> </div>
<mat-list dense class="keywords-list"> <mat-list dense class="keywords-list">
<mat-list-item *ngFor="let keyword of keywords; let odd = odd; let even = even; let i = index" <mat-list-item *ngFor="let keyword of keywords; let odd = odd; let even = even; let i = index"
[class.keywords-alternate]="odd" [class.keywords-alternate]="odd"
[class.keywords-even]="even" [class.keywords-even]="even"
[ngClass]="{'keyword-selected': keyword.selected, 'first-keyword': i === 0}"> [ngClass]="{'keyword-selected': keyword.selected, 'first-keyword': i === 0}">
<span class="keyword-span" *ngIf="!keyword.editing">{{keyword.word}}</span> <span class="keyword-span" *ngIf="!keyword.editing">{{keyword.word}}</span>
<input class="keyword-span, isEditing" *ngIf="keyword.editing" [(ngModel)]="keyword.word"/> <input class="keyword-span, isEditing" *ngIf="keyword.editing" [(ngModel)]="keyword.word"/>
<div class="keywords-actions"> <div class="keywords-actions">
<mat-checkbox [checked]="keyword.completed" <mat-checkbox [checked]="keyword.completed"
(change)="keyword.selected = $event.checked" (change)="keyword.selected = $event.checked"
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
</button> </button>
<button *ngIf="keyword.editing" <button *ngIf="keyword.editing"
(click)="onEndEditing(keyword); onEditChange(-1)" mat-icon-button (click)="onEndEditing(keyword); onEditChange(-1)" mat-icon-button
class = "edit-accept" class="edit-accept"
matTooltip="{{ 'spacy-dialog.editing-done-hint' | translate }}" matTooltip="{{ 'spacy-dialog.editing-done-hint' | translate }}"
matTooltipShowDelay="750"> matTooltipShowDelay="750">
<mat-icon>check</mat-icon> <mat-icon>check</mat-icon>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</ars-row> </ars-row>
<ars-row ars-flex-box class="action-button-container"> <ars-row ars-flex-box class="action-button-container">
<ars-col> <ars-col *ngIf="!isLoading && langSupported && hasKeywordsFromSpacy">
<button <button
mat-flat-button mat-flat-button
class="help-button" class="help-button"
...@@ -77,6 +77,8 @@ ...@@ -77,6 +77,8 @@
{{ 'explanation.label' | translate}} {{ 'explanation.label' | translate}}
</button> </button>
</ars-col> </ars-col>
<ars-fill *ngIf="isLoading || !langSupported || !hasKeywordsFromSpacy">
</ars-fill>
<ars-col> <ars-col>
<app-dialog-action-buttons <app-dialog-action-buttons
#appDialogActionButtons #appDialogActionButtons
......
...@@ -136,7 +136,7 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit { ...@@ -136,7 +136,7 @@ export class SpacyDialogComponent implements OnInit, AfterContentInit {
} }
manualKeywordsToKeywords() { manualKeywordsToKeywords() {
const tempKeywords = this.manualKeywords.replace(/\s/g, ''); const tempKeywords = this.manualKeywords.replace(/\s+/g, ' ');
if (tempKeywords.length) { if (tempKeywords.length) {
this.keywords = tempKeywords.split(',').map((keyword) => ( this.keywords = tempKeywords.split(',').map((keyword) => (
{ {
......
...@@ -63,7 +63,7 @@ export class WriteCommentComponent implements OnInit { ...@@ -63,7 +63,7 @@ export class WriteCommentComponent implements OnInit {
maxTextCharacters: number, maxTextCharacters: number,
maxDataCharacters: number): boolean { maxDataCharacters: number): boolean {
text = text.trim(); text = text.trim();
if (!text.length) { if (text.length < 1 && data.length < 1) {
translateService.get('comment-page.error-comment').subscribe(message => { translateService.get('comment-page.error-comment').subscribe(message => {
notificationService.show(message); notificationService.show(message);
}); });
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment