risadmin_prod/authsec_angularClarity_modern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

data lake

Browse Source
This commit is contained in:
Gaurav Kumar
2025-11-05 18:35:43 +05:30
parent 91af36866e
commit 874d5dfed2
4 changed files with 223 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.html
View File

@@ -142,35 +142,41 @@
<!-- who column -->
<clr-dg-cell>
<div style="display: flex; align-items: center; gap: 1px; flex-wrap: nowrap;">
<clr-signpost>
<span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success"
style="color: rgb(0, 130, 236);"></clr-icon></span>
<clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
<h5 style="margin-top: 0">Who Column</h5>
<div>Account ID: <code class="clr-code">{{user.accountId}}</code></div>
<div>Created At: <code class="clr-code">{{user.createdAt| date}}</code></div>
<div>Created By: <code class="clr-code">{{user.createdBy}}</code></div>
<div>Updated At: <code class="clr-code">{{user.updatedAt | date}}</code></div>
<div>Updated By: <code class="clr-code">{{user.updatedBy}}</code></div>
</clr-signpost-content>
</clr-signpost>
<clr-signpost>
<span style="cursor: pointer;" clrSignpostTrigger><clr-icon shape="help" class="success"
style="color: rgb(0, 130, 236);"></clr-icon></span>
<clr-signpost-content [clrPosition]="'left-middle'" *clrIfOpen>
<h5 style="margin-top: 0">Who Column</h5>
<div>Account ID: <code class="clr-code">{{user.accountId}}</code></div>
<div>Created At: <code class="clr-code">{{user.createdAt| date}}</code></div>
<div>Created By: <code class="clr-code">{{user.createdBy}}</code></div>
<div>Updated At: <code class="clr-code">{{user.updatedAt | date}}</code></div>
<div>Updated By: <code class="clr-code">{{user.updatedBy}}</code></div>
</clr-signpost-content>
</clr-signpost>
<!-- New JSON Update button -->
<button class="btn btn-icon btn-sm" (click)="updateJson(user.id)" title="Update JSON">
<clr-icon shape="refresh"></clr-icon>
</button>
<!-- New JSON Update button -->
<button class="btn btn-icon" (click)="updateJson(user.id)" title="Update JSON">
<clr-icon shape="refresh"></clr-icon>
</button>
<!-- Calculated Field button -->
<button class="btn btn-icon btn-sm" (click)="fetchAvailableKeys(user, false)" title="Create Calculated Field">
<clr-icon shape="calculator"></clr-icon>
</button>
<!-- Calculated Field button -->
<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 btn-sm" (click)="openGroupByModal(user)" title="Group By Configuration">
<clr-icon shape="group"></clr-icon>
</button>
</div>
<!-- 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)">
<clr-icon shape="code"></clr-icon>
</button>
</clr-dg-cell>
<!-- who colmn -->
@@ -964,4 +970,36 @@
</div>
</clr-modal>
<!-- Blending Keys Panel -->
<div class="blending-keys-panel" *ngIf="showBlendingKeys">
<div class="panel-header">
<h3>Blending Configuration</h3>
<button class="btn btn-icon" (click)="closeBlendingKeys()" title="Close">
<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">
<h4>Data Lake {{ keyData.lakeId }} - Table: {{ keyData.tableName }}</h4>
<div class="headers-container">
<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>
<div class="editor-actions">
<button class="btn btn-primary" (click)="updateSqlQuery()">Update SQL Query</button>
</div>
</div>
</div>
</div>
<!-- htmlpopup -->

77
frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.scss
View File

