Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(features/home): network action default value #3291

Merged
merged 1 commit into from
Nov 14, 2024
Merged

fix(features/home): network action default value #3291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/features/home/details/actions/action-details/action-details.page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
<div class="price-number">{{ price$ | async }} NUM</div>
</div>

<button
<ion-button
type="submit"
class="custom-button"
shape="round"
[disabled]="!form.form.valid"
(click)="performAction(form.model)"
>
{{ title$ | async | uppercase }}
</button>
</ion-button>
</ion-footer>
</ng-container>

Expand Down
22 changes: 0 additions & 22 deletions src/app/features/home/details/actions/action-details/action-details.page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,28 +72,6 @@ ion-footer {
font-weight: 700;
}
}

.custom-button {
padding: 16px 20px;
background-color: #3880ff;
color: white;
border: none;
border-radius: 37px;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 13px;
font-style: normal;
font-weight: 600;
line-height: normal;
letter-spacing: 0.26px;
text-transform: uppercase;

&:hover {
background-color: #0056b3;
}
}
}

ion-spinner {
Expand Down
13 changes: 8 additions & 5 deletions src/app/features/home/details/actions/action-details/action-details.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ export class ActionDetailsPage {
const formModel: any = {};

for (const param of params)
formModel[param.name_text] = param.default_values_list_text[0] || '';
formModel[param.name_text] = param.default_values_list_text?.length
? param.default_values_list_text[0].trim()
: '';

return formModel;
}
Expand All @@ -140,10 +142,11 @@ export class ActionDetailsPage {
key: param.name_text,
type: 'select',
templateOptions: {
options: param.default_values_list_text.map(value => ({
label: value,
value: value,
})),
options:
param.default_values_list_text?.map(value => ({
label: value.trim(),
value: value.trim(),
})) ?? [],
placeholder: param.placeholder_text,
disabled: !param.user_input_boolean,
required: !isOptional,
Expand Down
282 changes: 3 additions & 279 deletions src/app/features/home/details/actions/actions.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,12 @@
import { Component } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar';
import { ActivatedRoute, Router } from '@angular/router';
import { Browser } from '@capacitor/browser';
import { TranslocoService } from '@ngneat/transloco';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { combineLatest, forkJoin, iif, of } from 'rxjs';
import { catchError, concatMap, first, map, take, tap } from 'rxjs/operators';
import { ActionsDialogComponent } from '../../../../shared/actions/actions-dialog/actions-dialog.component';
import { UntilDestroy } from '@ngneat/until-destroy';
import { catchError } from 'rxjs/operators';
import {
Action,
ActionsService,
} from '../../../../shared/actions/service/actions.service';
import { OrderHistoryService } from '../../../../shared/actions/service/order-history.service';
import { BlockingActionService } from '../../../../shared/blocking-action/blocking-action.service';
import { DiaBackendAuthService } from '../../../../shared/dia-backend/auth/dia-backend-auth.service';
import { DiaBackendSeriesRepository } from '../../../../shared/dia-backend/series/dia-backend-series-repository.service';
import {
DiaBackendStoreService,
NetworkAppOrder,
} from '../../../../shared/dia-backend/store/dia-backend-store.service';
import { DiaBackendWalletService } from '../../../../shared/dia-backend/wallet/dia-backend-wallet.service';
import { ErrorService } from '../../../../shared/error/error.service';
import { OrderDetailDialogComponent } from '../../../../shared/order-detail-dialog/order-detail-dialog.component';
import { ProofRepository } from '../../../../shared/repositories/proof/proof-repository.service';
import { browserToolbarColor } from '../../../../utils/constants';
import {
VOID$,
isNonNullable,
} from '../../../../utils/rx-operators/rx-operators';
import { InformationSessionService } from '../information/session/information-session.service';

@UntilDestroy()
@Component({
Expand All @@ -42,270 +19,17 @@ export class ActionsPage {
.getActions$()
.pipe(catchError((err: unknown) => this.errorService.toastError$(err)));

private readonly id$ = this.route.paramMap.pipe(
map(params => params.get('id')),
isNonNullable()
);

constructor(
private readonly router: Router,
private readonly actionsService: ActionsService,
private readonly errorService: ErrorService,
private readonly translocoService: TranslocoService,
private readonly blockingActionService: BlockingActionService,
private readonly route: ActivatedRoute,
private readonly authService: DiaBackendAuthService,
private readonly snackBar: MatSnackBar,
private readonly dialog: MatDialog,
private readonly storeService: DiaBackendStoreService,
private readonly orderHistoryService: OrderHistoryService,
private readonly diaBackendStoreService: DiaBackendStoreService,
private readonly diaBackendSeriesRepository: DiaBackendSeriesRepository,
private readonly diaBackendWalletService: DiaBackendWalletService,
private readonly informationSessionService: InformationSessionService,
private readonly proofRepository: ProofRepository
private readonly route: ActivatedRoute
) {}

canPerformAction$(action: Action) {
if (action.title_text === 'List in CaptureClub') {
/*
Workaround:
Currently there isn't a simple way to check whether an asset is listed in
CaptureClub or not. So I first query List all Products API with
associated_id parameter set to the assets cid. And then use list series
API and check through all nested collections. See discussion here
https://app.asana.com/0/0/1201558520076805/1201995911008176/f
*/
return this.id$.pipe(
concatMap(cid =>
forkJoin([
this.diaBackendStoreService.listAllProducts$({
associated_id: cid,
service_name: 'CaptureClub',
}),
of(cid),
])
),
concatMap(([response, cid]) => {
if (response.count > 0) {
throw new Error(
this.translocoService.translate('message.hasListedInCaptureApp')
);
}
return of(cid);
}),
concatMap(async cid => {
let currentOffset = 0;
const limit = 100;
while (true) {
const response = await this.diaBackendSeriesRepository
.fetchAll$({ offset: currentOffset, limit })
.toPromise();
const listedAsSeries = response.results.some(serie =>
serie.collections.some(collection =>
collection.assets.some(asset => asset.cid === cid)
)
);
if (listedAsSeries) {
throw new Error(
this.translocoService.translate('message.hasListedInCaptureApp')
);
}
if (response.next == null) {
break;
}
currentOffset += response.results.length;
}
return VOID$;
}),
take(1)
);
}
return VOID$;
}

openActionDialog$(action: Action) {
return combineLatest([
this.actionsService.getParams$(action.params_list_custom_param1 ?? []),
this.authService.token$,
this.id$,
]).pipe(
first(),
concatMap(([params, token, id]) => {
const dialogRef = this.dialog.open<ActionsDialogComponent>(
ActionsDialogComponent,
{
disableClose: true,
data: {
action: action,
params: params,
},
}
);
return dialogRef.afterClosed().pipe(
isNonNullable(),
concatMap(data =>
of({
networkApp: action.network_app_id_text,
actionArgs: { ...data, token: token, cid: id },
} as CreateOrderInput)
)
);
})
);
}

openOrderDialog$(orderStatus: NetworkAppOrder) {
const dialogRef = this.dialog.open<OrderDetailDialogComponent>(
OrderDetailDialogComponent,
{
disableClose: true,
data: orderStatus,
width: '80%',
}
);
return dialogRef.afterClosed().pipe(
isNonNullable(),
concatMap((orderId: string) => of(orderId))
);
}

createOrder$(appName: string, actionArgs: any) {
return this.storeService.createNetworkAppOrder(appName, actionArgs).pipe(
catchError((err: unknown) =>
this.errorService.toastDiaBackendError$(err)
),
isNonNullable()
);
}

confirmOrder$(id: string) {
return this.storeService.confirmNetworkAppOrder(id).pipe(
catchError((err: unknown) =>
this.errorService.toastDiaBackendError$(err)
),
isNonNullable()
);
}

createOrderHistory$(networkAppOrder: NetworkAppOrder) {
return this.id$.pipe(
first(),
isNonNullable(),
concatMap(cid =>
this.orderHistoryService.createOrderHistory$(networkAppOrder, cid)
),
catchError((err: unknown) => {
return this.errorService.toastError$(err);
})
);
}

redirectToExternalUrl(url: string, orderId: string) {
this.id$
.pipe(
first(),
isNonNullable(),
tap(cid =>
Browser.open({
url: `${url}?cid=${cid}&order_id=${orderId}`,
toolbarColor: browserToolbarColor,
})
),
catchError((err: unknown) => {
return this.errorService.toastError$(err);
}),
untilDestroyed(this)
)
.subscribe();
}

removeCapture() {
if (this.informationSessionService.activatedDetailedCapture) {
this.informationSessionService.activatedDetailedCapture.proof$.subscribe(
proof => {
if (proof) {
this.proofRepository.remove(proof);
this.router.navigate(['/home']);
}
}
);
}
}

performAction(action: Action) {
this.router.navigate(['action-details'], {
relativeTo: this.route,
state: action,
});
}

doAction(action: Action) {
this.blockingActionService
.run$(this.canPerformAction$(action))
.pipe(
catchError((err: unknown) => {
return this.errorService.toastError$(err);
}),
concatMap(() => this.openActionDialog$(action)),
concatMap(createOrderInput =>
this.blockingActionService.run$(
forkJoin([
this.createOrder$(
createOrderInput.networkApp,
createOrderInput.actionArgs
),
// To display "Insufficient NUM" in order confirmation dialog,
// we need to sync asset wallet balance if the action cost NUM.
iif(
() => action.action_cost_number > 0,
this.diaBackendWalletService.syncAssetWalletBalance$(),
VOID$
),
])
)
),
concatMap(([orderStatus, _]) => this.openOrderDialog$(orderStatus)),
concatMap(orderId =>
this.blockingActionService.run$(this.confirmOrder$(orderId))
),
tap(networkAppOrder => {
/*
Workaround:
Create a order history record only if the total cost is > 0 to prevent race condition
between app creating the order history record v.s. bubble workflow checking whether a
record already exists and if not create a new one, especially for network actions that
don't require any cost (and hence backend calls the webhook immediately). See
https://dt42-numbers.slack.com/archives/C0323488MEJ/p1648006014291339
*/
if (Number(networkAppOrder.total_cost) !== 0) {
this.createOrderHistory$(networkAppOrder).subscribe();
}
}),
tap(() => {
this.snackBar.open(
this.translocoService.translate('message.sentSuccessfully')
);
}),
tap(networkAppOrder => {
if (action.ext_action_destination_text) {
this.redirectToExternalUrl(
action.ext_action_destination_text,
networkAppOrder.id
);
}
}),
tap(() => {
if (action.hide_capture_after_execution_boolean ?? false)
this.removeCapture();
}),
untilDestroyed(this)
)
.subscribe();
}
}

interface CreateOrderInput {
networkApp: string;
actionArgs: any;
}
Loading
Loading