Merge pull request #1422 from numbersprotocol/develop

Bump version to 0.52.0

Author: shc261392

.github/workflows/pre-release.yml

@@ -151,9 +151,77 @@ jobs:
           name: ios-build-number
           path: build/ios-build-number.txt
 
+  build-apks-upload-google-drive:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - folder_name: storage-dev-bubble-qa
+            storage_base_url: NUMBERS_STORAGE_DEV_BASE_URL
+            storage_trusted_client_key: NUMBERS_STORAGE_DEV_TRUSTED_CLIENT_KEY
+            bubble_db_url: NUMBERS_BUBBLE_DB_QA_URL
+          - folder_name: storage-qa-bubble-qa
+            storage_base_url: NUMBERS_STORAGE_QA_BASE_URL
+            storage_trusted_client_key: NUMBERS_STORAGE_QA_TRUSTED_CLIENT_KEY
+            bubble_db_url: NUMBERS_BUBBLE_DB_QA_URL
+          - folder_name: storage-prod-bubble-qa
+            storage_base_url: NUMBERS_STORAGE_BASE_URL
+            storage_trusted_client_key: NUMBERS_STORAGE_TRUSTED_CLIENT_KEY
+            bubble_db_url: NUMBERS_BUBBLE_DB_QA_URL
+          - folder_name: storage-dev-bubble-prod
+            storage_base_url: NUMBERS_STORAGE_DEV_BASE_URL
+            storage_trusted_client_key: NUMBERS_STORAGE_DEV_TRUSTED_CLIENT_KEY
+            bubble_db_url: NUMBERS_BUBBLE_DB_URL
+          - folder_name: storage-qa-bubble-prod
+            storage_base_url: NUMBERS_STORAGE_QA_BASE_URL
+            storage_trusted_client_key: NUMBERS_STORAGE_QA_TRUSTED_CLIENT_KEY
+            bubble_db_url: NUMBERS_BUBBLE_DB_URL
+          - folder_name: storage-prod-bubble-prod
+            storage_base_url: NUMBERS_STORAGE_BASE_URL
+            storage_trusted_client_key: NUMBERS_STORAGE_TRUSTED_CLIENT_KEY
+            bubble_db_url: NUMBERS_BUBBLE_DB_URL
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+
+      - name: Check if version has been updated
+        id: version_check
+        uses: EndBug/version-check@v2
+        with:
+          diff-search: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Ionic
+        env:
+          NUMBERS_STORAGE_BASE_URL: ${{ secrets[matrix.storage_base_url] }}
+          NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets[matrix.storage_trusted_client_key] }}
+          NUMBERS_BUBBLE_DB_URL: ${{ secrets[matrix.bubble_db_url] }}
+        run: |
+          npm install -g @ionic/cli
+          npm install
+          npm run build
+
+      - name: Build APKs
+        run: |
+          npx cap sync android
+          cd android/
+          ./gradlew assembleDebug
+
+      - name: Upload matrix build outputs to Google Drive
+        uses: numbersprotocol/action-google-drive@master
+        with:
+          skicka-tokencache-json: ${{ secrets.SKICKA_TOKENCACHE_JSON }}
+          google-client-id: ${{ secrets.SKICKA_GOOGLE_CLIENT_ID }}
+          google-client-secret: ${{ secrets.SKICKA_GOOGLE_CLIENT_SECRET }}
+          upload-from: ./android/app/build/outputs/apk/debug/
+          upload-to: /capture-lite/apk/${{ steps.version_check.outputs.version }}/${{ matrix.folder_name }}/
+
   create-github-release:
     runs-on: ubuntu-latest
-    needs: [deploy-play-store, deploy-app-store]
+    needs: [deploy-play-store, deploy-app-store, build-apks-upload-google-drive]
     steps:
       - uses: actions/checkout@v2
 

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.52.0 - 2022-03-25
+
+### Changed
+
+- Replace share option "Share C2PA Photo" with "Share Asset Profile"
+
+### Fixed
+
+- Prevent user from performing List in CaptureClub with the same asset twice.
+
 ## 0.51.1 - 2022-03-23
 
 ### Fixed

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "io.numbersprotocol.capturelite"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 341
-        versionName "0.51.1"
+        versionCode 350
+        versionName "0.52.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

package-lock.json

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

package.json

@@ -4,8 +4,8 @@ import { MatSnackBar } from '@angular/material/snack-bar';
 import { ActivatedRoute } from '@angular/router';
 import { TranslocoService } from '@ngneat/transloco';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { combineLatest, of } from 'rxjs';