@@ -422,3 +422,80 @@
margin-bottom: 0;
cursor: pointer;
}
/* Blending Keys Panel Styles */
.blending-keys-panel {
position: fixed;
bottom: 0;
left: 0;
right: 0;
background-color: white;
border-top: 1px solid #ccc;
box-shadow: 0 -2px 4px rgba(0,0,0,0.1);
z-index: 1000;
max-height: 50vh;
overflow-y: auto;
}
.panel-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 15px;
border-bottom: 1px solid #eee;
background-color: #f5f5f5;
}
.panel-header h3 {
margin: 0;
color: #333;
}
.panel-content {
padding: 15px;
}
.keys-container {
margin-bottom: 20px;
padding: 10px;
border: 1px solid #eee;
border-radius: 4px;
background-color: #fafafa;
}
.keys-container h4 {
margin-top: 0;
color: #555;
}
.headers-container {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin-top: 10px;
}
.header-tag {
display: inline-block;
background-color: #e3f2fd;
border: 1px solid #bbdefb;
border-radius: 12px;
padding: 4px 10px;
font-size: 12px;
font-family: monospace;
}
.sql-editor-container {
margin-top: 20px;
}
.sql-textarea {
width: 100%;
font-family: 'Courier New', monospace;
font-size: 14px;
}
.editor-actions {
margin-top: 10px;
text-align: right;
}

75
frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.component.ts
View File

@@ -109,6 +109,12 @@ export class Data_lakeComponent implements OnInit {
selectedBlendingLakeIds: string[] = [];
editSelectedBlendingLakeIds: string[] = [];
// New properties for blending functionality
showBlendingKeys = false;
blendingKeysData: any[] = [];
sqlQueryText = '';
selectedBlendingItem: any = null;
constructor(
private extensionService: ExtensionService,
private userInfoService: UserInfoService,
@@ -1307,6 +1313,75 @@ export class Data_lakeComponent implements OnInit {
}
}
// Method to check if blending action should be available
canShowBlendingAction(item: any): boolean {
return item.datalake_type === 'blending' &&
item.blending_lakeids &&
item.blending_lakeids.trim() !== '';
}
// Method to fetch blending keys
fetchBlendingKeys(item: any) {
this.selectedBlendingItem = item;
this.blendingKeysData = [];
this.showBlendingKeys = true;
// Parse blending_lakeids string to array
const lakeIds = item.blending_lakeids.split(',').map(id => id.trim()).filter(id => id !== '');
// Fetch keys for each lake ID
lakeIds.forEach(lakeId => {
this.mainService.fetchBlendingKeys(Number(lakeId)).subscribe(
(data: any) => {
this.blendingKeysData.push({
lakeId: lakeId,
tableName: data.tableName,
headers: data.headers
});
},
(error) => {
console.error('Error fetching keys for lake ID:', lakeId, error);
this.toastr.error(`Failed to fetch keys for Data Lake ${lakeId}`);
}
);
});
}
// Method to update SQL query
updateSqlQuery() {
if (!this.selectedBlendingItem) {
this.toastr.error('No blending item selected');
return;
}
// Update the SQL query JSON field
this.selectedBlendingItem.sqlquery_json = this.sqlQueryText;
// Call update service
this.mainService.update(this.selectedBlendingItem.id, this.selectedBlendingItem).subscribe(
(response) => {
this.toastr.success('SQL query updated successfully');
// Update the local data
const index = this.product.findIndex(p => p.id === this.selectedBlendingItem.id);
if (index !== -1) {
this.product[index] = {...this.selectedBlendingItem};
}
},
(error) => {
console.error('Error updating SQL query:', error);
this.toastr.error('Failed to update SQL query');
}
);
}
// Method to close blending keys panel
closeBlendingKeys() {
this.showBlendingKeys = false;
this.blendingKeysData = [];
this.sqlQueryText = '';
this.selectedBlendingItem = null;
}
// Method to handle checkbox change for blending lakes (ADD form)
onBlendingLakeCheckboxChange(event: any, lakeId: number) {
const lakeIdStr = lakeId.toString();

6
frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.service.ts
View File

@@ -42,6 +42,12 @@ export class Data_lakeservice{
return this.apiRequest.get(apiUrl);
}
// Method to fetch blending keys for a specific lake ID
fetchBlendingKeys(lakeId: number): Observable<any> {
const _http = `${this.baseURL}/keys/${lakeId}`;
return this.apiRequest.get(_http);
}
// Method to update calculated fields for a data lake item
updateCalculatedFields(id: number, calculatedFieldJson: string, isCalculatedField: boolean): Observable<any> {
const _http = this.baseURL + "/" + id;