From 96a38272f574dbfc8d250ecb69396cc9383d51a4 Mon Sep 17 00:00:00 2001
From: DominikIwanek <dominik.iwanek@hyland.com>
Date: Thu, 4 Apr 2024 14:48:43 +0200
Subject: [PATCH] [ACS-7414] - Manage versions dialog

---
 .../new-version-uploader.dialog.html          |  2 +-
 .../new-version-uploader.dialog.scss          |  6 +--
 .../version-list.component.html               | 47 +++++++------------
 .../version-list.component.scss               |  4 +-
 .../notification-history.component.scss       |  8 +++-
 5 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.html b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.html
index 5410ffd1aa..87665c2002 100644
--- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.html
+++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.html
@@ -13,7 +13,7 @@
   </adf-version-upload>
 </section>
 <ng-container *ngIf="data.showVersionsOnly">
-  <section mat-dialog-content>
+  <section class="adf-new-version-uploader-dialog-content" mat-dialog-content>
     <div class="adf-version-list-container">
       <div class="adf-version-list-table">
         <adf-version-list
diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
index fd90e4da4e..8f302c0413 100644
--- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
+++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.scss
@@ -24,7 +24,7 @@
         height: 500px;
     }
 
-    &-title {
+    .adf-new-version-uploader-dialog-title {
         flex: 0 0 auto;
         font-size: 20px;
         font-weight: 600;
@@ -36,12 +36,12 @@
         color: var(--adf-theme-foreground-text-color-087);
     }
 
-    &-content {
+    .adf-new-version-uploader-dialog-content {
+        padding: 0;
         flex: 1 1 auto;
         position: relative;
         max-height: 100vh;
         overflow: hidden;
-        padding: 2px 26px;
     }
 
     &-actions {
diff --git a/lib/content-services/src/lib/version-manager/version-list.component.html b/lib/content-services/src/lib/version-manager/version-list.component.html
index 5f3970abb0..e49d6ab394 100644
--- a/lib/content-services/src/lib/version-manager/version-list.component.html
+++ b/lib/content-services/src/lib/version-manager/version-list.component.html
@@ -30,38 +30,25 @@
                         <button *ngIf="allowViewVersions"
                                 [id]="'adf-version-list-action-view-' + version.entry.id"
                                 mat-menu-item
-                                (click)="onViewVersion(version.entry.id)">
-                            {{ 'ADF_VERSION_LIST.ACTIONS.VIEW' | translate }}
+                                (click)="downloadVersion(version.entry.id)">
+                            {{ 'ADF_VERSION_LIST.ACTIONS.DOWNLOAD' | translate }}
                         </button>
-                    </ng-container>
-                    <button
-                        [id]="'adf-version-list-action-restore-' + version.entry.id"
-                        [disabled]="!canUpdate() || latestVersion"
-                        mat-menu-item
-                        (click)="restore(version.entry.id)">
-                        {{ 'ADF_VERSION_LIST.ACTIONS.RESTORE' | translate }}
-                    </button>
-                    <button *ngIf="allowDownload"
-                            [id]="'adf-version-list-action-download-' + version.entry.id"
-                            mat-menu-item
-                            (click)="downloadVersion(version.entry.id)">
-                        {{ 'ADF_VERSION_LIST.ACTIONS.DOWNLOAD' | translate }}
-                    </button>
-                    <button
-                        [disabled]="!canDelete()"
-                        [id]="'adf-version-list-action-delete-' + version.entry.id"
-                        (click)="deleteVersion(version.entry.id)"
-                        mat-menu-item>
-                        {{ 'ADF_VERSION_LIST.ACTIONS.DELETE' | translate }}
-                    </button>
-                </mat-menu>
+                        <button
+                            [disabled]="!canDelete()"
+                            [id]="'adf-version-list-action-delete-' + version.entry.id"
+                            (click)="deleteVersion(version.entry.id)"
+                            mat-menu-item>
+                            {{ 'ADF_VERSION_LIST.ACTIONS.DELETE' | translate }}
+                        </button>
+                    </mat-menu>
 
-                <button mat-icon-button
-                        [matMenuTriggerFor]="versionMenu"
-                        [id]="'adf-version-list-action-menu-button-' + version.entry.id"
-                        title="{{ 'ADF_VERSION_LIST.MANAGE_VERSION_OPTIONS' | translate }}">
-                    <mat-icon>more_vert</mat-icon>
-                </button>
+                    <button mat-icon-button
+                            [matMenuTriggerFor]="versionMenu"
+                            [id]="'adf-version-list-action-menu-button-' + version.entry.id"
+                            title="{{ 'ADF_VERSION_LIST.MANAGE_VERSION_OPTIONS' | translate }}">
+                        <mat-icon>more_vert</mat-icon>
+                    </button>
+                </div>
             </div>
         </mat-list-item>
     </cdk-virtual-scroll-viewport>
diff --git a/lib/content-services/src/lib/version-manager/version-list.component.scss b/lib/content-services/src/lib/version-manager/version-list.component.scss
index 642e66055e..6fcaab7a84 100644
--- a/lib/content-services/src/lib/version-manager/version-list.component.scss
+++ b/lib/content-services/src/lib/version-manager/version-list.component.scss
@@ -1,8 +1,9 @@
 /* stylelint-disable selector-class-pattern */
+/* stylelint-disable no-descending-specificity */
+
 @import 'styles/mat-selectors';
 
 .adf-version-list {
-    &-viewport {
         height: 100%;
         overflow-x: hidden;
         display: flex;
@@ -28,6 +29,7 @@
     &-item-comment {
         width: 100%;
         opacity: 0.5;
+        margin: 0;
 
         @media screen and (width <= 629px) {
             width: 97%;
diff --git a/lib/core/src/lib/notifications/components/notification-history.component.scss b/lib/core/src/lib/notifications/components/notification-history.component.scss
index 9ebd92af3a..a0ba3d6c4d 100644
--- a/lib/core/src/lib/notifications/components/notification-history.component.scss
+++ b/lib/core/src/lib/notifications/components/notification-history.component.scss
@@ -2,11 +2,17 @@
 
 .adf {
     &-notification-history-menu_button#{$mat-button} {
-        margin-right: 0;
+        margin-right: 8px;
         border-radius: 90%;
         padding: 0;
         min-width: 40px;
         height: 40px;
+
+        .adf-notification-history-menu_button-icon {
+            font-size: 24px;
+            height: 24px;
+            width: 24px;
+        }
     }
 
     &-notification-history-list #{$mat-subheader} {