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 b46cb22..c3f51ad 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 @@ -54,6 +54,9 @@ SureConnect + + Calculated Fields + @@ -82,8 +85,9 @@
- + {{user.url | slice:0:30}}{{user.url.length > 30 ? '...' : ''}} + + + @@ -256,7 +268,8 @@ [style.color]="item.conditionValue == app[transform(item.fieldtext) ] ? item.conditiontextcolor : item.textcolor"> File Preview
+ [style.height]="item.imagewidth !== '' ? item.imagewidth + 'px' : '100px'"> + @@ -292,17 +305,6 @@

Update Data lake - - - - - - - - - - -

{{rowSelected.id}}

@@ -329,7 +331,9 @@
- +
@@ -347,28 +351,17 @@
- +
- - +
- - - - - - - - - - - -

Extension

@@ -405,6 +398,9 @@
+ + +

Are You Sure Want to delete?

@@ -415,21 +411,11 @@
+

Add Data lake - - - - - - - - - - -         - +
@@ -484,12 +471,13 @@
- +
- - +
@@ -528,6 +516,116 @@ + + +

Create Calculated Field

+
+
+
+
+

Available Keys from API:

+
    +
  • {{ key }}
    • +
+
+ +
+ + +
+ +
+ + +
+ + +
+ +
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+
+
+
+ +
+
+

Created Calculated Fields:

