From 9866cf4d1d0a5b6ca9c1a0a1e6619493a1cfe2f7 Mon Sep 17 00:00:00 2001
From: dhrn <dharan.g@muraai.com>
Date: Wed, 24 Apr 2019 12:30:52 +0530
Subject: [PATCH] * fixing the existing behavior

---
 .../metadata/metadata-properties.e2e.ts       |  2 +-
 .../content-metadata.component.html           |  4 +-
 .../content-metadata.component.spec.ts        | 42 ++++++++-----------
 .../content-metadata.component.ts             |  4 ++
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts
index 94da213ea8..6afc23d447 100644
--- a/e2e/content-services/metadata/metadata-properties.e2e.ts
+++ b/e2e/content-services/metadata/metadata-properties.e2e.ts
@@ -135,7 +135,7 @@ describe('CardView Component - properties', () => {
         metadataViewPage.clickOnInformationButton();
 
         metadataViewPage.checkMetadataGroupIsNotExpand('EXIF');
-        metadataViewPage.checkMetadataGroupIsExpand('properties');
+        metadataViewPage.checkMetadataGroupIsNotExpand('properties');
 
         metadataViewPage.clickMetadataGroup('properties');
 
diff --git a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.html b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.html
index 8f4876110a..d58b10ce2f 100644
--- a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.html
+++ b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.html
@@ -2,8 +2,8 @@
     <mat-accordion displayMode="flat" [multi]="multi">
         <mat-expansion-panel
             *ngIf="displayDefaultProperties"
-            [expanded]="!expanded || !displayAspect"
-            [hideToggle]="!expanded || !displayAspect"
+            [expanded]="canExpandProperties()"
+            [hideToggle]="canExpandProperties()"
             [attr.data-automation-id]="'adf-metadata-group-properties'" >
             <mat-expansion-panel-header>
                 <mat-panel-title>
diff --git a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts
index a3fe638500..fc263c9018 100644
--- a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts
+++ b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.spec.ts
@@ -312,21 +312,30 @@ describe('ContentMetadataComponent', () => {
             component.displayEmpty = true;
 
             fixture.detectChanges();
-            const defaultProp = queryDom(fixture);
-            const exifProp = queryDom(fixture, 'EXIF');
-            const customProp = queryDom(fixture, 'CUSTOM');
+            let defaultProp = queryDom(fixture);
+            let exifProp = queryDom(fixture, 'EXIF');
+            let customProp = queryDom(fixture, 'CUSTOM');
             expect(defaultProp.componentInstance.expanded).toBeFalsy();
             expect(exifProp.componentInstance.expanded).toBeTruthy();
             expect(customProp.componentInstance.expanded).toBeFalsy();
 
             component.displayAspect = 'CUSTOM';
             fixture.detectChanges();
-            const updatedDefault = queryDom(fixture);
-            const updatedExif = queryDom(fixture, 'EXIF');
-            const updatedCustom = queryDom(fixture, 'CUSTOM');
-            expect(updatedDefault.componentInstance.expanded).toBeFalsy();
-            expect(updatedExif.componentInstance.expanded).toBeFalsy();
-            expect(updatedCustom.componentInstance.expanded).toBeTruthy();
+            defaultProp = queryDom(fixture);
+            exifProp = queryDom(fixture, 'EXIF');
+            customProp = queryDom(fixture, 'CUSTOM');
+            expect(defaultProp.componentInstance.expanded).toBeFalsy();
+            expect(exifProp.componentInstance.expanded).toBeFalsy();
+            expect(customProp.componentInstance.expanded).toBeTruthy();
+
+            component.displayAspect = 'Properties';
+            fixture.detectChanges();
+            defaultProp = queryDom(fixture);
+            exifProp = queryDom(fixture, 'EXIF');
+            customProp = queryDom(fixture, 'CUSTOM');
+            expect(defaultProp.componentInstance.expanded).toBeTruthy();
+            expect(exifProp.componentInstance.expanded).toBeFalsy();
+            expect(customProp.componentInstance.expanded).toBeFalsy();
 
         }));
 
@@ -344,21 +353,6 @@ describe('ContentMetadataComponent', () => {
             expect(customProp.componentInstance.expanded).toBeFalsy();
 
         }));
-
-        it('should expand the properties section when input is null', async(() => {
-            component.displayAspect = null;
-            component.expanded = true;
-            component.displayEmpty = true;
-
-            fixture.detectChanges();
-            const defaultProp = queryDom(fixture);
-            const exifProp = queryDom(fixture, 'EXIF');
-            const customProp = queryDom(fixture, 'CUSTOM');
-            expect(defaultProp.componentInstance.expanded).toBeTruthy();
-            expect(exifProp.componentInstance.expanded).toBeFalsy();
-            expect(customProp.componentInstance.expanded).toBeFalsy();
-
-        }));
     });
 });
 
diff --git a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts
index b6d769cafb..cfeb2893ee 100644
--- a/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts
+++ b/lib/content-services/content-metadata/components/content-metadata/content-metadata.component.ts
@@ -126,4 +126,8 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
         return group.title === this.displayAspect;
     }
 
+    public canExpandProperties(): boolean {
+        return !this.expanded || this.displayAspect === 'Properties';
+    }
+
 }