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 472486d774..879cb02275 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,5 +1,5 @@
-
- {{ categoryNameErrorMessageKey | translate }}
+ {{ categoryNameErrorMessageKey | translate }}
@@ -30,7 +30,7 @@
-
+
{{ noCategoriesMsg | translate }}
diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.scss b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss
index e6cb8593d3..e5754941ba 100644
--- a/lib/content-services/src/lib/category/categories-management/categories-management.component.scss
+++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.scss
@@ -22,10 +22,6 @@
display: none;
}
- .mat-form-field-wrapper {
- width: 100%;
- }
-
.mat-form-field-appearance-fill {
.mat-form-field-flex {
background: none;
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 8f886d5fb6..c4ce59e01f 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
@@ -220,17 +220,38 @@ describe('CategoriesManagementComponent', () => {
component.categoryNameControlVisible = true;
fixture.detectChanges();
});
- it('should not hide category name control when categoryNameControlVisible is false', () => {
- component.categoryNameControlVisible = false;
- fixture.detectChanges();
- const categoryControl: HTMLDivElement = fixture.debugElement.query(By.css('.adf-category-name-field')).nativeElement;
- expect(categoryControl.hidden).toBeFalse();
- });
it('should be visible when categoryNameControlVisible is true', () => {
const categoryControl = fixture.debugElement.query(By.css('.adf-category-name-field'));
expect(categoryControl).toBeTruthy();
});
+
+ it('should return true when categoryNameControlVisible is true', () => {
+ component.categoryNameControlVisible = true;
+ const result = component.isNameCategoryVisible;
+ expect(result).toBeTrue();
+ });
+
+ it('should return false when categoryNameControlVisible is false and categories length is 0', () => {
+ component.categoryNameControlVisible = false;
+ component.categories = [];
+ const result = component.isNameCategoryVisible;
+ expect(result).toBeFalse();
+ });
+ });
+
+ describe('isEmpty', () => {
+ it('should return true when categories is not empty', () => {
+ component.categories = [category3, category4];
+ const result = component.isEmpty;
+ expect(result).toBeTrue();
+ });
+
+ it('should return false when categories is empty', () => {
+ component.categories = [];
+ const result = component.isEmpty;
+ expect(result).toBeFalse();
+ });
});
describe('Spinner', () => {
@@ -449,11 +470,8 @@ describe('CategoriesManagementComponent', () => {
expect(categoriesChangeSpy).toHaveBeenCalledOnceWith(component.categories);
}));
- it('should clear and not hide input after category is created', fakeAsync(() => {
+ it('should clear input after category is created', fakeAsync(() => {
createCategory('test');
- const categoryControl: HTMLDivElement = fixture.debugElement.query(By.css('.adf-category-name-field')).nativeElement;
-
- expect(categoryControl.hidden).toBeFalse();
expect(getExistingCategoriesList()).toEqual([]);
expect(component.categoryNameControl.value).toBe('');
expect(component.categoryNameControl.untouched).toBeTrue();
diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts
index 12fdd4dfd5..1ea557a851 100644
--- a/lib/content-services/src/lib/category/categories-management/categories-management.component.ts
+++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.ts
@@ -177,10 +177,18 @@ export class CategoriesManagementComponent implements OnInit, OnDestroy {
this.cancelExistingCategoriesLoading$.complete();
}
+ get isNameCategoryVisible(): boolean {
+ return (!this.categoryNameControlVisible && this.categories.length > 0) || this.categoryNameControlVisible;
+ }
+
get categoryNameControl(): FormControl {
return this._categoryNameControl;
}
+ get isEmpty(): boolean {
+ return this.categories?.length > 0;
+ }
+
get existingCategories(): Category[] {
return this._existingCategories;
}
diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
index 6cf0552b55..3cbc6e6f41 100644
--- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
+++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.html
@@ -5,18 +5,18 @@
[expanded]="canExpandProperties()"
[attr.data-automation-id]="'adf-metadata-group-properties'"
hideToggle
- (opened)="handleGeneralInfoPanelState()"
- (closed)="handleGeneralInfoPanelState()">
+ (opened)="toggleGeneralInfoPanel()"
+ (closed)="toggleGeneralInfoPanel()">
- {{ generalInfoPanelState ? 'expand_more' : 'chevron_right'}}
+ {{ isGeneralInfoPanelVisible ? 'expand_more' : 'chevron_right'}}
{{ 'CORE.METADATA.BASIC.HEADER' | translate }}
-