From 765cfcb304b81eab359f7772efdca7b2575f2662 Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Mon, 8 Apr 2024 19:38:50 -0500 Subject: [PATCH 1/2] updated script creation --- .../df-script-details.component.html | 86 ++++++++++++------- .../df-script-details.component.ts | 50 +++++------ .../df-script-editor.component.ts | 2 +- src/assets/i18n/scripts/en.json | 4 + 4 files changed, 83 insertions(+), 59 deletions(-) diff --git a/src/app/adf-event-scripts/df-script-details/df-script-details.component.html b/src/app/adf-event-scripts/df-script-details/df-script-details.component.html index d7e58487..f37696b6 100644 --- a/src/app/adf-event-scripts/df-script-details/df-script-details.component.html +++ b/src/app/adf-event-scripts/df-script-details/df-script-details.component.html @@ -1,25 +1,26 @@
- - {{ 'service' | transloco }} - - - {{ service }} - - - - - {{ 'scripts.scriptName' | transloco }} - - - {{ item }} - - - - + - - - {{ 'scripts.scriptName' | transloco }} - - - {{ item }} - - - - + + + + {{ 'scripts.tableName' | transloco }} + + + {{ item }} + + + + + + + {{ 'scripts.scriptName' | transloco }} + + + + + + + {{ 'scripts.tableName' | transloco }} + + + {{ 'scriptType' | transloco }} diff --git a/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts b/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts index a55fabe8..6a940c46 100644 --- a/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts +++ b/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts @@ -65,11 +65,14 @@ export class DfScriptDetailsComponent implements OnInit { ungroupedEventItems: string[]; ungroupedEventOptions: ScriptEvent; ungroupedRouteOptions: string[]; + tableOptions: string[]; storeServiceArray: string[]; selectedStorageItem: string; selectedServiceItem: string; selectedEventItem: string; selectedRouteItem: string; + selectTable: string; + completeScriptName: string; loaded = false; constructor( private activatedRoute: ActivatedRoute, @@ -88,20 +91,6 @@ export class DfScriptDetailsComponent implements OnInit { storagePath: [''], isActive: [false], }); - // this.baseService - // .getAll<{ - // serviceTypes: Array; - // services: Array; - // }>({ - // additionalParams: [ - // { - // key: 'group', - // value: - // 'Database, Big Data, Script, Remote Service, File, Excel, Cache, Email, Notification, Log, Source Control, IoT, LDAP, SSO, OAuth, user, system', - // }, - // ], - // }) - // .subscribe(); } storageServices: Service; @@ -112,6 +101,7 @@ export class DfScriptDetailsComponent implements OnInit { this.scriptDetails = data; this.scriptForm.patchValue(data); this.scriptForm.controls['name'].disable(); + this.selectedServiceItem = data.name; } else { this.scriptEvents = groupEvents(data); this.unGroupedEvents = data; @@ -125,18 +115,6 @@ export class DfScriptDetailsComponent implements OnInit { startWith(''), map(value => this.filterGroup(value)) ); - // this.scriptForm.controls['storageServiceId'].valueChanges.subscribe(res => { - // let serviceType = res.name; - // if (res.name === 'api_docs') { - // serviceType = 'apiDocs'; - // this.ungroupedEventOptions = this.unGroupedEvents[serviceType]; - // } - - // this.ungroupedEventOptions = this.unGroupedEvents[serviceType]; - // Object.keys(this.ungroupedEventOptions).forEach(key => { - // this.ungroupedEventItems.push(key); - // }); - // }); this.loaded = true; } @@ -163,7 +141,7 @@ export class DfScriptDetailsComponent implements OnInit { script.storageServiceId?.type === 'local_file' ? script.storagePath : null, - name: this.selectedRouteItem, + name: this.completeScriptName, }; if (this.type === 'edit') { this.scriptDetails = { ...this.scriptDetails, ...scriptItem }; @@ -193,6 +171,9 @@ export class DfScriptDetailsComponent implements OnInit { } selectedServiceItemEvent() { + this.ungroupedEventItems = []; + this.ungroupedRouteOptions = []; + this.selectedRouteItem = ''; let serviceType: string = this.selectedServiceItem; if (serviceType === 'api_docs') { serviceType = 'apiDocs'; @@ -205,8 +186,23 @@ export class DfScriptDetailsComponent implements OnInit { } selectedEventItemEvent() { + this.tableOptions = []; this.ungroupedRouteOptions = [ ...this.ungroupedEventOptions[this.selectedEventItem].endpoints, ]; + + if (this.ungroupedEventOptions[this.selectedEventItem].parameter) { + this.tableOptions = [ + ...this.ungroupedEventOptions[this.selectedEventItem].parameter + .tableName, + ]; + } + } + + selectedTable() { + this.completeScriptName = this.selectedRouteItem.replace( + '{table_name}', + this.selectTable + ); } } diff --git a/src/app/shared/components/df-script-editor/df-script-editor.component.ts b/src/app/shared/components/df-script-editor/df-script-editor.component.ts index 3003a4c1..e7ac87f8 100644 --- a/src/app/shared/components/df-script-editor/df-script-editor.component.ts +++ b/src/app/shared/components/df-script-editor/df-script-editor.component.ts @@ -61,7 +61,7 @@ export class DfScriptEditorComponent implements OnInit { additionalParams: [ { key: 'group', - value: 'source control,file,database, email,notification,log,iot', + value: 'source control,file', }, ], }) diff --git a/src/assets/i18n/scripts/en.json b/src/assets/i18n/scripts/en.json index 01d7836b..31f44c40 100644 --- a/src/assets/i18n/scripts/en.json +++ b/src/assets/i18n/scripts/en.json @@ -1,5 +1,9 @@ { "scriptName": "Script Name", + "scriptMethod": "Script Method", + "scriptType": "Script Type", + "scriptLocation": "Script Location", + "tableName": "Table Name", "active": "Active", "importScriptFile": "Import a script file", "fromDesktop": "From Desktop", From 592afdeb817d410ad381048a53b3b5c60aa9a600 Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Mon, 8 Apr 2024 19:41:34 -0500 Subject: [PATCH 2/2] cleanup --- .../df-script-details/df-script-details.component.html | 2 +- .../df-script-details/df-script-details.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/adf-event-scripts/df-script-details/df-script-details.component.html b/src/app/adf-event-scripts/df-script-details/df-script-details.component.html index f37696b6..9e1d6dcd 100644 --- a/src/app/adf-event-scripts/df-script-details/df-script-details.component.html +++ b/src/app/adf-event-scripts/df-script-details/df-script-details.component.html @@ -68,7 +68,7 @@ {{ 'scripts.tableName' | transloco }} - + diff --git a/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts b/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts index 6a940c46..fd7e3167 100644 --- a/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts +++ b/src/app/adf-event-scripts/df-script-details/df-script-details.component.ts @@ -101,7 +101,7 @@ export class DfScriptDetailsComponent implements OnInit { this.scriptDetails = data; this.scriptForm.patchValue(data); this.scriptForm.controls['name'].disable(); - this.selectedServiceItem = data.name; + this.completeScriptName = data.name; } else { this.scriptEvents = groupEvents(data); this.unGroupedEvents = data;