Build/bump version to 0.44.0

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.44.0 - 2021-12-15
+
+### Changed
+
+- Change network application dialog to support selection input and input validation.
+
+### Fixed
+
+- Do not show Capture options menu when post-creation workflow has not been completed yet
+
 ## 0.43.1 - 2021-12-08
 
 ### Fixed

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "io.numbersprotocol.capturelite"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 261
-        versionName "0.43.1"
+        versionCode 270
+        versionName "0.44.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "capture-lite",
-  "version": "0.43.1",
+  "version": "0.44.0",
   "author": "numbersprotocol",
   "homepage": "https://numbersprotocol.io/",
   "scripts": {

src/app/features/home/details/actions/actions.page.ts

@@ -1,19 +1,20 @@
 import { Component } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { ActivatedRoute } from '@angular/router';
-import { AlertController } from '@ionic/angular';
-import { AlertInput } from '@ionic/core';
 import { TranslocoService } from '@ngneat/transloco';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { combineLatest } from 'rxjs';
-import { catchError, concatMap, map, tap } from 'rxjs/operators';
+import { catchError, concatMap, first, map, tap } from 'rxjs/operators';
+import { ActionsDialogComponent } from '../../../../shared/actions/actions-dialog/actions-dialog.component';
 import {
   Action,
   ActionsService,
-} from '../../../../shared/actions/actions.service';
+} from '../../../../shared/actions/service/actions.service';
 import { BlockingActionService } from '../../../../shared/blocking-action/blocking-action.service';
 import { DiaBackendAuthService } from '../../../../shared/dia-backend/auth/dia-backend-auth.service';
 import { ErrorService } from '../../../../shared/error/error.service';
+import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
 
 @UntilDestroy()
 @Component({
@@ -33,12 +34,12 @@ export class ActionsPage {
   constructor(
     private readonly actionsService: ActionsService,
     private readonly errorService: ErrorService,
-    private readonly alertController: AlertController,
     private readonly translocoService: TranslocoService,
     private readonly blockingActionService: BlockingActionService,
     private readonly route: ActivatedRoute,
     private readonly authService: DiaBackendAuthService,
-    private readonly snackBar: MatSnackBar
+    private readonly snackBar: MatSnackBar,
+    private readonly dialog: MatDialog
   ) {}
 
   openAction(action: Action) {
@@ -48,44 +49,25 @@ export class ActionsPage {
       this.id$,
     ])
       .pipe(
-        concatMap(
-          ([params, token, id]) =>
-            new Promise<void>(resolve => {
-              this.alertController
-                .create({
-                  header: action.title_text,
-                  message: action.description_text,
-                  inputs: params.map(
-                    param =>
-                      ({
-                        name: param.name_text,
-                        label: param.display_text_text,
-                        type: param.type_text,
-                        placeholder: param.placeholder_text,
-                        value: param.default_values_list_text[0],
-                        disabled: !param.user_input_boolean,
-                      } as AlertInput)
-                  ),
-                  buttons: [
-                    {
-                      text: this.translocoService.translate('cancel'),
-                      role: 'cancel',
-                    },
-                    {
-                      text: this.translocoService.translate('ok'),
-                      handler: value => {
-                        const body = { ...value, token: token, cid: id };
-                        return this.sendAction(action, body);
-                      },
-                    },
-                  ],
-                })
-                .then(alert => {
-                  alert.present();
-                  resolve();
-                });
-            })
-        ),
+        first(),
+        concatMap(([params, token, id]) => {
+          const dialogRef = this.dialog.open<ActionsDialogComponent>(
+            ActionsDialogComponent,
+            {
+              disableClose: true,
+              data: {
+                action: action,
+                params: params,
+              },
+            }
+          );
+          return dialogRef.afterClosed().pipe(
+            isNonNullable(),
+            tap(data =>
+              this.sendAction(action, { ...data, token: token, cid: id })
+            )
+          );
+        }),
         untilDestroyed(this)
       )
       .subscribe();

src/app/features/home/details/details.page.html

@@ -13,7 +13,10 @@
     </button>
   </ng-container>
   <button
-    *ngIf="(isFromSeriesPage$ | ngrxPush) === false"
+    *ngIf="
+      (isFromSeriesPage$ | ngrxPush) === false &&
+      (postCreationWorkflowCompleted$ | ngrxPush) === true
+    "
     (click)="openOptionsMenu()"
     mat-icon-button
   >

src/app/features/home/details/details.page.ts

@@ -26,6 +26,7 @@ import { ConfirmAlert } from '../../../shared/confirm-alert/confirm-alert.servic
 import { ContactSelectionDialogComponent } from '../../../shared/contact-selection-dialog/contact-selection-dialog.component';
 import { DiaBackendAssetRepository } from '../../../shared/dia-backend/asset/dia-backend-asset-repository.service';
 import { DiaBackendAuthService } from '../../../shared/dia-backend/auth/dia-backend-auth.service';
+import { DiaBackendWorkflowService } from '../../../shared/dia-backend/workflow/dia-backend-workflow.service';
 import { ErrorService } from '../../../shared/error/error.service';
 import { MediaStore } from '../../../shared/media/media-store/media-store.service';
 import { ProofRepository } from '../../../shared/repositories/proof/proof-repository.service';
@@ -85,7 +86,8 @@ export class DetailsPage {
               this.diaBackendAssetRepository,
               this.errorService,
               this.diaBackendAuthService,
-              this.translocoService
+              this.translocoService,
+              this.diaBackendWorkflowService
             )
         )
     )
@@ -103,7 +105,8 @@ export class DetailsPage {
               this.diaBackendAssetRepository,
               this.errorService,
               this.diaBackendAuthService,
-              this.translocoService
+              this.translocoService,
+              this.diaBackendWorkflowService
             )
         )
       )
