Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/app/adf-services/df-service-details/df-paywall-modal.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<!-- eslint-disable prettier/prettier -->
<div class="app-container" style="padding: 12px 20px">
<h1 mat-dialog-title style="text-align: center">Unlock Service</h1>
<mat-dialog-content>
Expand All @@ -12,8 +13,7 @@ <h4>{{ 'paywall.hostedTrial' | transloco }}</h4>
<div class="dynamic-width">
<h4>{{ 'paywall.ossVersion' | transloco }}</h4>
<p>
{{ 'paywall.signup' | transloco
}}<a
{{ 'paywall.signup' | transloco }}<a
href="https://genie.dreamfactory.com/?utm_source=platform&utm_medium=paywall&utm_campaign=hosted"
target="_blank"
>{{ 'paywall.trial' | transloco }}</a
Expand All @@ -29,7 +29,7 @@ <h3 class="paywall-contact">
>
|
<a href="mailto:info@dreamfactory.com"
>{{ 'email' | transloco }}: info@dreamfactory.com</a
>{{ 'email' | transloco }}: info&#64;dreamfactory.com</a
>
</h3>
<div #calendlyWidget class="calendly-inline-widget"></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
(type === 'reset'
? 'resetPassword'
: type === 'register'
? 'registrationConfirmation'
: 'invitatonConfirmation') | transloco
? 'registrationConfirmation'
: 'invitatonConfirmation') | transloco
}}
</mat-card-title>
</mat-card-header>
Expand Down
8 changes: 3 additions & 5 deletions src/app/adf-user-management/services/df-password.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,9 @@ export class DfPasswordService {
hasSecurityQuestion = false
) {
return this.http
.post<SecurityQuestion | GenericSuccessResponse>(
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<SecurityQuestion | GenericSuccessResponse>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
schema.type === 'integer'
? 'number'
: schema.type === 'password'
? 'password'
: 'text'
? 'password'
: 'text'
"
[attr.aria-label]="schema.label" />
<mat-select
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ <h2>{{ 'paywall.speakToHuman' | transloco }}</h2>
<h3 class="paywall-contact">
<a href="tel:+1 415-993-5877">{{ 'phone' | transloco }}: +1 415-993-5877</a> |
<a href="mailto:info@dreamfactory.com"
>{{ 'email' | transloco }}: info@dreamfactory.com</a
>{{ 'email' | transloco }}: info&#64;dreamfactory.com</a
>
</h3>
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class DfScriptEditorComponent implements OnInit {
additionalParams: [
{
key: 'group',
value: 'source control,file',
value: 'source control,file,database',
},
],
})
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@ <h1 class="page-header">
</mat-expansion-panel>
</ng-template>
</ng-container>
</ng-template>
</ng-template>
Original file line number Diff line number Diff line change
Expand Up @@ -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<Verb>)
: this.verbs.find(vr => vr.value === selected)?.altValue ?? '';
? ((selected || []).map(
(v: any) =>
this.verbs.find(vr => vr.value === v)?.altValue ?? ''
) as Array<Verb>)
: this.verbs.find(vr => vr.value === selected)?.altValue ?? '';
this.onChange(total);
});
}
Expand Down