From 4dbed99fd80ad456ae1a01f29455103bdc023a86 Mon Sep 17 00:00:00 2001 From: Yasa-Nataliya Date: Wed, 26 Jul 2023 06:26:27 +0000 Subject: [PATCH] changes for theme colors --- .../categories-management.component.spec.ts | 24 +++++++++++++++++++ .../content-metadata.component.scss | 4 ++-- .../content-metadata.component.ts | 4 ---- .../tags-creator/tags-creator.component.scss | 4 ++-- .../src/lib/styles/_components-variables.scss | 2 ++ .../src/lib/styles/_reference-variables.scss | 2 ++ 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts b/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts index 4fe0f21dbe..ebc28385aa 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts @@ -455,4 +455,28 @@ describe('CategoriesManagementComponent', () => { })); }); }); + + it('should remove a category', fakeAsync(() => { + component.managementMode = CategoriesManagementMode.ASSIGN; + const categoryToRemove: Category = { id: 'catToRemove', name: 'Category to Remove' }; + component.categories = [categoryToRemove]; + component['_existingCategories'] = []; + component.initialCategories = []; + component.removeCategoryTitle = 'Remove Category'; + component.removeCategory(categoryToRemove); + expect(component.categories.length).toBe(0); + })); + + it('should hide categoryNameControl and emit event', fakeAsync(() => { + component.hideNameInput(); + expect(component.categoryNameControlVisible).toBe(false); + expect(component.existingCategoriesPanelVisible).toBe(false); + })); + + it('should toggle categoryNameControl visibility', () => { + component.categoryNameControlVisible = true; + expect(component.categoryNameControlVisible).toBe(true); + component.categoryNameControlVisible = false; + expect(component.categoryNameControlVisible).toBe(false); + }); }); diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss index b080e3f1b7..3974c1b6f6 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.scss @@ -36,7 +36,7 @@ align-items: center; border-radius: 16px; width: fit-content; - background: rgba(33, 33, 33, 0.05); + background: var(--adf-metadata-tags-background-color); margin-top: 12px; padding: 6px 12px; justify-content: center; @@ -121,7 +121,7 @@ .adf-metadata-properties { .mat-expansion-panel { width: 755px; - border: 1px solid var(--adf-package-list-table-row-border-bottom-color); + border: 1px solid var(--adf-metadata-property-panel-border-color); margin: 24px; border-radius: 12px !important; } diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts index ec461bf7a0..4882097d25 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.ts @@ -357,10 +357,6 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy { return group.title === this.displayAspect; } - // canExpandProperties(): boolean { - // return !this.expanded || this.displayAspect === 'Properties'; - // } - keyDown(event: KeyboardEvent) { if (event.keyCode === 37 || event.keyCode === 39) { // ArrowLeft && ArrowRight event.stopPropagation(); 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 f31541b1f5..5ffabbb13f 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: rgba(33, 33, 33, 0.05); + background: var(--adf-metadata-tags-background-color); width: fit-content; height: 32px; display: inline-flex; @@ -42,7 +42,7 @@ adf-tags-creator { .adf-tag-search-field { width: 752px; - background: rgba(33, 33, 33, 0.05); + background: var(--adf-metadata-tags-background-color); height: 32px; border-radius: 12px; align-items: center; diff --git a/lib/core/src/lib/styles/_components-variables.scss b/lib/core/src/lib/styles/_components-variables.scss index 4f99fded8e..b3129072d9 100644 --- a/lib/core/src/lib/styles/_components-variables.scss +++ b/lib/core/src/lib/styles/_components-variables.scss @@ -45,6 +45,8 @@ --adf-identity-user-info-line-height: $adf-ref-line-height, --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 ); // 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 d214c5fff0..e82999a004 100644 --- a/lib/core/src/lib/styles/_reference-variables.scss +++ b/lib/core/src/lib/styles/_reference-variables.scss @@ -27,3 +27,5 @@ $adf-ref-height: 40px; $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);