@@ -119,7 +122,8 @@ export class DetailsPage {
         this.diaBackendAssetRepository,
         this.errorService,
         this.diaBackendAuthService,
-        this.translocoService
+        this.translocoService,
+        this.diaBackendWorkflowService
       ),
     ])
   );
@@ -173,6 +177,17 @@ export class DetailsPage {
 
   readonly isFromSeriesPage$ = this.type$.pipe(map(type => type === 'series'));
 
+  readonly postCreationWorkflowCompleted$ = combineLatest([
+    this.initialSlideIndex$,
+    this.detailedCaptures$,
+  ]).pipe(
+    map(
+      ([initialSlideIndex, detailedCaptures]) =>
+        detailedCaptures[initialSlideIndex]
+    ),
+    concatMap(detailedCapture => detailedCapture.postCreationWorkflowCompleted$)
+  );
+
   constructor(
     private readonly proofRepository: ProofRepository,
     private readonly mediaStore: MediaStore,
@@ -188,7 +203,8 @@ export class DetailsPage {
     private readonly confirmAlert: ConfirmAlert,
     private readonly blockingActionService: BlockingActionService,
     private readonly informationSessionService: InformationSessionService,
-    private readonly snackBar: MatSnackBar
+    private readonly snackBar: MatSnackBar,
+    private readonly diaBackendWorkflowService: DiaBackendWorkflowService
   ) {
     this.initializeActiveDetailedCapture$
       .pipe(untilDestroyed(this))

src/app/features/home/details/information/session/information-session.service.ts

@@ -1,12 +1,20 @@
 import { Injectable } from '@angular/core';
 import { TranslocoService } from '@ngneat/transloco';
 import { defer, of } from 'rxjs';
-import { catchError, first, map, shareReplay, switchMap } from 'rxjs/operators';
+import {
+  catchError,
+  concatMap,
+  first,
+  map,
+  shareReplay,
+  switchMap,
+} from 'rxjs/operators';
 import {
   DiaBackendAsset,
   DiaBackendAssetRepository,
 } from '../../../../../shared/dia-backend/asset/dia-backend-asset-repository.service';
 import { DiaBackendAuthService } from '../../../../../shared/dia-backend/auth/dia-backend-auth.service';
+import { DiaBackendWorkflowService } from '../../../../../shared/dia-backend/workflow/dia-backend-workflow.service';
 import { ErrorService } from '../../../../../shared/error/error.service';
 import { MediaStore } from '../../../../../shared/media/media-store/media-store.service';
 import {
@@ -180,13 +188,33 @@ export class DetailedCapture {
     return of(tokenInfo);
   });
 
+  readonly postCreationWorkflowCompleted$ = defer(() => {
+    if (this.proofOrDiaBackendAsset instanceof Proof) {
+      return this.diaBackendAsset$.pipe(
+        isNonNullable(),
+        concatMap(asset =>
+          this.diaBackendWorkflowService.getWorkflowById$(
+            asset.post_creation_workflow_id
+          )
+        ),
+        map(diaBackendWorkflow => diaBackendWorkflow.completed_at !== null)
+      );
+    }
+    return this.diaBackendWorkflowService
+      .getWorkflowById$(this.proofOrDiaBackendAsset.post_creation_workflow_id)
+      .pipe(
+        map(diaBackendWorkflow => diaBackendWorkflow.completed_at !== null)
+      );
+  });
+
   constructor(
     private readonly proofOrDiaBackendAsset: Proof | DiaBackendAsset,
     private readonly mediaStore: MediaStore,
     private readonly diaBackendAssetRepository: DiaBackendAssetRepository,
     private readonly errorService: ErrorService,
     private readonly diaBackendAuthService: DiaBackendAuthService,
-    private readonly translocoService: TranslocoService
+    private readonly translocoService: TranslocoService,
+    private readonly diaBackendWorkflowService: DiaBackendWorkflowService
   ) {}
 }
 

src/app/shared/actions/actions-dialog/actions-dialog.component.html

@@ -0,0 +1,20 @@
+<div *transloco="let t">
+  <h2 mat-dialog-title>{{ title }}</h2>
+  <p>{{ description }}</p>
+
+  <form [formGroup]="form">
+    <formly-form [form]="form" [fields]="fields" [model]="model"></formly-form>
+  </form>
+  <mat-dialog-actions align="end">
+    <button mat-button (click)="cancel()">{{ t('cancel') }}</button>
+    <button
+      mat-button
+      [disabled]="!form.valid"
+      color="primary"
+      cdkFocusInitial
+      (click)="send()"
+    >
+      {{ t('ok') }}
+    </button>
+  </mat-dialog-actions>
+</div>

src/app/shared/actions/actions-dialog/actions-dialog.component.spec.ts

@@ -0,0 +1,30 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { SharedTestingModule } from '../../shared-testing.module';
+import { ActionsDialogComponent } from './actions-dialog.component';
+
+describe('ActionsDialogComponent', () => {
+  let component: ActionsDialogComponent;
+  let fixture: ComponentFixture<ActionsDialogComponent>;
+
+  beforeEach(
+    waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [ActionsDialogComponent],
+        imports: [SharedTestingModule],
+        providers: [
+          { provide: MatDialogRef, useValue: {} },
+          { provide: MAT_DIALOG_DATA, useValue: {} },
+        ],
+      }).compileComponents();
+
+      fixture = TestBed.createComponent(ActionsDialogComponent);
+      component = fixture.componentInstance;
+      fixture.detectChanges();
+    })
+  );
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});