From d1307c3cfc6dcf36488437853233e48ffef9316e Mon Sep 17 00:00:00 2001 From: Yasa-Nataliya Date: Mon, 21 Aug 2023 09:46:41 +0530 Subject: [PATCH] minor fixes --- e2e/core/pages/metadata-view.page.ts | 4 ---- .../categories-management.component.html | 6 +++-- .../categories-management.component.scss | 14 ++++++++++- .../content-metadata.component.scss | 2 +- .../tags-creator/tags-creator.component.html | 9 ++++---- .../tags-creator/tags-creator.component.scss | 21 ++++++++++++++--- .../tags-creator.component.spec.ts | 23 +++++++++++++++++-- .../src/lib/styles/_components-variables.scss | 2 +- .../src/lib/styles/_reference-variables.scss | 2 +- 9 files changed, 64 insertions(+), 19 deletions(-) diff --git a/e2e/core/pages/metadata-view.page.ts b/e2e/core/pages/metadata-view.page.ts index c4d011955b..5b7704bb94 100644 --- a/e2e/core/pages/metadata-view.page.ts +++ b/e2e/core/pages/metadata-view.page.ts @@ -330,10 +330,6 @@ export class MetadataViewPage { await BrowserActions.click(this.saveGeneralMetadataButton); } - async clickResetGeneralMetadata(): Promise { - await BrowserActions.click(this.resetGeneralMetadataButton); - } - async generalSaveIconDisplayed(): Promise { await BrowserVisibility.waitUntilElementIsNotVisible(this.saveGeneralMetadataButton); } diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.html b/lib/content-services/src/lib/category/categories-management/categories-management.component.html index 3ec50386b5..a020126375 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.html +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.html @@ -1,7 +1,8 @@
- + - {{ categoryNameErrorMessageKey | translate }} + {{ categoryNameErrorMessageKey | translate }} +
-
+ - {{ tagNameErrorMessageKey | translate }} -
+ {{ tagNameErrorMessageKey | translate }} +

close diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss index a6a4f82a20..06dbb679b0 100644 --- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss +++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.scss @@ -2,7 +2,7 @@ adf-tags-creator { display: block; .adf-label-with-icon-button { - background: var(--adf-metadata-tags-background-color); + background: var(--adf-metadata-buttons-background-color); width: fit-content; height: 32px; display: inline-flex; @@ -39,16 +39,31 @@ adf-tags-creator { padding-right: 3px; font-size: 14px; } + + .mat-form-field-appearance-fill .mat-form-field-flex { + background: none; + } + + .mat-form-field-appearance-fill .mat-form-field-infix { + padding: 0; + } } .adf-tag-search-field { - width: 752px; - background: var(--adf-metadata-tags-background-color); + background: var(--adf-metadata-buttons-background-color); height: 32px; border-radius: 12px; align-items: center; display: flex; padding: 0 12px; + + .mat-form-field-underline { + display: none; + } + + .mat-form-field-wrapper { + width: 100%; + } } .adf-create-tag-label { diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts index 6eb410bd18..760b56a2d8 100644 --- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts +++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts @@ -21,7 +21,7 @@ import { NotificationService } from '@alfresco/adf-core'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; import { MatIconModule } from '@angular/material/icon'; -import { MatError, MatFormFieldModule } from '@angular/material/form-field'; +import { MatError, MatFormField, MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; import { ReactiveFormsModule } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; @@ -300,7 +300,7 @@ describe('TagsCreatorComponent', () => { const tagNameField = fixture.debugElement.query(By.css(tagNameFieldSelector)); expect(tagNameField).toBeTruthy(); expect(tagNameField.nativeElement.hasAttribute('hidden')).toBeFalsy(); - expect(tagNameField).toBeTruthy(); + expect(tagNameField.query(By.directive(MatFormField))).toBeTruthy(); }); it('should input be autofocused', fakeAsync(() => { @@ -310,6 +310,18 @@ describe('TagsCreatorComponent', () => { expect(getNameInput()).toBe(document.activeElement as HTMLInputElement); })); + it('should input be autofocused after showing input second time', fakeAsync(() => { + component.tagNameControlVisible = true; + fixture.detectChanges(); + tick(100); + + component.tagNameControlVisible = true; + fixture.detectChanges(); + tick(100); + + expect(getNameInput()).toBe(document.activeElement as HTMLInputElement); + })); + describe('Errors', () => { /** * Get first error @@ -374,6 +386,13 @@ describe('TagsCreatorComponent', () => { expect(getFirstError()).toBe('TAG.TAGS_CREATOR.ERRORS.ALREADY_ADDED_TAG'); })); + it('should not show error for required if tags are changed', fakeAsync(() => { + typeTag(''); + component.tags = ['new tag 1', 'new tag 2']; + fixture.detectChanges(); + expect(getFirstError()).toBeUndefined(); + })); + it('should show error when duplicated already existing tag', fakeAsync(() => { const tag = 'Some tag'; diff --git a/lib/core/src/lib/styles/_components-variables.scss b/lib/core/src/lib/styles/_components-variables.scss index b3f7d856cb..d6a0029e59 100644 --- a/lib/core/src/lib/styles/_components-variables.scss +++ b/lib/core/src/lib/styles/_components-variables.scss @@ -46,7 +46,7 @@ --adf-identity-user-info-font-size: var(--theme-adf-picture-1-font-size), --adf-user-info-container-margin-right: $adf-ref-margin-right, --adf-metadata-property-panel-border-color: $adf-metadata-property-panel-border-color, - --adf-metadata-tags-background-color: $adf-metadata-tags-background-color + --adf-metadata-buttons-background-color: $adf-metadata-buttons-background-color ); // propagates SCSS variables into the CSS variables scope diff --git a/lib/core/src/lib/styles/_reference-variables.scss b/lib/core/src/lib/styles/_reference-variables.scss index e82999a004..e17cc25b5e 100644 --- a/lib/core/src/lib/styles/_reference-variables.scss +++ b/lib/core/src/lib/styles/_reference-variables.scss @@ -28,4 +28,4 @@ $adf-ref-width: 40px; $adf-ref-line-height: 40px; $adf-ref-margin-right: 8px; $adf-metadata-property-panel-border-color: rgba(0, 0, 0, 0.12); -$adf-metadata-tags-background-color: rgba(33, 33, 33, 0.05); +$adf-metadata-buttons-background-color: rgba(33, 33, 33, 0.05);