[CORE-6447] Feature/feture metrics trunk

src/app/metrics/metric-detail/metric-detail.component.html

@@ -104,9 +104,9 @@ <h2 class="title">{{ metric.name | titlecase }}</h2>
         </ng-container>
         <ng-container *ngSwitchCase="'institution'">
           <ion-button size="default" shape="round" color="ocean" (click)="action('edit')">Edit</ion-button>
-          <ion-button size="default" shape="round" color="ocean" *ngIf="metric.status === 'active'" (click)="action('setDraft')">Convert to Draft</ion-button>
-          <ion-button size="default" shape="round" color="ocean" *ngIf="metric.status === 'active'" (click)="action('archive')">Archive</ion-button>
           <ion-button size="default" shape="round" color="ocean" *ngIf="metric.status === 'draft' || metric.status === 'archived'" (click)="action('activate')">Set Active</ion-button>
+          <ion-button size="default" shape="round" color="ocean" *ngIf="metric.status === 'active'" (click)="action('draft')">Convert to Draft</ion-button>
+          <ion-button size="default" shape="round" color="ocean" *ngIf="metric.status === 'active' || metric.status === 'draft'" (click)="action('archive')">Archive</ion-button>
         </ng-container>
         <ng-container *ngSwitchDefault>
           <ion-button size="default" shape="round" color="ocean" (click)="action('edit')">Edit</ion-button>

src/app/metrics/metric-detail/metric-detail.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController, ToastController } from '@ionic/angular';
 import { UpdateMetricComponent } from '../update-metric/update-metric.component';
-import { Metric, MetricsService } from '../metrics.service';
+import { Metric, MetricStatus, MetricsService } from '../metrics.service';
 import { first } from 'rxjs';
 import { MetricConfigureComponent } from '../metric-configure/metric-configure.component';
 
@@ -43,16 +43,16 @@ export class MetricDetailComponent implements OnInit {
         this.calculateMetric();
         break;
       case 'archive':
-        this.archiveMetric();
+        this.setStatus('archived');
         break;
       case 'configure':
         this.configureMetric();
         break;
       case 'activate':
-        this.setActive();
+        this.setStatus('active');
         break;
-      case 'setDraft':
-        this.setDraft();
+      case 'draft':
+        this.setStatus('draft');
         break;
       default:
         console.log('Action not recognized');
@@ -73,14 +73,26 @@ export class MetricDetailComponent implements OnInit {
       });
     });
   }
-
-  setDraft() {
-  }
 
-  setActive() {
+  fetchMetrics() {
+    this.metricsService.getMetrics(this.from === 'library').pipe(first()).subscribe({
+      next: (metrics: Metric[]) => {
+        this.metric = metrics.find(metric => metric.uuid === this.metric.uuid);
+      },
+    });
   }
 
-  archiveMetric() {
+  setStatus(status: string) {
+    this.metricsService.setStatus(this.metric.uuid, MetricStatus[status]).pipe(first()).subscribe({
+      next: res => {
+        this.toastController.create({
+          message: res?.updateMetric?.message || `Metric set to ${status}.`,
+          duration: 1500,
+          position: 'top',
+        }).then(toast => toast.present());
+        this.fetchMetrics();
+      }
+    });
   }
 
   async configureMetric() {
@@ -104,7 +116,7 @@ export class MetricDetailComponent implements OnInit {
       await toast.present();
 
       if (res?.data?.configureMetric?.success === true) {
-        this.metricsService.getMetrics(this.from === 'library').pipe(first()).subscribe();
+        this.fetchMetrics();
       }
     });
   }
@@ -117,7 +129,7 @@ export class MetricDetailComponent implements OnInit {
           duration: 1500,
           position: 'top',
         }).then(toast => toast.present());
-        this.metricsService.getMetrics(this.from === 'library').pipe(first()).subscribe();
+        this.fetchMetrics();
       },
       error: error => {
         this.toastController.create({

src/app/metrics/metrics.component.ts

@@ -85,23 +85,13 @@ export class MetricsComponent implements OnInit, OnDestroy {
     const date = new Date(parseInt(timestamp));
     return `${date.getMonth() + 1}/${date.getDate()}/${date.getFullYear()}`;
   }
-
-  private _processRecords(records) {
-    const dateMap = {}; // Key: date, Value: { valueSum, countSum }
-    records.forEach(record => {
-      const date = this._formatDate(record.created);
-      if (!dateMap[date]) {
-        dateMap[date] = { value: '', count: '' };
-      }
-      dateMap[date].value += record.value;
-      dateMap[date].count += record.count;
-    });
-    return dateMap;
-  }
-
+
+  // Capitalize the first letter of a string
   private _ucFirst(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
   }
+
+  // generate a CSV file for download
   download() {
     this.metricsService.download().pipe(first()).subscribe({
       next: response => {

src/app/metrics/metrics.service.ts

@@ -146,8 +146,26 @@ export class MetricsService {
     );
   }
 
+  // set metric status only (draft, active, archived)
+  setStatus(uuid: string, status: MetricStatus) {
+    return this.graphql.graphQLMutate(`
+      mutation updateMetric($uuid: ID!, $status: MetricStatus) {
+        updateMetric(uuid: $uuid, status: $status) {
+          success
+          message
+        }
+      }`,
+      {
+        uuid,
+        status
+      }
+    ).pipe(
+      map(response => response.data),
+    );
+  }
+
   saveMetric(variables: {
-    uuid: number;
+    uuid: string;
     name: string;
     description: string;
     isPublic: boolean;

src/app/shared/services/utils.service.ts

@@ -413,9 +413,6 @@ export class UtilsService {
       return new Delta().insert(plaintext);
     });
   }
-
-  XLSXFormat() {
-  }
 
   generateXLSX(data, header = null) {
     const worksheet: XLSX.WorkSheet = XLSX.utils.json_to_sheet(data, { header });