diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 7.zip b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 7.zip
new file mode 100644
index 0000000..64ab11b
Binary files /dev/null and b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 7.zip differ
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 8_not working properly.zip b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 8_not working properly.zip
new file mode 100644
index 0000000..a9930cb
Binary files /dev/null and b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 8_not working properly.zip differ
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 8_working chart with different type without dynamic.zip b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 8_working chart with different type without dynamic.zip
new file mode 100644
index 0000000..35d4834
Binary files /dev/null and b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew 8_working chart with different type without dynamic.zip differ
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.html b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.html
index 2ee46d8..077d627 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.html
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.html
@@ -174,47 +174,37 @@
             <button class="btn btn-icon" (click)="fetchAvailableKeys(user)" title="Create Calculated Field">
               <clr-icon shape="calculator"></clr-icon>
             </button>
-          
+
             <!-- Group By button -->
             <button class="btn btn-icon" (click)="openGroupByModal(user)" title="Group By Configuration">
               <clr-icon shape="group"></clr-icon>
             </button>
-          
+
             <!-- Blending Keys button (only shown for blending type with non-empty blending_lakeids) -->
-            <button class="btn btn-icon" 
-                  (click)="fetchBlendingKeys(user)" 
-                  title="Configure Blending Query"
-                  *ngIf="canShowBlendingAction(user)">
+            <button class="btn btn-icon" (click)="fetchBlendingKeys(user)" title="Configure Blending Query"
+              *ngIf="canShowBlendingAction(user)">
               <clr-icon shape="code"></clr-icon>
             </button>
-          
+
             <!-- Field Mapping button -->
-            <button class="btn btn-icon" 
-                  (click)="openFieldMappingModal(user)" 
-                  title="Field Mapping"
-                  *ngIf="user.url && user.sure_connect_id">
+            <button class="btn btn-icon" (click)="openFieldMappingModal(user)" title="Field Mapping"
+              *ngIf="user.url && user.sure_connect_id">
               <clr-icon shape="map"></clr-icon>
             </button>
-          
+
             <!-- Scheduler button -->
-            <button class="btn btn-icon" 
-                  (click)="openSchedulerModal(user)" 
-                  title="Scheduler">
+            <button class="btn btn-icon" (click)="openSchedulerModal(user)" title="Scheduler">
               <clr-icon shape="clock"></clr-icon>
             </button>
-            
+
             <!-- Webhook toggle button -->
-            <button class="btn btn-icon" 
-                  (click)="toggleWebhook(user)" 
-                  title="Toggle Webhook">
+            <button class="btn btn-icon" (click)="toggleWebhook(user)" title="Toggle Webhook">
               <clr-icon shape="network-globe"></clr-icon>
             </button>
-            
+
             <!-- Copy Webhook URL button -->
-            <button class="btn btn-icon" 
-                  (click)="copyWebhookUrl(user.webhook_url)" 
-                  title="Copy Webhook URL"
-                  *ngIf="user.webhook_url && user.webhook_url.trim() !== ''">
+            <button class="btn btn-icon" (click)="copyWebhookUrl(user.webhook_url)" title="Copy Webhook URL"
+              *ngIf="user.webhook_url && user.webhook_url.trim() !== ''">
               <clr-icon shape="copy-to-clipboard"></clr-icon>
             </button>
           </clr-dg-cell>
@@ -455,16 +445,16 @@
             instanceId="edit-form-{{rowSelected.id}}"></app-cron-job-builder>
         </div>
 
-        <div class="clr-col-sm-12">
+        <!-- <div class="clr-col-sm-12">
           <label> json</label>
           <input id="name" type="Text" class="form-control" style="border: none; outline: none; height:33px !important;"
             [(ngModel)]="rowSelected.json" name=" json " />
         </div>
 
         <div class="clr-col-sm-12">
