From b2f5e0267326b5b470a0af138a914a410431d73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Tue, 15 Jun 2021 15:12:53 +0300 Subject: [PATCH] Redo comments layout --- .../src/app/models/file/annotation.wrapper.ts | 2 + .../admin-side-nav.component.html | 2 +- ...ttributes-csv-import-dialog.component.html | 5 +- .../dictionary-listing-screen.component.html | 5 +- ...er-templates-listing-screen.component.html | 5 +- ...e-attributes-listing-screen.component.html | 5 +- .../user-listing-screen.component.html | 5 +- .../user-listing-screen.component.scss | 2 +- .../annotation-actions.component.scss | 18 +-- .../comments/comments.component.html | 105 +++++------------- .../comments/comments.component.scss | 91 ++++++--------- .../components/comments/comments.component.ts | 39 ++----- .../file-workload.component.html | 48 ++++++-- .../file-workload.component.scss | 38 ++++++- .../file-workload/file-workload.component.ts | 13 ++- .../team-members-manager.component.html | 5 +- .../team-members/team-members.component.html | 2 +- .../edit-dossier-general-info.component.ts | 2 +- .../dossier-listing-screen.component.html | 5 +- .../dossier-overview-screen.component.html | 5 +- .../circle-button.component.html | 2 +- .../circle-button.component.scss | 47 ++++---- .../circle-button/circle-button.component.ts | 11 +- .../input-with-action.component.html | 37 ++++++ .../input-with-action.component.scss | 14 +++ .../input-with-action.component.ts | 38 +++++++ .../search-input/search-input.component.html | 18 --- .../search-input/search-input.component.scss | 3 - .../search-input/search-input.component.ts | 25 ----- .../src/app/modules/shared/shared.module.ts | 4 +- .../src/app/services/permissions.service.ts | 17 ++- apps/red-ui/src/assets/config/config.json | 4 +- apps/red-ui/src/assets/i18n/en.json | 6 +- .../src/assets/styles/red-checkbox.scss | 2 + 34 files changed, 333 insertions(+), 297 deletions(-) create mode 100644 apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.html create mode 100644 apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.scss create mode 100644 apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.ts delete mode 100644 apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.html delete mode 100644 apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.scss delete mode 100644 apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.ts diff --git a/apps/red-ui/src/app/models/file/annotation.wrapper.ts b/apps/red-ui/src/app/models/file/annotation.wrapper.ts index a851d613a..3d399c31e 100644 --- a/apps/red-ui/src/app/models/file/annotation.wrapper.ts +++ b/apps/red-ui/src/app/models/file/annotation.wrapper.ts @@ -24,6 +24,7 @@ export class AnnotationWrapper { comments: Comment[] = []; firstTopLeftPoint: Point; annotationId: string; + shortContent: string; content: string; value: string; userId: string; @@ -361,6 +362,7 @@ export class AnnotationWrapper { if (entry.section) { content += 'In section: "' + entry.section + '"'; } + annotationWrapper.shortContent = entry.reason || content; annotationWrapper.content = content; } } diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html index fa279c019..22319a72a 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.html @@ -1,4 +1,4 @@ - +
- + >
- + type="search" + >
- + type="search" + >
- + type="search" + >
- + type="search" + > *:not(:last-child) { + margin-right: 2px; + } } .false-positive-icon { diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html index abd019aa0..d2a56f0a4 100644 --- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.html @@ -1,79 +1,34 @@ -
- -
-
- -
-
- -
- -
-
{{ getOwnerName(comment) }}
-
{{ comment.text }}
-
+
+
+
+
{{ getOwnerName(comment) }}
+
{{ comment.date | date: 'd MMM. yyyy, hh:mm a' }}
- - -
-
- {{ - expanded - ? translateService.instant('comments.hide-comments') - : translateService.instant( - annotation.comments.length === 1 - ? 'comments.comment' - : 'comments.comments', - { - count: annotation.comments.length - } - ) - }} +
+
-
-
- -
-
- -
-
- -
- -
+
{{ comment.text }}
+ + + +
diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.scss b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.scss index 60620bb3d..9915237b0 100644 --- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.scss @@ -1,74 +1,53 @@ @import '../../../../../assets/styles/red-variables'; -.wrapper { +:host { display: flex; flex-direction: column; - margin-top: 10px; - - > *:not(:last-child) { - margin-bottom: 10px; - } + padding: 8px 0 8px 16px; .comment { - display: flex; + margin-bottom: 10px; - > *:not(:last-child) { - margin-right: 12px; + .comment-details-wrapper { + margin-bottom: 4px; + position: relative; + + .comment-details { + opacity: 0.7; + } + + .comment-actions { + display: none; + position: absolute; + right: 0; + top: -4px; + + mat-icon { + width: 10px; + height: 10px; + + &:not(:last-child) { + margin-right: 8px; + } + } + } } - .owner { - opacity: 0.7; - } - - mat-icon { - width: 14px; - height: 16px; - } - - .comment-icon { - color: $grey-5; + &:hover .comment-details-wrapper .comment-actions { display: initial; } - - .trash-icon { - display: none; - } - - .red { - color: $primary; - } - - &:hover { - .comment-icon.comment-owner { - display: none; - } - - .trash-icon.comment-owner { - display: initial; - } - } } - .comment-actions-container, - .actions-container { - display: flex; - align-items: center; - - > *:not(:last-child) { - margin-right: 15px; - } + redaction-input-with-action { + margin: 5px 0 10px 0; } - .actions-container { - margin-left: 26px; + .hide-comments { + margin-top: 5px; + } - > *:not(:last-child) { - margin-right: 5px; - } - - > div:not(:last-child):after { - content: '•'; - margin-left: 5px; - } + .comment, + .hide-comments { + padding-left: 12px; } } diff --git a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts index 25b7fe9b9..4da8a74cb 100644 --- a/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/comments/comments.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, Input } from '@angular/core'; +import { ChangeDetectorRef, Component, HostBinding, Input } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Comment } from '@redaction/red-ui-http'; import { ManualAnnotationService } from '../../services/manual-annotation.service'; @@ -15,9 +15,8 @@ import { PermissionsService } from '@services/permissions.service'; }) export class CommentsComponent { @Input() annotation: AnnotationWrapper; - expanded = false; commentForm: FormGroup; - addingComment = false; + @HostBinding('class.hidden') private _hidden = true; constructor( readonly translateService: TranslateService, @@ -29,34 +28,12 @@ export class CommentsComponent { private readonly _manualAnnotationService: ManualAnnotationService ) { this.commentForm = this._formBuilder.group({ - comment: ['', Validators.required] + value: ['', Validators.required] }); } - get canAddComment() { - return !this.annotation.isChangeLogRemoved; - } - - toggleExpandComments($event: MouseEvent): void { - $event.stopPropagation(); - if (!this.annotation.comments.length) { - return; - } - this.expanded = !this.expanded; - this._changeDetectorRef.detectChanges(); - } - - toggleAddingComment($event?: MouseEvent): void { - $event?.stopPropagation(); - this.addingComment = !this.addingComment; - if (this.addingComment) { - this.expanded = true; - } - this._changeDetectorRef.detectChanges(); - } - addComment(): void { - const value = this.commentForm.value.comment; + const value = this.commentForm.value.value; if (value) { this._manualAnnotationService .addComment(value, this.annotation.id) @@ -68,17 +45,21 @@ export class CommentsComponent { }); }); this.commentForm.reset(); - this.toggleAddingComment(); } } + toggleExpandComments($event?: MouseEvent) { + $event?.stopPropagation(); + this._hidden = !this._hidden; + } + deleteComment(comment: Comment): void { this._manualAnnotationService .deleteComment(comment.id, this.annotation.id) .subscribe(() => { this.annotation.comments.splice(this.annotation.comments.indexOf(comment), 1); if (!this.annotation.comments.length) { - this.expanded = false; + this._hidden = true; } }); } diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html index ed53fa1cb..00246a91b 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html @@ -155,7 +155,11 @@ (action)="logAnnotation(annotation)" [requiredClicks]="2" > -
+
@@ -174,17 +178,12 @@ >: {{ annotation.dictionary | humanize: false }}
-
+
: {{ annotation.content }} + >{{ annotation.shortContent }}
- - +
+
+ + {{ annotation.comments.length }} +
+
+ + +
+
+ -
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss index d89c21b82..430a511a0 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.scss @@ -146,7 +146,7 @@ } .annotation { - padding: 10px 21px 10px 6px; + padding: 10px 16px 8px 10px; font-size: 11px; line-height: 14px; cursor: pointer; @@ -164,6 +164,36 @@ position: relative; } + .actions-wrapper { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 8px; + min-height: 34px; + padding-left: 18px; + + .comments-counter { + cursor: pointer; + display: flex; + align-items: center; + padding: 0 8px; + transition: background-color 0.2s; + line-height: 13px; + height: 24px; + border-radius: 12px; + + mat-icon { + width: 10px; + height: 10px; + margin-right: 4px; + } + + &:hover { + background-color: $grey-4; + } + } + } + redaction-type-annotation-icon { margin-top: 6px; margin-right: 10px; @@ -184,10 +214,8 @@ @include scroll-bar; } - &.has-scrollbar:hover { - .annotation { - padding-right: 10px; - } + &.has-scrollbar:hover .annotation-wrapper .annotation { + padding-right: 5px; } } } diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts index 44e61517c..c9cb3f83d 100644 --- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts +++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.ts @@ -6,8 +6,10 @@ import { HostListener, Input, Output, + QueryList, TemplateRef, - ViewChild + ViewChild, + ViewChildren } from '@angular/core'; import { AnnotationWrapper } from '@models/file/annotation.wrapper'; import { AnnotationProcessingService } from '../../services/annotation-processing.service'; @@ -16,6 +18,7 @@ import scrollIntoView from 'scroll-into-view-if-needed'; import { debounce } from '@utils/debounce'; import { FileDataModel } from '@models/file/file-data.model'; import { FilterModel } from '@shared/components/filters/popup-filter/model/filter.model'; +import { CommentsComponent } from '../comments/comments.component'; const COMMAND_KEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown', 'Escape']; const ALL_HOTKEY_ARRAY = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown']; @@ -46,6 +49,7 @@ export class FileWorkloadComponent { @Output() annotationsChanged = new EventEmitter(); displayedPages: number[] = []; pagesPanelActive = true; + @ViewChildren(CommentsComponent) annotationCommentsComponents: QueryList; @ViewChild('annotationsElement') private _annotationsElement: ElementRef; @ViewChild('quickNavigation') private _quickNavigationElement: ElementRef; @@ -99,6 +103,13 @@ export class FileWorkloadComponent { return this.selectedAnnotations?.find(a => a?.id === annotation.id); } + toggleExpandComments(annotation: AnnotationWrapper, $event: MouseEvent) { + $event.stopPropagation(); + this.annotationCommentsComponents + .find(c => c.annotation === annotation) + .toggleExpandComments(); + } + logAnnotation(annotation: AnnotationWrapper) { console.log(annotation); } diff --git a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.html b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.html index 9268676a6..07be2e297 100644 --- a/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.html +++ b/apps/red-ui/src/app/modules/dossier/components/team-members-manager/team-members-manager.component.html @@ -43,12 +43,13 @@ class="info" > - + type="search" + >
- + type="search" + >
- + type="search" + >
diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss index 57a6e2097..9058a325b 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.scss @@ -1,40 +1,41 @@ @import '../../../../../../assets/styles/red-variables'; :host { - height: 34px; - width: 34px; + height: var(--size); + width: var(--size); align-items: center; -} -button { - height: 34px; - width: 34px; - line-height: 33px; + button { + height: var(--size); + width: var(--size); + line-height: var(--size); - &.small { - height: 32px; - width: 32px; - line-height: 32px; - } + mat-icon { + width: var(--iconSize); + height: var(--iconSize); + line-height: var(--iconSize); + margin: 0; - mat-icon { - width: 14px; - height: 34px; - margin: 0; - } + svg { + line-height: var(--iconSize); + } + } - &.primary { &.mat-button-disabled { + cursor: not-allowed; + } + + &.primary.mat-button-disabled { background-color: $grey-6; color: $white !important; } - } - &.warn:not([disabled]) { - background-color: $yellow-2; - - &:hover { + &.warn:not([disabled]) { background-color: $yellow-2; + + &:hover { + background-color: $yellow-2; + } } } } diff --git a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.ts b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.ts index a2fcccb79..9a6b16916 100644 --- a/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/buttons/circle-button/circle-button.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectionStrategy, Component, + ElementRef, EventEmitter, Input, Output, @@ -21,13 +22,21 @@ export class CircleButtonComponent { @Input() tooltipPosition: 'above' | 'below' | 'before' | 'after' = 'above'; @Input() tooltipClass: string; @Input() disabled = false; - @Input() small = false; @Input() type: 'default' | 'primary' | 'warn' | 'dark-bg' = 'default'; @Input() removeTooltip = false; @Output() action = new EventEmitter(); + @Input() size = 34; + @Input() iconSize = 14; @ViewChild(MatTooltip) matTooltip: MatTooltip; + constructor(private _elRef: ElementRef) {} + + ngOnInit(): void { + this._elRef.nativeElement.style.setProperty('--size', this.size + 'px'); + this._elRef.nativeElement.style.setProperty('--iconSize', this.iconSize + 'px'); + } + performAction($event: any) { if (!this.disabled) { if (this.removeTooltip) { diff --git a/apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.html b/apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.html new file mode 100644 index 000000000..e4885dff3 --- /dev/null +++ b/apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.html @@ -0,0 +1,37 @@ +
+
+ + + + + + + + + + + +
+
diff --git a/apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.scss b/apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.scss new file mode 100644 index 000000000..b769d470c --- /dev/null +++ b/apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.scss @@ -0,0 +1,14 @@ +:host { + display: block; +} + +mat-icon.disabled { + opacity: 0.7; + cursor: not-allowed; +} + +redaction-circle-button { + position: absolute; + bottom: 5px; + right: 5px; +} diff --git a/apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.ts b/apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.ts new file mode 100644 index 000000000..270f12daa --- /dev/null +++ b/apps/red-ui/src/app/modules/shared/components/input-with-action/input-with-action.component.ts @@ -0,0 +1,38 @@ +import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { FormGroup } from '@angular/forms'; + +@Component({ + selector: 'redaction-input-with-action', + templateUrl: './input-with-action.component.html', + styleUrls: ['./input-with-action.component.scss'] +}) +export class InputWithActionComponent { + @Input() form: FormGroup; + @Input() placeholder: string; + @Input() width: number | 'full' = 250; + @Input() type: 'search' | 'submit'; + @Output() action = new EventEmitter(); + + get formControlName(): 'query' | 'value' { + return this.type === 'search' ? 'query' : 'value'; + } + + get hasContent() { + return !!this.form.get(this.formControlName).value.length; + } + + get computedWidth() { + return this.width === 'full' ? '100%' : `${this.width}px`; + } + + clearContent() { + this.form.patchValue({ query: '' }); + } + + submit($event?: MouseEvent) { + $event?.stopPropagation(); + if (this.hasContent) { + this.action.emit(); + } + } +} diff --git a/apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.html b/apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.html deleted file mode 100644 index 3fb32e84f..000000000 --- a/apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.html +++ /dev/null @@ -1,18 +0,0 @@ -
-
- - - -
-
diff --git a/apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.scss b/apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.scss deleted file mode 100644 index 7f26ddcb5..000000000 --- a/apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -:host { - display: block; -} diff --git a/apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.ts b/apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.ts deleted file mode 100644 index b7de2c42d..000000000 --- a/apps/red-ui/src/app/modules/shared/components/search-input/search-input.component.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { Component, Input } from '@angular/core'; -import { FormGroup } from '@angular/forms'; - -@Component({ - selector: 'redaction-search-input', - templateUrl: './search-input.component.html', - styleUrls: ['./search-input.component.scss'] -}) -export class SearchInputComponent { - @Input() form: FormGroup; - @Input() placeholder: string; - @Input() width: number | 'full' = 250; - - get hasContent() { - return !!this.form.get('query').value.length; - } - - get computedWidth() { - return this.width === 'full' ? '100%' : `${this.width}px`; - } - - clearContent() { - this.form.patchValue({ query: '' }); - } -} diff --git a/apps/red-ui/src/app/modules/shared/shared.module.ts b/apps/red-ui/src/app/modules/shared/shared.module.ts index 6c575b23c..ea266532f 100644 --- a/apps/red-ui/src/app/modules/shared/shared.module.ts +++ b/apps/red-ui/src/app/modules/shared/shared.module.ts @@ -12,7 +12,6 @@ import { FileDownloadBtnComponent } from './components/buttons/file-download-btn import { IconButtonComponent } from './components/buttons/icon-button/icon-button.component'; import { UserButtonComponent } from './components/buttons/user-button/user-button.component'; import { MatConfigModule } from '../mat-config/mat-config.module'; -import { SearchInputComponent } from './components/search-input/search-input.component'; import { IconsModule } from '../icons/icons.module'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component'; @@ -37,6 +36,7 @@ import { MonacoEditorModule } from '@materia-ui/ngx-monaco-editor'; import { QuickFiltersComponent } from './components/filters/quick-filters/quick-filters.component'; import { PopupFilterComponent } from '@shared/components/filters/popup-filter/popup-filter.component'; import { AssignUserDropdownComponent } from './components/assign-user-dropdown/assign-user-dropdown.component'; +import { InputWithActionComponent } from '@shared/components/input-with-action/input-with-action.component'; const buttons = [ ChevronButtonComponent, @@ -51,7 +51,7 @@ const components = [ InitialsAvatarComponent, TableColNameComponent, PaginationComponent, - SearchInputComponent, + InputWithActionComponent, AnnotationIconComponent, SimpleDoughnutChartComponent, StatusBarComponent, diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index 78cbb68cd..d26d2e226 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -18,6 +18,14 @@ export class PermissionsService { return this._userService.user; } + private get _activeFile(): FileStatusWrapper | undefined { + return this._appStateService.activeFile; + } + + private get _activeDossier(): DossierWrapper | undefined { + return this._appStateService.activeDossier; + } + isManager(user?: User) { return this._userService.isManager(user); } @@ -93,7 +101,6 @@ export class PermissionsService { canAssignUser(fileStatus = this._activeFile): boolean { const precondition = - this.isDossierMember() && !fileStatus.isProcessing && !fileStatus.isError && !fileStatus.isApproved && @@ -209,12 +216,4 @@ export class PermissionsService { canAddComment(fileStatus = this._activeFile): boolean { return this.isFileReviewer(fileStatus) || this.isApprover(); } - - private get _activeFile(): FileStatusWrapper | undefined { - return this._appStateService.activeFile; - } - - private get _activeDossier(): DossierWrapper | undefined { - return this._appStateService.activeDossier; - } } diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index d7dbcb685..6cfc820ed 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,6 +1,6 @@ { - "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", - "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", + "OAUTH_URL": "https://dev-06.iqser.cloud/auth/realms/redaction", + "API_URL": "https://dev-06.iqser.cloud/redaction-gateway-v1", "OAUTH_CLIENT_ID": "redaction", "BACKEND_APP_VERSION": "4.4.40", "FRONTEND_APP_VERSION": "1.1", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 3f55d1e1f..eb40dc686 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -162,7 +162,7 @@ }, "errors": { "dossier-already-exists": "Dossier with this name already exists!", - "generic": "Failed to save dossier" + "generic": "Failed to save dossier." }, "actions": { "save": "Save", @@ -520,8 +520,8 @@ "comments": { "comment": "{{count}} comment", "comments": "{{count}} comments", - "add-comment": "Add a comment", - "hide-comments": "Hide", + "add-comment": "Enter comment", + "hide-comments": "Hide comments", "cancel": "Cancel" }, "UNPROCESSED": "Unprocessed", diff --git a/apps/red-ui/src/assets/styles/red-checkbox.scss b/apps/red-ui/src/assets/styles/red-checkbox.scss index fe39f654f..247f79a59 100644 --- a/apps/red-ui/src/assets/styles/red-checkbox.scss +++ b/apps/red-ui/src/assets/styles/red-checkbox.scss @@ -13,6 +13,8 @@ } .mat-checkbox-layout { + align-items: center !important; + .mat-checkbox-inner-container { margin-left: 0; }