-import { catchError, concatMap, first, map, tap } from 'rxjs/operators';
+import { combineLatest, forkJoin, of } from 'rxjs';
+import { catchError, concatMap, first, map, take, tap } from 'rxjs/operators';
 import { ActionsDialogComponent } from '../../../../shared/actions/actions-dialog/actions-dialog.component';
 import {
   Action,
@@ -14,13 +14,17 @@ import {
 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 { ErrorService } from '../../../../shared/error/error.service';
 import { OrderDetailDialogComponent } from '../../../../shared/order-detail-dialog/order-detail-dialog.component';
-import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
+import {
+  isNonNullable,
+  VOID$,
+} from '../../../../utils/rx-operators/rx-operators';
 
 @UntilDestroy()
 @Component({
@@ -34,7 +38,8 @@ export class ActionsPage {
     .pipe(catchError((err: unknown) => this.errorService.toastError$(err)));
 
   private readonly id$ = this.route.paramMap.pipe(
-    map(params => params.get('id'))
+    map(params => params.get('id')),
+    isNonNullable()
   );
 
   constructor(
@@ -47,9 +52,71 @@ export class ActionsPage {
     private readonly snackBar: MatSnackBar,
     private readonly dialog: MatDialog,
     private readonly storeService: DiaBackendStoreService,
-    private readonly orderHistoryService: OrderHistoryService
+    private readonly orderHistoryService: OrderHistoryService,
+    private readonly diaBackendStoreService: DiaBackendStoreService,
+    private readonly diaBackendSeriesRepository: DiaBackendSeriesRepository
   ) {}
 
+  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.hasListedInCaptureClub')
+            );
+          }
+          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.hasListedInCaptureClub'
+                )
+              );
+            }
+            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),
@@ -128,8 +195,13 @@ export class ActionsPage {
   }
 
   doAction(action: Action) {
-    this.openActionDialog$(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$(
             this.createOrder$(

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

@@ -36,6 +36,7 @@ import {
   switchTap,
   VOID$,
 } from '../../../utils/rx-operators/rx-operators';
+import { getAssetProfileUrl } from '../../../utils/url';
 import {
   DetailedCapture,
   InformationSessionService,
@@ -256,7 +257,7 @@ export class DetailsPage {
       this.activeDetailedCapture$.pipe(switchMap(c => c.diaBackendAsset$)),
       this.translocoService.selectTranslateObject({
         'message.copyIpfsAddress': null,
-        'message.shareC2paPhoto': null,
+        'message.shareAssetProfile': null,
       }),
     ])
       .pipe(
@@ -458,7 +459,8 @@ export class DetailsPage {
         concatMap(([detailedCapture, token]) =>
           defer(() =>
             Browser.open({
-              url: `https://authmedia.net/asset-profile?cid=${detailedCapture.id}&token=${token}`,
+              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+              url: getAssetProfileUrl(detailedCapture.id!, token),
               toolbarColor: '#564dfc',
             })
           )

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

@@ -10,13 +10,13 @@ import { BASE_URL } from '../secret';
   providedIn: 'root',
 })
 export class DiaBackendSeriesRepository {
-  private readonly fetchCollectedSeriesCount$ = this.fetch$({
+  private readonly fetchCollectedSeriesCount$ = this.fetchAll$({
     limit: 1,
     collected: true,
   }).pipe(pluck('count'));
 
   readonly fetchCollectedSeriesList$ = this.fetchCollectedSeriesCount$.pipe(
-    switchMap(count => this.fetch$({ limit: count, collected: true }))
+    switchMap(count => this.fetchAll$({ limit: count, collected: true }))
   );
 
   constructor(
@@ -28,23 +28,16 @@ export class DiaBackendSeriesRepository {
     return this.read$(id);
   }
 
-  private fetch$({
-    limit,
-    collected,
-  }: {
-    limit?: number;
-    collected?: boolean;
-  }) {
+  fetchAll$(
+    queryParams: {
+      limit?: number;
+      collected?: boolean;
+      offset?: number;
+    } = {}
+  ) {
     return defer(() => this.authService.getAuthHeaders()).pipe(
       concatMap(headers => {
-        let params = new HttpParams();
-
-        if (limit !== undefined) {
-          params = params.set('limit', `${limit}`);
-        }
-        if (collected !== undefined) {
-          params = params.set('collected', `${collected}`);
-        }
+        const params = new HttpParams({ fromObject: queryParams });
         return this.httpClient.get<PaginatedResponse<DiaBackendSeries>>(
           `${BASE_URL}/api/v3/series/`,
           { headers, params }
@@ -70,6 +63,7 @@ export interface DiaBackendSeries {
   readonly collections: {
     readonly assets: {
       readonly id: string;
+      readonly cid: string;
       readonly asset_file_thumbnail: string;
       readonly collected: boolean;
     }[];