-          <label>Url</label>
+          <label>Url Endpoint</label>
           <input class="clr-input" type="text" [(ngModel)]="rowSelected.url_endpoint" name="url_endpoint" />
-        </div>
+        </div> -->
 
         <div class="clr-col-sm-12">
           <label>Batch Volume</label>
@@ -493,9 +483,7 @@
           <label>Blending Data Lakes</label>
           <div class="checkbox-container">
             <div *ngFor="let dataLake of dataLakeList" class="checkbox-item">
-              <input 
-                type="checkbox" 
-                [value]="dataLake.id" 
+              <input type="checkbox" [value]="dataLake.id"
                 (change)="onEditBlendingLakeCheckboxChange($event, dataLake.id)"
                 [checked]="isEditBlendingLakeSelected(dataLake.id)">
               <label>{{ dataLake.name }}</label>
@@ -608,16 +596,16 @@
             (cronExpressionChange)="onAddCronExpressionChange($event)" instanceId="add-form"></app-cron-job-builder>
         </div>
 
-        <div class="clr-col-sm-12">
+        <!-- <div class="clr-col-sm-12">
           <label>json</label>
           <input class="form-control" type="Text" formControlName="json"
             style="border: none; outline: none; height:33px !important;" />
-        </div>
+        </div> -->
 
-        <div class="clr-col-sm-12">
+        <!-- <div class="clr-col-sm-12">
           <label> Url Endpoint</label>
           <input class="clr-input" type="text" formControlName="url_endpoint" />
-        </div>
+        </div> -->
 
         <div class="clr-col-sm-12">
           <label> Batch Volume</label>
@@ -646,10 +634,7 @@
           <label>Blending Data Lakes</label>
           <div class="checkbox-container">
             <div *ngFor="let dataLake of dataLakeList" class="checkbox-item">
-              <input 
-                type="checkbox" 
-                [value]="dataLake.id" 
-                (change)="onBlendingLakeCheckboxChange($event, dataLake.id)"
+              <input type="checkbox" [value]="dataLake.id" (change)="onBlendingLakeCheckboxChange($event, dataLake.id)"
                 [checked]="isBlendingLakeSelected(dataLake.id)">
               <label>{{ dataLake.name }}</label>
             </div>
@@ -1018,7 +1003,7 @@
       <clr-icon shape="close"></clr-icon>
     </button>
   </div>
-  
+
   <div class="panel-content">
     <!-- Display keys for each blending lake -->
     <div class="keys-container" *ngFor="let keyData of blendingKeysData">
@@ -1027,14 +1012,12 @@
         <span class="header-tag" *ngFor="let header of keyData.headers">{{ header }}</span>
       </div>
     </div>
-    
+
     <!-- SQL Query Editor -->
     <div class="sql-editor-container">
       <h4>SQL Query Builder</h4>
-      <textarea class="clr-textarea sql-textarea" 
-                [(ngModel)]="sqlQueryText" 
-                placeholder="Enter your SQL query here using the available headers..."
-                rows="6"></textarea>
+      <textarea class="clr-textarea sql-textarea" [(ngModel)]="sqlQueryText"
+        placeholder="Enter your SQL query here using the available headers..." rows="6"></textarea>
       <div class="editor-actions">
         <button class="btn btn-primary" (click)="updateSqlQuery()">Update SQL Query</button>
       </div>
@@ -1059,15 +1042,14 @@
               <h5>Data Lake {{ keyData.lakeId }} - Table: {{ keyData.tableName }}</h5>
             </div>
             <div class="headers-container">
-              <span class="header-tag" *ngFor="let header of keyData.headers" 
-                    (click)="insertHeaderIntoQuery(header)">
+              <span class="header-tag" *ngFor="let header of keyData.headers" (click)="insertHeaderIntoQuery(header)">
                 {{ header }}
               </span>
             </div>
           </div>
         </div>
       </div>
-      
+
       <!-- SQL Query Editor -->
       <div class="sql-editor-section">
         <h4 class="section-title">