+ + + + + + + + + + + + + + + + + +
Field NameOperationFields/ValuesActions
{{ field.fieldName }}{{ field.operation }} + + {{ component.field }} + "{{ component.constant }}" + "{{ component.constant }}" + {{ getOperationSymbol(field.operation) }} + + + +
+
+
+
+
+ + + +
+ + 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 f1a3ddf..0e80eb8 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 @@ -8,6 +8,8 @@ import { DashboardContentModel2 } from 'src/app/models/builder/dashboard'; import { Data_lakecardvariable } from './Data_lake_cardvariable'; import { UserInfoService } from 'src/app/services/user-info.service'; import { SureconnectService } from '../sureconnect/sureconnect.service'; +import { HttpClient } from '@angular/common/http'; +import { ApiRequestService } from 'src/app/services/api/api-request.service'; declare var JsBarcode: any; @Component({ selector: 'app-Data_lake', @@ -60,6 +62,14 @@ export class Data_lakeComponent implements OnInit { sureConnectList; selectedSureConnect: any = null; + // Calculated field properties + calculatedFieldModalOpen = false; + availableKeys: string[] = []; + selectedDataLakeItem: any = null; + calculatedFieldForm: FormGroup; + calculatedFields: any[] = []; + constantCounter = 1; // Persistent counter for unique constant names + constructor( private extensionService: ExtensionService, private userInfoService: UserInfoService, @@ -67,7 +77,9 @@ export class Data_lakeComponent implements OnInit { private alertService: AlertService, private toastr: ToastrService, private _fb: FormBuilder, - private sureConnectService: SureconnectService + private sureConnectService: SureconnectService, + private http: HttpClient, + private apiRequest: ApiRequestService ) { } private editInterval: any; // component button @@ -120,15 +132,37 @@ export class Data_lakeComponent implements OnInit { console.log(this.entryForm.value); // form code end - - - - - - - - - + // Initialize calculated field form with FormArray for multiple fields + this.calculatedFieldForm = this._fb.group({ + fieldName: [''], + operation: [''], + fieldComponents: this._fb.array([this.createFieldComponent()]) + }); + } + + // Helper method to create a field component group + createFieldComponent(): FormGroup { + return this._fb.group({ + field: [''], + constant: [''] + }); + } + + // Getter for field components FormArray + getFieldComponents(): FormArray { + return this.calculatedFieldForm.get('fieldComponents') as FormArray; + } + + // Method to add a new field component + addFieldComponent(): void { + this.getFieldComponents().push(this.createFieldComponent()); + } + + // Method to remove a field component + removeFieldComponent(index: number): void { + if (this.getFieldComponents().length > 1) { + this.getFieldComponents().removeAt(index); + } } ngOnDestroy(): void { if (this.editInterval) { @@ -138,15 +172,6 @@ export class Data_lakeComponent implements OnInit { - - - - - - - - - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -165,7 +190,7 @@ export class Data_lakeComponent implements OnInit { // Fetch SureConnect list getSureConnectList() { - this.sureConnectService.getAll().subscribe((data) => { + this.sureConnectService.getAll().subscribe((data: any[]) => { this.sureConnectList = data; console.log('SureConnect List:', this.sureConnectList); }, (error) => { @@ -173,14 +198,144 @@ export class Data_lakeComponent implements OnInit { }); } - // Get SureConnect name by ID for display in grid - getSureConnectNameById(id: number): string { - if (!id || !this.sureConnectList || this.sureConnectList.length === 0) { - return ''; + // Get operation symbol for display + getOperationSymbol(operation: string): string { + switch(operation) { + case 'add': return '+'; + case 'subtract': return '-'; + case 'multiply': return '*'; + case 'divide': return '/'; + case 'percentage': return '%'; + case 'concat': return '||'; // Concatenation symbol + default: return ''; + } + } + + // Fetch available keys from API + fetchAvailableKeys(dataLakeItem: any) { + if (!dataLakeItem.url || !dataLakeItem.sure_connect_id) { + this.toastr.error('URL and SureConnect ID are required to fetch keys'); + return; + } + + this.selectedDataLakeItem = dataLakeItem; + + // Call the service method to get all keys + this.mainService.fetchAvailableKeys(dataLakeItem.url, dataLakeItem.sure_connect_id).subscribe( + (keys: string[]) => { + this.availableKeys = keys; + // Reset the calculated field form to ensure it starts fresh + this.resetCalculatedFieldForm(); + this.calculatedFieldModalOpen = true; + console.log('Available keys:', keys); + }, + (error) => { + console.error('Error fetching keys:', error); + this.toastr.error('Failed to fetch available keys from API'); + } + ); + } + + // Reset the calculated field form to initial state + resetCalculatedFieldForm(): void { + this.calculatedFieldForm.reset({ + fieldName: '', + operation: '', + fieldComponents: [{}] // Start with one empty field component + }); + + // Ensure we have exactly one empty field component + const fieldComponents = this.getFieldComponents(); + fieldComponents.clear(); + fieldComponents.push(this.createFieldComponent()); + + // Reset the constant counter for new calculations + this.constantCounter = 1; + } + + // Add calculated field + addCalculatedField() { + const formData = this.calculatedFieldForm.value; + + if (!formData.fieldName || !formData.operation) { + this.toastr.error('Field name and operation are required'); + return; } - const sureConnect = this.sureConnectList.find(item => item.id === id); - return sureConnect ? sureConnect.name : ''; + // Filter out empty field components + const validFieldComponents = formData.fieldComponents.filter(component => + component.field || component.constant + ); + + if (validFieldComponents.length === 0) { + this.toastr.error('At least one field or constant is required'); + return; + } + + // Validate constant values - must be numeric for all operations except concatenation + if (formData.operation !== 'concat') { + for (const component of validFieldComponents) { + if (component.constant && component.constant.trim() !== '') { + const numericValue = Number(component.constant); + if (isNaN(numericValue)) { + this.toastr.error('Constant values must be numeric for this operation'); + return; + } + } + } + } + + // Validate that constant values are unique within this calculated field + const constantValues = validFieldComponents + .map(component => component.constant) + .filter(constant => constant && constant.trim() !== ''); + + if (constantValues.length !== new Set(constantValues).size) { + this.toastr.error('Constant values must be unique within a calculated field'); + return; + } + + // Generate unique names for constants using the persistent counter + const processedFieldComponents = validFieldComponents.map(component => { + if (component.constant && component.constant.trim() !== '') { + // Generate a unique name for the constant using the persistent counter + const constantName = `constant_${this.constantCounter++}`; + return { + field: constantName, + constant: component.constant, + isConstant: true // Flag to indicate this is a constant with a generated name + }; + } + return { + field: component.field, + constant: component.constant, + isConstant: false // Flag to indicate this is a regular field + }; + }); + + // Create calculated field object with multiple field components + const calculatedField = { + id: Date.now(), // Simple ID generation + fieldName: formData.fieldName, + operation: formData.operation, + fieldComponents: processedFieldComponents + }; + + this.calculatedFields.push(calculatedField); + this.toastr.success('Calculated field added successfully'); + + // Reset form but keep one empty field component + this.calculatedFieldForm.reset({ + fieldName: '', + operation: '', + fieldComponents: [{}] + }); + } + + // Delete calculated field + deleteCalculatedField(id: number) { + this.calculatedFields = this.calculatedFields.filter(field => field.id !== id); + this.toastr.success('Calculated field deleted'); } onEdit(row) { @@ -210,17 +365,6 @@ export class Data_lakeComponent implements OnInit { onUpdate(id) { this.modalEdit = false; - - - - - - - - - - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -237,15 +381,6 @@ export class Data_lakeComponent implements OnInit { - - - - - - - - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -323,36 +458,11 @@ export class Data_lakeComponent implements OnInit { } } - // Handle SureConnect selection change in add form - onAddSureConnectChange(event: any) { - const selectedId = event.target.value; - if (this.entryForm && this.entryForm.get('sure_connect_id')) { - this.entryForm.get('sure_connect_id')?.setValue(selectedId); - } - } - - // Handle SureConnect selection change in edit form - onEditSureConnectChange(event: any) { - const selectedId = event.target.value; - if (this.rowSelected) { - this.rowSelected.sure_connect_id = selectedId; - } - } onCreate() { this.modalAdd = false; - - - - - - - - - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -365,15 +475,6 @@ export class Data_lakeComponent implements OnInit { - - - - - - - - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -400,9 +501,7 @@ export class Data_lakeComponent implements OnInit { if (this.entryForm.get('cron_job')) { this.entryForm.get('cron_job')?.setValue(''); } - if (this.entryForm.get('sure_connect_id')) { - this.entryForm.get('sure_connect_id')?.setValue(null); - } + } } submitted = false; @@ -422,16 +521,45 @@ export class Data_lakeComponent implements OnInit { goTourlUrl(val) { window.open(val) } - - - - rsModaljson = false; goToReplaceStringjson(row) { this.rowSelected = row; this.rsModaljson = true; } - - - // updateaction -} \ No newline at end of file + // Generate JSON from calculated fields and update the record + updateCalculatedFields() { + if (!this.selectedDataLakeItem || this.calculatedFields.length === 0) { + this.toastr.error('No calculated fields to update'); + return; + } + + // Convert calculated fields to JSON string + const calculatedFieldJson = JSON.stringify(this.calculatedFields); + + // Call the service method to update the record + this.mainService.updateCalculatedFields( + this.selectedDataLakeItem.id, + calculatedFieldJson, + true // iscalculatedfield = true + ).subscribe( + (response) => { + console.log('Calculated fields updated successfully:', response); + this.toastr.success('Calculated fields updated successfully'); + + // Update the local data + const index = this.product.findIndex(item => item.id === this.selectedDataLakeItem.id); + if (index !== -1) { + this.product[index].calculated_field_json = calculatedFieldJson; + this.product[index].iscalculatedfield = true; + } + + // Close the modal + this.calculatedFieldModalOpen = false; + }, + (error) => { + console.error('Error updating calculated fields:', error); + this.toastr.error('Failed to update calculated fields'); + } + ); + } +} diff --git a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.service.ts b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.service.ts index a191ee9..5312cf8 100644 --- a/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.service.ts +++ b/frontend/angular-clarity-master/src/app/modules/main/builder/dashboardnew/Data_lake/Data_lake.service.ts @@ -35,6 +35,21 @@ export class Data_lakeservice{ const _http = this.baseURL + "/json/" + id; return this.apiRequest.put(_http, {}); } + + // Method to fetch available keys from API + fetchAvailableKeys(url: string, sureId: number): Observable { + const apiUrl = `chart/getAllKeys?apiUrl=${encodeURIComponent(url)}&sureId=${sureId}`; + return this.apiRequest.get(apiUrl); + } + // Method to update calculated fields for a data lake item + updateCalculatedFields(id: number, calculatedFieldJson: string, isCalculatedField: boolean): Observable { + const _http = this.baseURL + "/" + id; + const data = { + calculated_field_json: calculatedFieldJson, + iscalculatedfield: isCalculatedField + }; + return this.apiRequest.put(_http, data); + } // updateaction } \ No newline at end of file