From 797305a463e28b84326bf7f40dbce23d8a7dfc58 Mon Sep 17 00:00:00 2001
From: Yasa-Nataliya <yasa.nataliya@globallogic.com>
Date: Mon, 4 Sep 2023 22:44:50 +0530
Subject: [PATCH] [ACS-5645]modified changes

---
 .../metadata/metadata-content-type.e2e.ts     | 12 +++++------
 .../metadata/metadata-properties.e2e.ts       |  2 +-
 .../metadata/metadata-smoke-tests.e2e.ts      | 20 +++++++++----------
 e2e/core/pages/metadata-view.page.ts          |  4 ++--
 .../content-metadata.component.html           |  8 ++++----
 .../content-metadata.component.scss           | 15 +-------------
 .../content-metadata.component.ts             | 10 +++++-----
 stylelint-config.json                         |  2 +-
 8 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/e2e/content-services/metadata/metadata-content-type.e2e.ts b/e2e/content-services/metadata/metadata-content-type.e2e.ts
index 9e2e0bb3ba..96dd312411 100644
--- a/e2e/content-services/metadata/metadata-content-type.e2e.ts
+++ b/e2e/content-services/metadata/metadata-content-type.e2e.ts
@@ -114,13 +114,13 @@ describe('content type', () => {
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
-        await metadataViewPage.generalEditIconDisplayed();
+        await metadataViewPage.editGeneralIconDisplayed();
 
         await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
         const defaultType  = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content'));
         await expect(defaultType).toBe(true, 'Content type not found');
 
-        await metadataViewPage.editIconGeneralClick();
+        await metadataViewPage.clickEditIconGeneral();
 
         await expect(await metadataViewPage.changeContentType(type.title)).toBe(true, 'Failed to update node type.');
         await metadataViewPage.clickSaveGeneralMetadata();
@@ -139,7 +139,7 @@ describe('content type', () => {
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
-        await metadataViewPage.generalEditIconDisplayed();
+        await metadataViewPage.editGeneralIconDisplayed();
 
         await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
         const customType  = (await metadataViewPage.hasContentType(type.title)) || (await metadataViewPage.hasContentType(`${model.namespacePrefix}:${type.name}`));
@@ -155,13 +155,13 @@ describe('content type', () => {
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
-        await metadataViewPage.generalEditIconDisplayed();
+        await metadataViewPage.editGeneralIconDisplayed();
 
         await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
         let defaultType  = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content'));
         await expect(defaultType).toBe(true, 'Content type not found');
 
-        await metadataViewPage.editIconGeneralClick();
+        await metadataViewPage.clickEditIconGeneral();
 
         await expect(await metadataViewPage.changeContentType(type.title)).toBe(true, 'Failed to update node type.');
         await metadataViewPage.clickSaveGeneralMetadata();
@@ -178,7 +178,7 @@ describe('content type', () => {
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
-        await metadataViewPage.generalEditIconDisplayed();
+        await metadataViewPage.editGeneralIconDisplayed();
 
         await expect(await viewerPage.getActiveTab()).toEqual('PROPERTIES');
         defaultType  = (await metadataViewPage.hasContentType('Content')) || (await metadataViewPage.hasContentType('cm:content'));
diff --git a/e2e/content-services/metadata/metadata-properties.e2e.ts b/e2e/content-services/metadata/metadata-properties.e2e.ts
index 6c8be71db1..c5c0d181ec 100644
--- a/e2e/content-services/metadata/metadata-properties.e2e.ts
+++ b/e2e/content-services/metadata/metadata-properties.e2e.ts
@@ -103,7 +103,7 @@ describe('CardView Component - properties', () => {
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
-        await metadataViewPage.generalEditIconDisplayed();
+        await metadataViewPage.editGeneralIconDisplayed();
 
         await CheckboxPage.check(metadataViewPage.readonlySwitch);
     });
diff --git a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts
index ab9395d4b7..85e7de8370 100644
--- a/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts
+++ b/e2e/content-services/metadata/metadata-smoke-tests.e2e.ts
@@ -136,11 +136,11 @@ describe('Metadata component', () => {
             await viewerPage.clickInfoButton();
             await viewerPage.checkInfoSideBarIsDisplayed();
             await metadataViewPage.clickOnPropertiesTab();
-            await metadataViewPage.generalEditIconDisplayed();
+            await metadataViewPage.editGeneralIconDisplayed();
 
             await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
 
-            await metadataViewPage.editIconGeneralClick();
+            await metadataViewPage.clickEditIconGeneral();
             await metadataViewPage.editPropertyIconIsDisplayed('properties.cm:name');
             await metadataViewPage.editPropertyIconIsDisplayed('properties.cm:title');
             await metadataViewPage.editPropertyIconIsDisplayed('properties.cm:description');
@@ -152,7 +152,7 @@ describe('Metadata component', () => {
             await metadataViewPage.enterPropertyText('properties.cm:name', 'exampleText');
             await metadataViewPage.clickResetMetadata();
             await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual(browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name);
-            await metadataViewPage.editIconGeneralClick();
+            await metadataViewPage.clickEditIconGeneral();
             await metadataViewPage.enterPropertyText('properties.cm:name', 'exampleText.png');
             await metadataViewPage.enterPropertyText('properties.cm:title', 'example title');
             await metadataViewPage.enterDescriptionText('example description');
@@ -169,12 +169,12 @@ describe('Metadata component', () => {
             await viewerPage.clickInfoButton();
             await viewerPage.checkInfoSideBarIsDisplayed();
             await metadataViewPage.clickOnPropertiesTab();
-            await metadataViewPage.generalEditIconDisplayed();
+            await metadataViewPage.editGeneralIconDisplayed();
 
             await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual('exampleText.png');
             await expect(await metadataViewPage.getPropertyText('properties.cm:title')).toEqual('example title');
 
-            await metadataViewPage.editIconGeneralClick();
+            await metadataViewPage.clickEditIconGeneral();
             await metadataViewPage.enterPropertyText('properties.cm:name', browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name);
             await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual(browser.params.resources.Files.ADF_DOCUMENTS.PNG.file_name);
             await metadataViewPage.clickSaveGeneralMetadata();
@@ -229,17 +229,17 @@ describe('Metadata component', () => {
         it('[C261158] Should be possible edit the metadata When the node is a Folder', async () => {
             await contentServicesPage.metadataContent(folderName);
 
-            await metadataViewPage.editIconGeneralClick();
+            await metadataViewPage.clickEditIconGeneral();
 
             await metadataViewPage.enterPropertyText('properties.cm:name', 'newnameFolder');
             await metadataViewPage.clickResetButton();
             await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual(folderName);
 
-            await metadataViewPage.editIconGeneralClick();
+            await metadataViewPage.clickEditIconGeneral();
             await metadataViewPage.enterPropertyText('properties.cm:name', 'newnameFolder');
             await metadataViewPage.clickSaveGeneralMetadata();
             await expect(await metadataViewPage.getPropertyText('properties.cm:name')).toEqual('newnameFolder');
-            await metadataViewPage.editIconGeneralClick();
+            await metadataViewPage.clickEditIconGeneral();
 
             await metadataViewPage.enterPropertyText('properties.cm:name', folderName);
             await metadataViewPage.clickSaveGeneralMetadata();
@@ -255,11 +255,11 @@ describe('Metadata component', () => {
         await viewerPage.clickInfoButton();
         await viewerPage.checkInfoSideBarIsDisplayed();
         await metadataViewPage.clickOnPropertiesTab();
-        await metadataViewPage.generalEditIconDisplayed();
+        await metadataViewPage.editGeneralIconDisplayed();
 
         await expect(await viewerPage.getActiveTab()).toEqual(METADATA.PROPERTY_TAB);
 
-        await metadataViewPage.editIconGeneralClick();
+        await metadataViewPage.clickEditIconGeneral();
 
         await metadataViewPage.enterDescriptionText('check author example description');
         await metadataViewPage.clickSaveGeneralMetadata();
diff --git a/e2e/core/pages/metadata-view.page.ts b/e2e/core/pages/metadata-view.page.ts
index 8f494ae4c3..56deafc06e 100644
--- a/e2e/core/pages/metadata-view.page.ts
+++ b/e2e/core/pages/metadata-view.page.ts
@@ -107,7 +107,7 @@ export class MetadataViewPage {
         await BrowserVisibility.waitUntilElementIsNotVisible(this.editIcon);
     }
 
-    async generalEditIconDisplayed(): Promise<void> {
+    async editGeneralIconDisplayed(): Promise<void> {
         await BrowserVisibility.waitUntilElementIsVisible(this.editIconGeneral);
     }
 
@@ -115,7 +115,7 @@ export class MetadataViewPage {
         await BrowserActions.clickExecuteScript('button[data-automation-id="meta-data-card-toggle-edit"]');
     }
 
-    async editIconGeneralClick(): Promise<void> {
+    async clickEditIconGeneral(): Promise<void> {
         await BrowserActions.click(this.editIconGeneral);
     }
 
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 6a7a75a2c3..c3d7d306d0 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
@@ -33,7 +33,7 @@
                         <mat-icon>clear</mat-icon>
                     </button>
                     <button mat-icon-button
-                            (click)="saveChanges(buttonType.GeneralInfo, $event, group)"
+                            (click)="saveChanges(buttonType.GeneralInfo, $event)"
                             color="primary"
                             data-automation-id="save-general-info-metadata"
                             [disabled]="!hasMetadataChanged">
@@ -85,7 +85,7 @@
                             <mat-icon>clear</mat-icon>
                         </button>
                         <button mat-icon-button
-                                (click)="saveChanges(buttonType.Tags, $event, group)"
+                                (click)="saveChanges(buttonType.Tags, $event)"
                                 color="primary"
                                 data-automation-id="save-tags-metadata"
                                 [disabled]="!hasMetadataChanged">
@@ -145,7 +145,7 @@
                             <mat-icon>clear</mat-icon>
                         </button>
                         <button mat-icon-button
-                                (click)="saveChanges(buttonType.Categories, $event, group)"
+                                (click)="saveChanges(buttonType.Categories, $event)"
                                 color="primary"
                                 data-automation-id="save-categories-metadata"
                                 [disabled]="!hasMetadataChanged">
@@ -213,7 +213,7 @@
                                     <mat-icon>clear</mat-icon>
                                 </button>
                                 <button mat-icon-button
-                                        (click)="saveChanges(buttonType.Group, $event, group)"
+                                        (click)="saveChanges(buttonType.Group, $event)"
                                         color="primary"
                                         data-automation-id="save-metadata"
                                         [disabled]="!hasMetadataChanged">
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 60e92143a1..c477d9b755 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
@@ -104,25 +104,12 @@
     }
 }
 
-.app-metadata-tab .adf-metadata-properties .mat-expansion-panel {
+.adf-info-drawer-layout-content .adf-content-metadata-card .adf-metadata-properties .mat-expansion-panel {
     border: 1px solid var(--adf-metadata-property-panel-border-color);
     border-radius: 12px;
     margin-bottom: 12px;
 }
 
-.acs-details-container {
-    .mat-tab-body-content {
-        .adf-metadata-properties {
-            .mat-expansion-panel {
-                width: 755px;
-                border: 1px solid var(--adf-metadata-property-panel-border-color);
-                margin: 24px;
-                border-radius: 12px;
-            }
-        }
-    }
-}
-
 .adf-content-metadata-card {
     .mat-card:not([class*='mat-elevation-z']) {
         box-shadow: none;
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 9d9cedd382..91421c4a05 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
@@ -131,7 +131,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
     @Input()
     readOnly = false;
 
-     /** Emitted when content's editable state is changed. **/
+    /** Emitted when content's editable state is changed. **/
     @Output()
     editableChange = new EventEmitter<boolean>();
 
@@ -162,7 +162,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
     categoriesPanelState: boolean;
     editableCategories = false;
     hasAllowableOperations = false;
-    editableGroup: any;
+    editableGroup: CardViewGroup;
     buttonType = ButtonType;
     group: CardViewGroup;
 
@@ -271,9 +271,9 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
      * Called after clicking save button. It confirms all changes done for metadata and hides both category and tag name controls.
      * Before clicking on that button they are not saved.
      */
-    saveChanges(buttonType: ButtonType, event: MouseEvent, group?: CardViewGroup) {
+    saveChanges(buttonType: ButtonType, event: MouseEvent) {
         event.stopPropagation();
-        this.toggleEditMode(buttonType, group);
+        this.toggleEditMode(buttonType);
         this._saving = true;
         this.tagNameControlVisible = false;
         this.categoryControlVisible = false;
@@ -411,7 +411,7 @@ export class ContentMetadataComponent implements OnChanges, OnInit, OnDestroy {
     }
 
     handleCategoriesPanelState(categoriesPanelState: boolean) {
-        this.categoriesPanelState= categoriesPanelState;
+        this.categoriesPanelState = categoriesPanelState;
         this.cdr.detectChanges();
     }
 
diff --git a/stylelint-config.json b/stylelint-config.json
index b03133de66..0294b8e491 100644
--- a/stylelint-config.json
+++ b/stylelint-config.json
@@ -91,7 +91,7 @@
     "max-line-length": 240,
     "linebreaks": "unix",
     "selector-class-pattern": [
-      "^_?(adf|adf-|app|app-|cdk-|example-|demo-|mat-|material-|textLayer|canvasWrapper|page|acs)",
+      "^_?(adf|adf-|app|app-|cdk-|example-|demo-|mat-|material-|textLayer|canvasWrapper|page)",
       {
         "resolveNestedSelectors": true
       }