@@ -1075,12 +1057,12 @@
           SQL Query Builder
         </h4>
         <div class="sql-editor-container">
-          <textarea class="clr-textarea sql-textarea" 
-                    [(ngModel)]="sqlQueryText" 
-                    placeholder="Enter your SQL query here using the available headers. Click on header names above to insert them into your query."
-                    rows="8"></textarea>
+          <textarea class="clr-textarea sql-textarea" [(ngModel)]="sqlQueryText"
+            placeholder="Enter your SQL query here using the available headers. Click on header names above to insert them into your query."
+            rows="8"></textarea>
           <div class="editor-hint">
-            <small class="clr-subtext">Tip: Click on header names above to automatically insert them into your query</small>
+            <small class="clr-subtext">Tip: Click on header names above to automatically insert them into your
+              query</small>
           </div>
         </div>
       </div>
@@ -1100,7 +1082,7 @@
       <div class="instructions">
         <p>Map original field names to new names. Leave mapping blank to exclude field from mapping.</p>
       </div>
-      
+
       <div class="mapping-table-container" *ngIf="fieldMappingData && fieldMappingData.length > 0">
         <table class="table mapping-table">
           <thead>
@@ -1115,17 +1097,14 @@
                 <span class="field-tag">{{ field.original }}</span>
               </td>
               <td>
-                <input type="text" 
-                       class="clr-input mapping-input" 
-                       [(ngModel)]="field.mapped" 
-                       placeholder="Enter new field name"
-                       (ngModelChange)="updateFieldMapping(i, $event)">
+                <input type="text" class="clr-input mapping-input" [(ngModel)]="field.mapped"
+                  placeholder="Enter new field name" (ngModelChange)="updateFieldMapping(i, $event)">
               </td>
             </tr>
           </tbody>
         </table>
       </div>
-      
+
       <div class="no-data-message" *ngIf="fieldMappingData && fieldMappingData.length === 0">
         <p>No fields available for mapping. Please check the data source configuration.</p>
       </div>
@@ -1133,7 +1112,8 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline" (click)="closeFieldMappingModal()">Cancel</button>
-    <button type="button" class="btn btn-primary" (click)="updateFieldMappings()" [disabled]="!fieldMappingData || fieldMappingData.length === 0">Update Field Mappings</button>
+    <button type="button" class="btn btn-primary" (click)="updateFieldMappings()"
+      [disabled]="!fieldMappingData || fieldMappingData.length === 0">Update Field Mappings</button>
   </div>
 </clr-modal>
 
@@ -1145,7 +1125,7 @@
       <div class="data-lake-info">
         <h4>Data Lake: {{ selectedSchedulerItem?.name }}</h4>
       </div>
-      
+
       <!-- Job Information -->
       <div class="job-info-section" *ngIf="schedulerJob">
         <div class="job-header">
@@ -1154,7 +1134,7 @@
             {{ schedulerJob.status }}
           </span>
         </div>
-        
+
         <div class="job-details">
           <div class="detail-row">
             <label>Job Name:</label>
@@ -1169,7 +1149,7 @@
             <span>{{ schedulerJob.description }}</span>
           </div>
         </div>
-        
+
         <!-- Job Actions -->
         <div class="job-actions">
           <button class="btn btn-warning" (click)="pauseJob()" *ngIf="schedulerJob.status === 'RUNNING'">
@@ -1186,14 +1166,14 @@
           </button>
         </div>
       </div>
-      
+
       <!-- No Job Found -->
       <div class="no-job-section" *ngIf="schedulerJob === null">
         <div class="no-job-message">
           <p>No scheduled job found for this Data Lake.</p>
           <p>Would you like to create a new job?</p>
         </div>
-        
+
         <div class="create-job-actions">
           <button class="btn btn-primary" (click)="createJob()">
             <clr-icon shape="plus"></clr-icon> Create Job
