chart

frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/chart-config/dynamic-chart-loader.service.ts

@@ -22,7 +22,7 @@ export class DynamicChartLoaderService {
    */
   loadAllChartConfigurations(): Observable<any> {
     console.log('Loading all chart configurations dynamically');
-    
+
     // Load all chart types first
     return this.apiRequest.get(this.chartTypesUrl).pipe(
       map(chartTypes => {
@@ -43,7 +43,7 @@ export class DynamicChartLoaderService {
     dynamicFields: DynamicField[]
   }> {
     console.log(`Loading complete configuration for chart type ${chartTypeId}`);
-    
+
     // Load all related data in parallel
     return forkJoin({
       chartType: this.apiRequest.get(`${this.chartTypesUrl}/${chartTypeId}`),
@@ -89,17 +89,25 @@ export class DynamicChartLoaderService {
    * Get chart type by name
    * This is useful for finding a chart type by its name rather than ID
    */
-  getChartTypeByName(name: string): Observable<ChartType | null> {
+  // getChartTypeByName(name: string): Observable<ChartType | null> {
+  //   console.log(`Finding chart type by name: ${name}`);
+  //   return this.apiRequest.get(`${this.chartTypesUrl}/byname?chartName=${name}`).pipe(
+  //     map((chartTypes: ChartType[]) => {
+  //       console.log('Available chart types:', chartTypes);
+  //       const chartType = chartTypes.find(ct => ct.name === name);
+  //       console.log(`Found chart type for name ${name}:`, chartType);
+  //       return chartType || null;
+  //     })
+  //   );
+  // }
+
+  getChartTypeByName(name: string): Observable<any> {
     console.log(`Finding chart type by name: ${name}`);
-    return this.apiRequest.get(`${this.chartTypesUrl}`).pipe(
-      map((chartTypes: ChartType[]) => {
-        const chartType = chartTypes.find(ct => ct.name === name);
-        console.log(`Found chart type for name ${name}:`, chartType);
-        return chartType || null;
-      })
-    );
+    return this.apiRequest.get(`${this.chartTypesUrl}/byname?chartName=${name}`);
   }
 
+
+
   /**
    * Load all active chart types
    * This is used to populate the chart selection in the dashboard editor

frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.html

@@ -43,7 +43,7 @@
     </div> -->
 
     <!-- Line Chart -->
-    <div *ngIf="chartType === 'line'" class="chart-canvas-container">
+    <!-- <div *ngIf="chartType === 'line'" class="chart-canvas-container">
       <canvas baseChart
         [datasets]="chartData"
         [labels]="chartLabels"
@@ -53,10 +53,10 @@
         (chartClick)="chartClicked($event)"
         (chartHover)="chartHovered($event)">
       </canvas>
-    </div>
+    </div> -->
 
     <!-- Pie Chart -->
-    <div *ngIf="chartType === 'pie'" class="chart-canvas-container">
+    <!-- <div *ngIf="chartType === 'pie'" class="chart-canvas-container">
       <canvas baseChart
         [datasets]="chartData"
         [labels]="chartLabels"
@@ -66,10 +66,10 @@
         (chartClick)="chartClicked($event)"
         (chartHover)="chartHovered($event)">
       </canvas>
-    </div>
+    </div> -->
 
     <!-- Doughnut Chart -->
-    <div *ngIf="chartType === 'doughnut'" class="chart-canvas-container">
+    <!-- <div *ngIf="chartType === 'doughnut'" class="chart-canvas-container">
       <canvas baseChart
         [datasets]="chartData"
         [labels]="chartLabels"
@@ -79,10 +79,10 @@
         (chartClick)="chartClicked($event)"
         (chartHover)="chartHovered($event)">
       </canvas>
-    </div>
+    </div> -->
 
     <!-- Bubble Chart -->
-    <div *ngIf="chartType === 'bubble'" class="chart-canvas-container">
+    <!-- <div *ngIf="chartType === 'bubble'" class="chart-canvas-container">
       <canvas baseChart
         [datasets]="bubbleChartData"
         [options]="chartOptions"
@@ -91,10 +91,10 @@
         (chartClick)="chartClicked($event)"
         (chartHover)="chartHovered($event)">
       </canvas>
-    </div>
+    </div> -->
 
     <!-- Radar Chart -->
-    <div *ngIf="chartType === 'radar'" class="chart-canvas-container">
+    <!-- <div *ngIf="chartType === 'radar'" class="chart-canvas-container">
       <canvas baseChart
         [datasets]="chartData"
         [labels]="chartLabels"
@@ -104,10 +104,10 @@
         (chartClick)="chartClicked($event)"
         (chartHover)="chartHovered($event)">
       </canvas>
-    </div>
+    </div> -->
 
     <!-- Polar Area Chart -->
-    <div *ngIf="chartType === 'polar'" class="chart-canvas-container">
+    <!-- <div *ngIf="chartType === 'polar'" class="chart-canvas-container">
       <canvas baseChart
         [datasets]="chartData"
         [labels]="chartLabels"
@@ -117,10 +117,10 @@
         (chartClick)="chartClicked($event)"
         (chartHover)="chartHovered($event)">
       </canvas>
-    </div>
+    </div> -->
 
     <!-- Scatter Chart -->
-    <div *ngIf="chartType === 'scatter'" class="chart-canvas-container">
+    <!-- <div *ngIf="chartType === 'scatter'" class="chart-canvas-container">
       <canvas baseChart
         [datasets]="chartData"
         [options]="chartOptions"
@@ -129,7 +129,7 @@
         (chartClick)="chartClicked($event)"
         (chartHover)="chartHovered($event)">
       </canvas>
-    </div>
+    </div> -->
 
     <!-- Default/Unknown Chart Type -->
     <div *ngIf="!['bar', 'line', 'pie', 'doughnut', 'bubble', 'radar', 'polar', 'scatter'].includes(chartType)" class="chart-canvas-container">