mgr/dashboard: Added carbon grid

Signed-off-by: Afreen Misbah <afreen@ibm.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
index fcab76f098884720509bfad9688b02739f2ab47a..430d66b0471ee5da40017aa3b701d5da98982433 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
@@ -106,8 +106,7 @@ const routes: Routes = [
     children: [
       { path: 'overview', component: DashboardComponent },
       { path: 'error', component: ErrorComponent },
-
-      // Notifications
+      // Cluster
       {
         path: 'notifications',
         data: {
@@ -115,7 +114,6 @@ const routes: Routes = [
         },
         component: NotificationsPageComponent
       },
-      // Cluster
       {
         path: 'expand-cluster',
         component: CreateClusterComponent,

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-panel/notification-panel.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-panel/notification-panel.component.scss
index 862e2c3c92d93768b6803a7dabfe49c752d63fe9..8264b4f5e6af4779efac8dfad4cafb3b1bac099b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-panel/notification-panel.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notification-panel/notification-panel.component.scss
@@ -18,7 +18,7 @@
   color: $text-primary;
   display: flex;
   flex-direction: column;
-  overflow-y: auto;
+  overflow: hidden;
 
   cd-notification-header {
     flex: 0 0 auto;

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.html
index 9074523c011d9311406b923f4e7109b50e62c5ca..1e6d3e67d935c2c0a7bdd95ed1b64ed5467a96a4 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.html
@@ -1,63 +1,64 @@
-<div class="notifications-page-container">
-  <div class="notification-section-heading"
-       i18n>Notifications</div>
-  <div class="row">
-    <!-- Left Panel - Notifications List -->
-    <div class="col-md-4">
-      <!-- Search Bar -->
-      <div class="search-container mb-4">
-        <cds-search
-          [size]="'md'"
-          [placeholder]="'Search notifications...'"
-          [(ngModel)]="searchText"
-          (valueChange)="onSearch($event)">
-        </cds-search>
-      </div>
-      <!-- Notifications List using Carbon Structured List -->
-      <cds-structured-list
-        class="notifications-list"
-        *ngIf="filteredNotifications.length > 0">
-        <cds-list-row
-          *ngFor="let notification of filteredNotifications"
-          [class.active]="selectedNotification === notification"
-          (click)="onNotificationSelect(notification)"
-          class="notification-row">
-          <cds-list-column>
-            <div class="notification-item-content">
-              <h6 class="notification-title">
-                <ng-container *ngIf="notification.prometheusAlert; else regularTitle">
-                  {{ notification.prometheusAlert.alertName }}
-                  <cds-tag
-                    [type]="notification.prometheusAlert.status === 'active' || notification.prometheusAlert.status === 'firing'?'red':
-                            notification.prometheusAlert.status === 'resolved' ? 'green' : 'blue'"
-                    [size]="'sm'"
-                    class="ml-2">
-                    {{ notification.prometheusAlert.status }}
-                  </cds-tag>
-                </ng-container>
-                <ng-template #regularTitle>
-                  {{ notification.title }}
-                </ng-template>
-              </h6>
-              <small class="notification-meta">
-                {{ notification.application }}
-                <ng-container *ngIf="notification.prometheusAlert">
-                  • {{ notification.prometheusAlert.severity }}
-                  <ng-container *ngIf="notification.prometheusAlert.instance">
-                    • {{ notification.prometheusAlert.instance }}
-                  </ng-container>
+<div 
+  cdsGrid
+  [useCssGrid]="true"
+  [fullWidth]="true"
+  class="notifications-page__container">
+  <!-- Left Panel - Notifications List -->
+  <div cdsCol
+       [columnNumbers]="{sm: 4, md: 4, lg: 5}">
+    <cds-search
+      cdsRow
+      [size]="'md'"
+      placeholder="Search notifications..."
+      i18n-placeholder
+      [(ngModel)]="searchText"
+      (valueChange)="onSearch($event)">
+    </cds-search>
+    <cds-structured-list
+      cdsRow
+      class="notifications-list"
+      *ngIf="filteredNotifications.length > 0">
+      <cds-list-row
+        *ngFor="let notification of filteredNotifications"
+        [class.active]="selectedNotification === notification"
+        (click)="onNotificationSelect(notification)"
+        class="notification-row">
+        <cds-list-column>
+          <div class="notification-item-content">
+            <h6 class="notification-title">
+              <ng-container *ngIf="notification.prometheusAlert; else regularTitle">
+                {{ notification.prometheusAlert.alertName }}
+                <cds-tag
+                  [type]="notification.prometheusAlert.status === 'active' || notification.prometheusAlert.status === 'firing'?'red':
+                          notification.prometheusAlert.status === 'resolved' ? 'green' : 'blue'"
+                  [size]="'sm'"
+                  class="ml-2">
+                  {{ notification.prometheusAlert.status }}
+                </cds-tag>
+              </ng-container>
+              <ng-template #regularTitle>
+                {{ notification.title }}
+              </ng-template>
+            </h6>
+            <small class="notification-meta">
+              {{ notification.application }}
+              <ng-container *ngIf="notification.prometheusAlert">
+                • {{ notification.prometheusAlert.severity }}
+                <ng-container *ngIf="notification.prometheusAlert.instance">
+                  • {{ notification.prometheusAlert.instance }}
                 </ng-container>
-              </small>
-            </div>
-          </cds-list-column>
-          <cds-list-column nowrap="true">
-            <small class="notification-date">{{ formatDate(notification.timestamp) }}</small>
-          </cds-list-column>
-        </cds-list-row>
-      </cds-structured-list>
-      <!-- Empty state -->
-      <div *ngIf="filteredNotifications.length === 0"
-           class="empty-state">
+              </ng-container>
+            </small>
+          </div>
+        </cds-list-column>
+        <cds-list-column nowrap="true">
+          <small class="notification-date">{{ formatDate(notification.timestamp) }}</small>
+        </cds-list-column>
+      </cds-list-row>
+    </cds-structured-list>
+    <div *ngIf="filteredNotifications.length === 0"
+          class="empty-state"
+          cdsRow>
         <svg
           cdsIcon="notification"
           size="48"
@@ -65,15 +66,21 @@
         <p *ngIf="searchText">No notifications match your search</p>
         <p *ngIf="!searchText">No notifications available</p>
       </div>
-    </div>
-    <!-- Right Panel - Notification Details -->
-    <div class="col-md-8">
-      <div class="notification-section-heading">Notification Details</div>
-      <div *ngIf="selectedNotification"
-           class="notification-details">
-        <div class="notification-section-heading">{{ selectedNotification.title }}</div>
-        <!-- Details using Carbon Structured List -->
-        <cds-structured-list class="details-list mt-4">
+  </div>
+  <!-- Right Panel - Notifications Details -->
+  <div cdsCol
+       [columnNumbers]="{sm: 12, md: 12, lg: 9}">
+    <div 
+      cdsGrid
+      [fullWidth]="true"
+      *ngIf="selectedNotification"
+      class="notification-details">
+      <div cdsCol
+            [columnNumbers]="{sm: 16, md: 16, lg: 16}">
+        <h3 cdsRow>{{ selectedNotification.title }}</h3>
+        <cds-structured-list
+          cdsRow
+          class="details-list mt-4">
           <cds-list-row>
             <cds-list-column
               nowrap="true"
@@ -91,8 +98,8 @@
                         selectedNotification.type === 2 ? 'green' : 'yellow'"
                 [size]="'sm'">
                 {{ selectedNotification.type === 0 ? 'Error' :
-                   selectedNotification.type === 1 ? 'Info' :
-                   selectedNotification.type === 2 ? 'Success' : 'Warning' }}
+                  selectedNotification.type === 1 ? 'Info' :
+                  selectedNotification.type === 2 ? 'Success' : 'Warning' }}
               </cds-tag>
             </cds-list-column>
           </cds-list-row>
@@ -191,6 +198,7 @@
           </ng-container>
           <!-- Regular message for non-Prometheus notifications -->
           <cds-list-row
+            cdsRow
             *ngIf="selectedNotification.message && !selectedNotification.prometheusAlert">
             <cds-list-column
               nowrap="true"
@@ -201,14 +209,6 @@
           </cds-list-row>
         </cds-structured-list>
       </div>
-      <div *ngIf="!selectedNotification"
-           class="no-selection-state">
-        <svg
-          cdsIcon="notification"
-          size="64"
-          class="no-selection-icon"></svg>
-        <p>Select a notification to view details</p>
-      </div>
     </div>
   </div>
 </div>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.scss
index 1f043926188774bba40898ea6b33ea5da3613638..2cd8e7112773d6434fb0af02b07f8a610d1fc993 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.scss
@@ -1,24 +1,8 @@
 // Main container
-.notifications-page-container {
-  padding: var(--cds-spacing-05);
+.notifications-page__container {
+  padding-top: var(--cds-spacing-05);
   background-color: var(--cds-layer-01);
-  min-height: 100vh;
-}
-
-// Section headings
-.notification-section-heading {
-  font-size: var(--cds-productive-heading-03-font-size);
-  line-height: var(--cds-productive-heading-03-line-height);
-  font-weight: var(--cds-productive-heading-03-font-weight);
-  color: var(--cds-text-primary);
-  margin-bottom: var(--cds-spacing-05);
-}
-
-// Search container
-.search-container {
-  cds-search {
-    width: 100%;
-  }
+  column-gap: 1rem;
 }
 
 // Notifications list
@@ -97,14 +81,6 @@
   border: 1px solid var(--cds-border-subtle);
   border-radius: var(--cds-border-radius);
   background-color: var(--cds-layer-01);
-
-  h4 {
-    margin: 0 0 var(--cds-spacing-05) 0;
-    font-size: var(--cds-productive-heading-03-font-size);
-    line-height: var(--cds-productive-heading-03-line-height);
-    font-weight: var(--cds-productive-heading-03-font-weight);
-    color: var(--cds-text-primary);
-  }
 }
 
 // Details list
@@ -125,7 +101,6 @@
     color: var(--cds-text-secondary);
     font-weight: var(--cds-font-weight-semibold);
     font-size: var(--cds-body-compact-01-font-size);
-    min-width: 120px;
   }
 
   cds-list-column:last-child {
@@ -167,13 +142,6 @@
 }
 
 // Typography
-h1 {
-  font-size: var(--cds-productive-heading-05-font-size);
-  line-height: var(--cds-productive-heading-05-line-height);
-  font-weight: var(--cds-productive-heading-05-font-weight);
-  color: var(--cds-text-primary);
-  margin-bottom: var(--cds-spacing-03);
-}
 
 h3 {
   font-size: var(--cds-productive-heading-03-font-size);
@@ -201,20 +169,3 @@ p {
 .mt-5 {
   margin-top: var(--cds-spacing-06);
 }
-
-// Responsive design
-@media (width <= 768px) {
-  .notifications-page-container {
-    padding: var(--cds-spacing-04);
-  }
-
-  .notification-details {
-    padding: var(--cds-spacing-04);
-  }
-
-  .details-list {
-    .detail-label {
-      min-width: auto;
-    }
-  }
-}

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.ts
index dd5ef3597b81e36da118743cacfb3432d59ee066..f507941a2147c797b1ce83ae65993cf4ecf5454d 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notification-panel/notifications-page/notifications-page.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core';
+import { Component, OnInit, OnDestroy, AfterViewInit, ChangeDetectorRef, AfterViewChecked } from '@angular/core';
 import { Subscription } from 'rxjs';
 import { NotificationService } from '~/app/shared/services/notification.service';
 import { CdNotification } from '~/app/shared/models/cd-notification';
@@ -12,7 +12,7 @@ import { AuthStorageService } from '~/app/shared/services/auth-storage.service';
   templateUrl: './notifications-page.component.html',
   styleUrls: ['./notifications-page.component.scss']
 })
-export class NotificationsPageComponent implements OnInit, OnDestroy, AfterViewInit {
+export class NotificationsPageComponent implements OnInit, OnDestroy, AfterViewInit, AfterViewChecked {
   notifications: CdNotification[] = [];
   selectedNotification: CdNotification | null = null;
   searchText: string = '';
@@ -24,7 +24,8 @@ export class NotificationsPageComponent implements OnInit, OnDestroy, AfterViewI
     private notificationService: NotificationService,
     private prometheusAlertService: PrometheusAlertService,
     private prometheusNotificationService: PrometheusNotificationService,
-    private authStorageService: AuthStorageService
+    private authStorageService: AuthStorageService,
+    private changeDetectorRef: ChangeDetectorRef
   ) {}
 
   ngOnInit(): void {
@@ -160,4 +161,8 @@ export class NotificationsPageComponent implements OnInit, OnDestroy, AfterViewI
   ngAfterViewInit(): void {
     this.sub.add(this.notificationService.data$.subscribe(() => {}));
   }
+
+  ngAfterViewChecked() {
+    this.changeDetectorRef.detectChanges();
+  }
 }