From 2838d8d0f7b6635b1e399465bd11ce57dcd59ce7 Mon Sep 17 00:00:00 2001 From: Yi-Jacob Date: Tue, 9 Apr 2024 11:12:54 -0500 Subject: [PATCH 1/3] resolved merge --- .../df-service-details/df-paywall-modal.html | 6 +++--- .../df-password-reset/df-password-reset.component.html | 4 ++-- .../adf-user-management/services/df-password.service.ts | 8 +++----- .../df-dynamic-field/df-dynamic-field.component.html | 4 ++-- .../components/df-paywall/df-paywall.component.html | 2 +- .../df-script-editor/df-script-editor.component.ts | 8 +++++--- .../components/df-side-nav/df-side-nav.component.html | 2 +- .../df-verb-picker/df-verb-picker.component.ts | 9 +++++---- 8 files changed, 22 insertions(+), 21 deletions(-) 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..078dfadf 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/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.ts b/src/app/shared/components/df-script-editor/df-script-editor.component.ts index 624b14fc..a32fe1e3 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 @@ -109,9 +109,11 @@ export class DfScriptEditorComponent implements OnInit { } viewLatest() { - const filePath = `${this.storageServices.find( - service => 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); }); } From a65c3b76a1e5d0d2b653e7b039efc16bfbb34a07 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 22 Apr 2024 14:52:30 -0700 Subject: [PATCH 2/3] Updated API Key Page --- .../df-app-details.component.html | 35 +++++++++++++------ .../df-app-details.component.scss | 12 +++++++ 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/app/adf-apps/df-app-details/df-app-details.component.html b/src/app/adf-apps/df-app-details/df-app-details.component.html index 8d734272..d01794b0 100644 --- a/src/app/adf-apps/df-app-details/df-app-details.component.html +++ b/src/app/adf-apps/df-app-details/df-app-details.component.html @@ -5,7 +5,10 @@ {{ alertMsg }}
- + {{ 'apps.createApp.applicationName.label' | transloco }} @@ -23,7 +26,10 @@ {{ 'apps.createApp.applicationName.error' | transloco }} - + {{ 'apps.createApp.defaultRole.label' | transloco }} - + {{ 'apps.createApp.description.label' | transloco }}