@@ -1206,4 +1186,4 @@
     <button type="button" class="btn btn-outline" (click)="closeSchedulerModal()">Close</button>
   </div>
 
-</clr-modal>
+</clr-modal>
\ No newline at end of file
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.ts
index fb4b684..6ee1a95 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.ts
@@ -171,6 +171,12 @@ export class Data_lakeComponent implements OnInit {
       webhook_url: [null] // Add webhook_url field
     });
     
+    // Set default SureConnect value after form initialization if list is already loaded
+    if (this.sureConnectList && this.sureConnectList.length > 0) {
+      const defaultSureConnectId = this.sureConnectList[0].id;
+      this.entryForm.get('sure_connect_id')?.setValue(defaultSureConnectId);
+    }
+    
     // form code start
     this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => {
       console.log(data);
@@ -262,6 +268,20 @@ export class Data_lakeComponent implements OnInit {
     this.sureConnectService.getAll().subscribe((data: any[]) => {
       this.sureConnectList = data;
       console.log('SureConnect List:', this.sureConnectList);
+      
+      // Set default SureConnect value if list is not empty
+      if (this.sureConnectList && this.sureConnectList.length > 0) {
+        // Set the first SureConnect item as default
+        const defaultSureConnectId = this.sureConnectList[0].id;
+        
+        // Set default for ADD form if it exists
+        if (this.entryForm && this.entryForm.get('sure_connect_id')) {
+          // Only set default if no value is already selected
+          if (!this.entryForm.get('sure_connect_id')?.value) {
+            this.entryForm.get('sure_connect_id')?.setValue(defaultSureConnectId);
+          }
+        }
+      }
     }, (error) => {
       console.log('Error fetching SureConnect list:', error);
     });
@@ -716,6 +736,12 @@ export class Data_lakeComponent implements OnInit {
     // Set the selected SureConnect for edit form
     this.selectedSureConnect = row.sure_connect_id || null;
     
+    // If no SureConnect is selected, set the first one as default
+    if (!this.rowSelected.sure_connect_id && this.sureConnectList && this.sureConnectList.length > 0) {
+      this.rowSelected.sure_connect_id = this.sureConnectList[0].id;
+      this.selectedSureConnect = this.sureConnectList[0].id;
+    }
+    
     // Initialize blending lake IDs for edit form from string
     if (row.blending_lakeids && typeof row.blending_lakeids === 'string') {
       this.editSelectedBlendingLakeIds = row.blending_lakeids.split(',').filter(id => id.trim() !== '');
@@ -889,6 +915,17 @@ export class Data_lakeComponent implements OnInit {
       }
       // Reset blending_lakeids to empty string
       this.entryForm.get('blending_lakeids')?.setValue('');
+      
+      // Set default SureConnect value if available
+      if (this.sureConnectList && this.sureConnectList.length > 0) {
+        const defaultSureConnectId = this.sureConnectList[0].id;
+        // Only set default if no value is already selected
+        if (!this.entryForm.get('sure_connect_id')?.value) {
+          this.entryForm.get('sure_connect_id')?.setValue(defaultSureConnectId);
+        }
+      } else {
+        this.entryForm.get('sure_connect_id')?.setValue('');
+      }
     }
     this.modalAdd = true;
   }
diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.ts
index 2fa3647..8552245 100644
--- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.ts
+++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/gadgets/unified-chart/unified-chart.component.ts
@@ -546,7 +546,7 @@ export class UnifiedChartComponent implements OnInit, OnChanges, OnDestroy {
   // Check if filters are available
   hasFilters(): boolean {
     const hasBaseFilters = this.baseFilters && this.baseFilters.length > 0;
-    console.log('Checking for filters - baseFilters:', this.baseFilters, 'hasBaseFilters:', hasBaseFilters);
+    // console.log('Checking for filters - baseFilters:', this.baseFilters, 'hasBaseFilters:', hasBaseFilters);
     return hasBaseFilters;
   }