From 48c51fef6d005a0ffdf702150eb3d889ae5bcf19 Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Thu, 4 Apr 2024 10:10:48 -0500 Subject: [PATCH 1/7] in progress --- .../df-script-details.component.html | 25 ++++++++++++- .../df-script-details.component.ts | 37 +++++++++++++++++-- .../df-service-details/df-paywall-modal.html | 6 +-- .../df-password-reset.component.html | 4 +- .../services/df-password.service.ts | 8 ++-- src/app/routes.ts | 5 ++- .../df-dynamic-field.component.html | 4 +- .../df-paywall/df-paywall.component.html | 2 +- .../df-script-editor.component.html | 4 +- .../df-script-editor.component.ts | 10 +++-- .../df-side-nav/df-side-nav.component.html | 2 +- .../df-verb-picker.component.ts | 9 +++-- .../shared/services/df-base-crud.service.ts | 2 +- 13 files changed, 87 insertions(+), 31 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 4c38def5..f25b2928 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,5 +1,26 @@
- + + {{ 'service' | transloco }} + + + {{ service.label }} + + + + + {{ 'scripts.scriptName' | transloco }} + + + + + {{ event }} + + + + + {{ 'scripts.scriptName' | transloco }} @@ -12,7 +33,7 @@ - + {{ '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 c9ff28d6..61f72afe 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 @@ -23,8 +23,13 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatInputModule } from '@angular/material/input'; import { Observable, map, startWith } from 'rxjs'; import { groupEvents } from 'src/app/shared/utilities/eventScripts'; -import { EVENT_SCRIPT_SERVICE_TOKEN } from 'src/app/shared/constants/tokens'; +import { + BASE_SERVICE_TOKEN, + EVENTS_SERVICE_TOKEN, + EVENT_SCRIPT_SERVICE_TOKEN, +} from 'src/app/shared/constants/tokens'; import { DfBaseCrudService } from 'src/app/shared/services/df-base-crud.service'; +import { Service, ServiceType } from 'src/app/shared/types/service'; @UntilDestroy({ checkProperties: true }) @Component({ @@ -60,7 +65,10 @@ export class DfScriptDetailsComponent implements OnInit { private fb: FormBuilder, private router: Router, @Inject(EVENT_SCRIPT_SERVICE_TOKEN) - private eventScriptService: DfBaseCrudService + @Inject(EVENTS_SERVICE_TOKEN) + // private eventScriptService: DfBaseCrudService, + // eventScriptService: DfBaseCrudService, + @Inject(BASE_SERVICE_TOKEN) private baseService: DfBaseCrudService ) { this.scriptForm = this.fb.group({ name: ['', [Validators.required]], @@ -70,10 +78,28 @@ 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', + }, + ], + }) + .subscribe(res => { + this.storageServices = res.services; + }); } + storageServices: Array = []; ngOnInit(): void { - this.activatedRoute.data.subscribe(({ data, type }) => { + this.activatedRoute.data.subscribe(({ data, systemEvents, type }) => { + console.log(systemEvents); this.type = type; if (type === 'edit') { this.scriptDetails = data; @@ -89,6 +115,11 @@ export class DfScriptDetailsComponent implements OnInit { startWith(''), map(value => this.filterGroup(value)) ); + this.scriptForm.controls['storageServiceId'].valueChanges.subscribe(res => { + return this.eventScriptService.get(res.name).subscribe(res => { + console.log(res); + }); + }); this.loaded = true; } diff --git a/src/app/adf-services/df-service-details/df-paywall-modal.html b/src/app/adf-services/df-service-details/df-paywall-modal.html index d5925f29..712cde66 100644 --- a/src/app/adf-services/df-service-details/df-paywall-modal.html +++ b/src/app/adf-services/df-service-details/df-paywall-modal.html @@ -1,3 +1,4 @@ +

Unlock Service

@@ -12,8 +13,7 @@

{{ 'paywall.hostedTrial' | transloco }}

{{ 'paywall.ossVersion' | transloco }}

- {{ 'paywall.signup' | transloco - }}{{ 'paywall.trial' | transloco }} > | {{ 'email' | transloco }}: info@dreamfactory.com{{ 'email' | transloco }}: info\@dreamfactory.com

diff --git a/src/app/adf-user-management/df-password-reset/df-password-reset.component.html b/src/app/adf-user-management/df-password-reset/df-password-reset.component.html index ad49d609..3d34d358 100644 --- a/src/app/adf-user-management/df-password-reset/df-password-reset.component.html +++ b/src/app/adf-user-management/df-password-reset/df-password-reset.component.html @@ -13,8 +13,8 @@ (type === 'reset' ? 'resetPassword' : type === 'register' - ? 'registrationConfirmation' - : 'invitatonConfirmation') | transloco + ? 'registrationConfirmation' + : 'invitatonConfirmation') | transloco }} diff --git a/src/app/adf-user-management/services/df-password.service.ts b/src/app/adf-user-management/services/df-password.service.ts index 48e33754..355c8430 100644 --- a/src/app/adf-user-management/services/df-password.service.ts +++ b/src/app/adf-user-management/services/df-password.service.ts @@ -60,11 +60,9 @@ export class DfPasswordService { hasSecurityQuestion = false ) { return this.http - .post( - URLS.USER_PASSWORD, - data, - hasSecurityQuestion ? HTTP_OPTION_LOGIN_FALSE : HTTP_OPTION_RESET_TRUE - ) + .post< + SecurityQuestion | GenericSuccessResponse + >(URLS.USER_PASSWORD, data, hasSecurityQuestion ? HTTP_OPTION_LOGIN_FALSE : HTTP_OPTION_RESET_TRUE) .pipe( catchError(() => { return this.http.post( diff --git a/src/app/routes.ts b/src/app/routes.ts index 253cda2a..a83bf0da 100644 --- a/src/app/routes.ts +++ b/src/app/routes.ts @@ -229,7 +229,9 @@ export const routes: Routes = [ import( './adf-event-scripts/df-manage-scripts/df-manage-scripts.component' ).then(m => m.DfManageScriptsComponent), - resolve: { data: eventScriptsResolver }, + resolve: { + data: eventScriptsResolver, + }, }, { path: ROUTES.CREATE, @@ -239,6 +241,7 @@ export const routes: Routes = [ ).then(m => m.DfScriptDetailsComponent), resolve: { data: eventsResolver, + systemEvents: systemEventsResolver, }, data: { type: 'create' }, canActivate: [paywallGuard(['script_Type', 'event_script'])], diff --git a/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html b/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html index afde76ea..b1d53cd7 100644 --- a/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html +++ b/src/app/shared/components/df-dynamic-field/df-dynamic-field.component.html @@ -21,8 +21,8 @@ schema.type === 'integer' ? 'number' : schema.type === 'password' - ? 'password' - : 'text' + ? 'password' + : 'text' " [attr.aria-label]="schema.label" /> {{ 'paywall.speakToHuman' | transloco }}

{{ 'phone' | transloco }}: +1 415-993-5877 | {{ 'email' | transloco }}: info@dreamfactory.com{{ 'email' | transloco }}: info@dreamfactory.com

diff --git a/src/app/shared/components/df-script-editor/df-script-editor.component.html b/src/app/shared/components/df-script-editor/df-script-editor.component.html index 5690cc97..732faba1 100644 --- a/src/app/shared/components/df-script-editor/df-script-editor.component.html +++ b/src/app/shared/components/df-script-editor/df-script-editor.component.html @@ -23,7 +23,7 @@ {{ 'githubFile' | transloco }}
- + service.id === this.storageServiceId.getRawValue() - )?.name}/${this.storagePath.getRawValue()}`; + const filePath = `${ + this.storageServices.find( + service => service.id === this.storageServiceId.getRawValue() + )?.name + }/${this.storagePath.getRawValue()}`; if (filePath.endsWith('.json')) { this.fileService .downloadJson(filePath) diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.html b/src/app/shared/components/df-side-nav/df-side-nav.component.html index 43fe0bb6..45f0ed49 100644 --- a/src/app/shared/components/df-side-nav/df-side-nav.component.html +++ b/src/app/shared/components/df-side-nav/df-side-nav.component.html @@ -162,4 +162,4 @@

- \ No newline at end of file + diff --git a/src/app/shared/components/df-verb-picker/df-verb-picker.component.ts b/src/app/shared/components/df-verb-picker/df-verb-picker.component.ts index 9b75b3ff..1592ae1a 100644 --- a/src/app/shared/components/df-verb-picker/df-verb-picker.component.ts +++ b/src/app/shared/components/df-verb-picker/df-verb-picker.component.ts @@ -115,10 +115,11 @@ export class DfVerbPickerComponent implements ControlValueAccessor, DoCheck { this.type === 'number' ? (selected || []).reduce((acc: number, val: number) => acc | val, 0) : this.type === 'verb_multiple' - ? ((selected || []).map( - (v: any) => this.verbs.find(vr => vr.value === v)?.altValue ?? '' - ) as Array) - : this.verbs.find(vr => vr.value === selected)?.altValue ?? ''; + ? ((selected || []).map( + (v: any) => + this.verbs.find(vr => vr.value === v)?.altValue ?? '' + ) as Array) + : this.verbs.find(vr => vr.value === selected)?.altValue ?? ''; this.onChange(total); }); } diff --git a/src/app/shared/services/df-base-crud.service.ts b/src/app/shared/services/df-base-crud.service.ts index 4dfe2f62..36c3370a 100644 --- a/src/app/shared/services/df-base-crud.service.ts +++ b/src/app/shared/services/df-base-crud.service.ts @@ -16,7 +16,7 @@ export class DfBaseCrudService { return this.http.get( this.url, this.getOptions({ - limit: 10, + limit: 100, offset: 0, includeCount: true, ...options, From 4f68885eb45032f34e3c9f255494f2b308b80045 Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Thu, 4 Apr 2024 10:12:49 -0500 Subject: [PATCH 2/7] in progress --- .../df-script-details.component.ts | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) 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 61f72afe..2bd8b0ec 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 @@ -68,7 +68,8 @@ export class DfScriptDetailsComponent implements OnInit { @Inject(EVENTS_SERVICE_TOKEN) // private eventScriptService: DfBaseCrudService, // eventScriptService: DfBaseCrudService, - @Inject(BASE_SERVICE_TOKEN) private baseService: DfBaseCrudService + @Inject(BASE_SERVICE_TOKEN) + private baseService: DfBaseCrudService ) { this.scriptForm = this.fb.group({ name: ['', [Validators.required]], @@ -115,11 +116,11 @@ export class DfScriptDetailsComponent implements OnInit { startWith(''), map(value => this.filterGroup(value)) ); - this.scriptForm.controls['storageServiceId'].valueChanges.subscribe(res => { - return this.eventScriptService.get(res.name).subscribe(res => { - console.log(res); - }); - }); + // this.scriptForm.controls['storageServiceId'].valueChanges.subscribe(res => { + // return this.eventScriptService.get(res.name).subscribe(res => { + // console.log(res); + // }); + // }); this.loaded = true; } @@ -136,17 +137,17 @@ export class DfScriptDetailsComponent implements OnInit { return; } const script = this.scriptForm.getRawValue(); - if (this.type === 'edit') { - this.scriptDetails = { ...this.scriptDetails, ...script }; - this.eventScriptService - .update(script.name, script) - .subscribe(() => this.goBack()); - } else { - this.scriptDetails = script; - this.eventScriptService - .create(script, undefined, script.name) - .subscribe(() => this.goBack()); - } + // if (this.type === 'edit') { + // this.scriptDetails = { ...this.scriptDetails, ...script }; + // this.eventScriptService + // .update(script.name, script) + // .subscribe(() => this.goBack()); + // } else { + // this.scriptDetails = script; + // this.eventScriptService + // .create(script, undefined, script.name) + // .subscribe(() => this.goBack()); + // } } private filterGroup(value: string): Array { From 55600341cfe754abcb63683c9816cbbdcbfda990 Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Sat, 6 Apr 2024 16:48:22 -0500 Subject: [PATCH 3/7] updated functions --- .../df-script-details.component.html | 44 +++++--- .../df-script-details.component.ts | 100 +++++++++++++----- .../df-ace-editor/df-ace-editor.component.ts | 17 +-- .../df-script-editor.component.html | 1 - .../df-script-editor.component.ts | 6 +- .../shared/services/df-base-crud.service.ts | 2 +- src/app/shared/types/scripts.ts | 1 + 7 files changed, 118 insertions(+), 53 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 f25b2928..d7e58487 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,37 +1,51 @@ {{ 'service' | transloco }} - - - {{ service.label }} + + + {{ service }} {{ 'scripts.scriptName' | transloco }} - - + + + {{ item }} + + + + {{ 'scripts.scriptName' | transloco }} + + + {{ item }} + + + {{ '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 2bd8b0ec..b9c524fa 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 @@ -30,6 +30,7 @@ import { } from 'src/app/shared/constants/tokens'; import { DfBaseCrudService } from 'src/app/shared/services/df-base-crud.service'; import { Service, ServiceType } from 'src/app/shared/types/service'; +import { CommonModule } from '@angular/common'; @UntilDestroy({ checkProperties: true }) @Component({ @@ -50,6 +51,7 @@ import { Service, ServiceType } from 'src/app/shared/types/service'; MatAutocompleteModule, MatInputModule, AsyncPipe, + CommonModule, ], }) export class DfScriptDetailsComponent implements OnInit { @@ -59,18 +61,28 @@ export class DfScriptDetailsComponent implements OnInit { type: 'create' | 'edit' = 'create'; scriptEvents: Array; scriptEventsOptions: Observable>; + unGroupedEvents: ScriptEvent; + ungroupedEventItems: string[]; + ungroupedEventOptions: ScriptEvent; + ungroupedRouteOptions: string[]; + storeServiceArray: string[]; + selectedStorageItem: string; + selectedServiceItem: string; + selectedEventItem: string; + selectedRouteItem: string; loaded = false; constructor( private activatedRoute: ActivatedRoute, private fb: FormBuilder, private router: Router, @Inject(EVENT_SCRIPT_SERVICE_TOKEN) + private eventScriptService: DfBaseCrudService, @Inject(EVENTS_SERVICE_TOKEN) - // private eventScriptService: DfBaseCrudService, - // eventScriptService: DfBaseCrudService, @Inject(BASE_SERVICE_TOKEN) private baseService: DfBaseCrudService ) { + this.storeServiceArray = []; + this.ungroupedEventItems = []; this.scriptForm = this.fb.group({ name: ['', [Validators.required]], type: ['nodejs', [Validators.required]], @@ -88,26 +100,27 @@ export class DfScriptDetailsComponent implements OnInit { { key: 'group', value: - 'Database, Big Data, Script, Remote Service, File, Excel, Cache, Email, Notification, Log, Source Control, IoT, LDAP, SSO, OAuth', + 'Database, Big Data, Script, Remote Service, File, Excel, Cache, Email, Notification, Log, Source Control, IoT, LDAP, SSO, OAuth, user, system', }, ], }) - .subscribe(res => { - this.storageServices = res.services; - }); + .subscribe(); } - storageServices: Array = []; + storageServices: Service; ngOnInit(): void { - this.activatedRoute.data.subscribe(({ data, systemEvents, type }) => { - console.log(systemEvents); + this.activatedRoute.data.subscribe(({ data, type }) => { this.type = type; if (type === 'edit') { this.scriptDetails = data; + console.log(data); this.scriptForm.patchValue(data); this.scriptForm.controls['name'].disable(); } else { this.scriptEvents = groupEvents(data); + this.unGroupedEvents = data; + this.storageServices = data; + this.storeServiceArray = Object.keys(this.storageServices) as string[]; } }); this.scriptEventsOptions = this.scriptForm.controls[ @@ -117,8 +130,15 @@ export class DfScriptDetailsComponent implements OnInit { map(value => this.filterGroup(value)) ); // this.scriptForm.controls['storageServiceId'].valueChanges.subscribe(res => { - // return this.eventScriptService.get(res.name).subscribe(res => { - // console.log(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; @@ -133,21 +153,33 @@ export class DfScriptDetailsComponent implements OnInit { } submit(): void { - if (!this.scriptForm.valid) { - return; - } - const script = this.scriptForm.getRawValue(); - // if (this.type === 'edit') { - // this.scriptDetails = { ...this.scriptDetails, ...script }; - // this.eventScriptService - // .update(script.name, script) - // .subscribe(() => this.goBack()); - // } else { - // this.scriptDetails = script; - // this.eventScriptService - // .create(script, undefined, script.name) - // .subscribe(() => this.goBack()); + // if (!this.scriptForm.valid) { + // return; // } + const script = this.scriptForm.getRawValue(); + const scriptItem = { + ...script, + storageServiceId: + script.storageServiceId?.type === 'local_file' + ? script.storageServiceId?.id + : null, + storage_path: + script.storageServiceId?.type === 'local_file' + ? script.storagePath + : null, + name: this.selectedRouteItem, + }; + if (this.type === 'edit') { + this.scriptDetails = { ...this.scriptDetails, ...scriptItem }; + this.eventScriptService + .update(script.name, script) + .subscribe(() => this.goBack()); + } else { + this.scriptDetails = script; + this.eventScriptService + .create(scriptItem, undefined, scriptItem.name) + .subscribe(() => this.goBack()); + } } private filterGroup(value: string): Array { @@ -163,4 +195,22 @@ export class DfScriptDetailsComponent implements OnInit { } return this.scriptEvents; } + + selectedServiceItemEvent() { + let serviceType: string = this.selectedServiceItem; + if (serviceType === 'api_docs') { + serviceType = 'apiDocs'; + } + this.ungroupedEventOptions = this.unGroupedEvents[serviceType]; + this.ungroupedEventItems = this.ungroupedEventItems || []; + Object.keys(this.ungroupedEventOptions).forEach(key => { + this.ungroupedEventItems.push(key); + }); + } + + selectedEventItemEvent() { + this.ungroupedRouteOptions = [ + ...this.ungroupedEventOptions[this.selectedEventItem].endpoints, + ]; + } } diff --git a/src/app/shared/components/df-ace-editor/df-ace-editor.component.ts b/src/app/shared/components/df-ace-editor/df-ace-editor.component.ts index 759eea4c..636ec8a7 100644 --- a/src/app/shared/components/df-ace-editor/df-ace-editor.component.ts +++ b/src/app/shared/components/df-ace-editor/df-ace-editor.component.ts @@ -67,7 +67,7 @@ export class DfAceEditorComponent showGutter: true, highlightActiveLine: true, tabSize: 2, - readOnly: this.readonly, + readOnly: false, maxLines: 50, }); this.editor.renderer.attachToShadowRoot(); @@ -90,10 +90,11 @@ export class DfAceEditorComponent this.onTouched = fn; } - setDisabledState(isDisabled: boolean): void { - if (!this.editor) return; - isDisabled ? this.editor.setReadOnly(true) : this.editor.setReadOnly(false); - } + // setDisabledState(isDisabled: boolean): void { + // this.editor.setReadOnly(false); + // if (!this.editor) return; + // isDisabled ? this.editor.setReadOnly(true) : this.editor.setReadOnly(false); + // } ngOnChanges(changes: SimpleChanges): void { if (!this.editor) return; @@ -105,9 +106,9 @@ export class DfAceEditorComponent if (changes['value']) { this.setValue(changes['value'].currentValue); } - if (changes['readonly']) { - this.setDisabledState(changes['readonly'].currentValue); - } + // if (changes['readonly']) { + // this.setDisabledState(changes['readonly'].currentValue); + // } } setValue(value: string): void { diff --git a/src/app/shared/components/df-script-editor/df-script-editor.component.html b/src/app/shared/components/df-script-editor/df-script-editor.component.html index 732faba1..9732478c 100644 --- a/src/app/shared/components/df-script-editor/df-script-editor.component.html +++ b/src/app/shared/components/df-script-editor/df-script-editor.component.html @@ -61,6 +61,5 @@

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 7e87e37b..3003a4c1 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 @@ -78,11 +78,11 @@ export class DfScriptEditorComponent implements OnInit { this.storagePath.reset(); if (value) { this.storagePath.addValidators([Validators.required]); - this.content.reset(); - this.content.disable(); + // this.content.reset(); + // this.content.disable(); } else { if (this.storagePath.hasValidator(Validators.required)) { - this.content.enable(); + // this.content.enable(); this.storagePath.removeValidators([Validators.required]); } } diff --git a/src/app/shared/services/df-base-crud.service.ts b/src/app/shared/services/df-base-crud.service.ts index 36c3370a..4dfe2f62 100644 --- a/src/app/shared/services/df-base-crud.service.ts +++ b/src/app/shared/services/df-base-crud.service.ts @@ -16,7 +16,7 @@ export class DfBaseCrudService { return this.http.get( this.url, this.getOptions({ - limit: 100, + limit: 10, offset: 0, includeCount: true, ...options, diff --git a/src/app/shared/types/scripts.ts b/src/app/shared/types/scripts.ts index bd99b6c1..c603828b 100644 --- a/src/app/shared/types/scripts.ts +++ b/src/app/shared/types/scripts.ts @@ -45,6 +45,7 @@ export enum AceEditorMode { export interface ScriptEvent { name: string; endpoints: Array; + [key: string]: any; } export interface ScriptEventResponse { From c1b3741132dc5d88e7de73b5ac5f2ea2f597431b Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Sat, 6 Apr 2024 16:48:54 -0500 Subject: [PATCH 4/7] updated functions --- .../components/df-ace-editor/df-ace-editor.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/components/df-ace-editor/df-ace-editor.component.ts b/src/app/shared/components/df-ace-editor/df-ace-editor.component.ts index 636ec8a7..11518bb3 100644 --- a/src/app/shared/components/df-ace-editor/df-ace-editor.component.ts +++ b/src/app/shared/components/df-ace-editor/df-ace-editor.component.ts @@ -92,8 +92,8 @@ export class DfAceEditorComponent // setDisabledState(isDisabled: boolean): void { // this.editor.setReadOnly(false); - // if (!this.editor) return; - // isDisabled ? this.editor.setReadOnly(true) : this.editor.setReadOnly(false); + // if (!this.editor) return; + // isDisabled ? this.editor.setReadOnly(true) : this.editor.setReadOnly(false); // } ngOnChanges(changes: SimpleChanges): void { From 2fbddfaf6d26269d3277a38f7052785015f1c370 Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Sun, 7 Apr 2024 18:23:38 -0500 Subject: [PATCH 5/7] cleanup --- .../df-script-details/df-script-details.component.ts | 1 - 1 file changed, 1 deletion(-) 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 b9c524fa..fe2a96f6 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 @@ -113,7 +113,6 @@ export class DfScriptDetailsComponent implements OnInit { this.type = type; if (type === 'edit') { this.scriptDetails = data; - console.log(data); this.scriptForm.patchValue(data); this.scriptForm.controls['name'].disable(); } else { From a6808b1893e2b170891273c6bc35ef450f35561a Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Sun, 7 Apr 2024 18:37:36 -0500 Subject: [PATCH 6/7] cleanup --- .../df-script-details.component.ts | 32 +++++++++---------- src/app/routes.ts | 3 +- 2 files changed, 16 insertions(+), 19 deletions(-) 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 fe2a96f6..786c9b04 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 @@ -77,9 +77,7 @@ export class DfScriptDetailsComponent implements OnInit { private router: Router, @Inject(EVENT_SCRIPT_SERVICE_TOKEN) private eventScriptService: DfBaseCrudService, - @Inject(EVENTS_SERVICE_TOKEN) - @Inject(BASE_SERVICE_TOKEN) - private baseService: DfBaseCrudService + ) { this.storeServiceArray = []; this.ungroupedEventItems = []; @@ -91,20 +89,20 @@ 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(); + // 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; diff --git a/src/app/routes.ts b/src/app/routes.ts index a83bf0da..17cacff1 100644 --- a/src/app/routes.ts +++ b/src/app/routes.ts @@ -240,8 +240,7 @@ export const routes: Routes = [ './adf-event-scripts/df-script-details/df-script-details.component' ).then(m => m.DfScriptDetailsComponent), resolve: { - data: eventsResolver, - systemEvents: systemEventsResolver, + data: eventsResolver }, data: { type: 'create' }, canActivate: [paywallGuard(['script_Type', 'event_script'])], From 91cecad134b4dade65d73aeed62872dcea5939e5 Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Sun, 7 Apr 2024 18:40:14 -0500 Subject: [PATCH 7/7] cleanup --- .../df-script-details/df-script-details.component.ts | 3 +-- src/app/routes.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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 786c9b04..a55fabe8 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 @@ -76,8 +76,7 @@ export class DfScriptDetailsComponent implements OnInit { private fb: FormBuilder, private router: Router, @Inject(EVENT_SCRIPT_SERVICE_TOKEN) - private eventScriptService: DfBaseCrudService, - + private eventScriptService: DfBaseCrudService ) { this.storeServiceArray = []; this.ungroupedEventItems = []; diff --git a/src/app/routes.ts b/src/app/routes.ts index 17cacff1..a2b89e0b 100644 --- a/src/app/routes.ts +++ b/src/app/routes.ts @@ -240,7 +240,7 @@ export const routes: Routes = [ './adf-event-scripts/df-script-details/df-script-details.component' ).then(m => m.DfScriptDetailsComponent), resolve: { - data: eventsResolver + data: eventsResolver, }, data: { type: 'create' }, canActivate: [paywallGuard(['script_Type', 'event_script'])],