From 8aeaee3174bce6b4c0523cfccbe6de2011be3dd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Rinnetm=C3=A4ki?= <samuel@iki.fi>
Date: Wed, 24 Apr 2024 22:37:37 +0300
Subject: [PATCH] fixed form fields to correspond to the JSON schema (#71)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Samuel Rinnetmäki <samuel@iki.fi>
---
 .../wallets-add/wallets-add.component.html    | 47 ++++++++++++++++---
 .../app/wallets-add/wallets-add.component.ts  | 25 +++++-----
 .../wallets-list/wallets-list.component.html  |  2 +-
 3 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/viewer/src/app/wallets-add/wallets-add.component.html b/viewer/src/app/wallets-add/wallets-add.component.html
index 611fada..56f92c5 100644
--- a/viewer/src/app/wallets-add/wallets-add.component.html
+++ b/viewer/src/app/wallets-add/wallets-add.component.html
@@ -80,11 +80,6 @@ <h1 mat-dialog-title>Add wallet</h1>
       </mat-select>
       <mat-hint>{{ walletsService.getTooltip('type') }}</mat-hint>
     </mat-form-field>
-    <mat-form-field>
-      <mat-label>License</mat-label>
-      <input matInput placeholder="License" formControlName="license" />
-      <mat-hint>{{ walletsService.getTooltip('license') }}</mat-hint>
-    </mat-form-field>
     <mat-form-field>
       <mat-label>Capability</mat-label>
       <mat-select formControlName="capability" multiple>
@@ -94,11 +89,49 @@ <h1 mat-dialog-title>Add wallet</h1>
       </mat-select>
       <mat-hint>{{ walletsService.getTooltip('capability') }}</mat-hint>
     </mat-form-field>
+    <mat-form-field>
+      <mat-label>Web site URL</mat-label>
+      <input matInput placeholder="https://..." formControlName="urlWebsite" />
+      <mat-hint>{{ walletsService.getTooltip('urlWebsite') }}</mat-hint>
+    </mat-form-field>
+    <mat-form-field>
+      <mat-label>AppStore URL</mat-label>
+      <input matInput placeholder="https://apple.co/..." formControlName="urlAppStore" />
+      <mat-hint>{{ walletsService.getTooltip('urlAppStore') }}</mat-hint>
+    </mat-form-field>
+    <mat-form-field>
+      <mat-label>Google Play Store URL</mat-label>
+      <input matInput placeholder="https://play.google.com/store/apps/..." formControlName="urlGooglePlayStore" />
+      <mat-hint>{{ walletsService.getTooltip('urlGooglePlayStore') }}</mat-hint>
+    </mat-form-field>
+    <mat-form-field>
+      <mat-label>Web app URL</mat-label>
+      <input matInput placeholder="https://..." formControlName="urlWebApp" />
+      <mat-hint>{{ walletsService.getTooltip('urlWebApp') }}</mat-hint>
+    </mat-form-field>
+    <mat-form-field>
+      <mat-label>Open source?</mat-label>
+      <mat-select formControlName="openSource">
+        <mat-option value="true">Yes</mat-option>
+        <mat-option value="false">No</mat-option>
+      </mat-select>
+      <mat-hint>{{ walletsService.getTooltip('openSource') }}</mat-hint>
+    </mat-form-field>
+    <mat-form-field>
+      <mat-label>License</mat-label>
+      <input matInput placeholder="License" formControlName="license" />
+      <mat-hint>{{ walletsService.getTooltip('license') }}</mat-hint>
+    </mat-form-field>
+    <mat-form-field>
+      <mat-label>Source code</mat-label>
+      <input matInput placeholder="https://github.com/..." formControlName="downloadSource" />
+      <mat-hint>{{ walletsService.getTooltip('downloadSource') }}</mat-hint>
+    </mat-form-field>
     <mat-form-field>
       <mat-label>Portability</mat-label>
       <mat-select formControlName="portability">
-        <mat-option value="yes">Yes</mat-option>
-        <mat-option value="no">No</mat-option>
+        <mat-option value="true">Yes</mat-option>
+        <mat-option value="false">No</mat-option>
       </mat-select>
       <mat-hint>{{ walletsService.getTooltip('portability') }}</mat-hint>
     </mat-form-field>
diff --git a/viewer/src/app/wallets-add/wallets-add.component.ts b/viewer/src/app/wallets-add/wallets-add.component.ts
index c81968a..f762920 100644
--- a/viewer/src/app/wallets-add/wallets-add.component.ts
+++ b/viewer/src/app/wallets-add/wallets-add.component.ts
@@ -51,16 +51,20 @@ export class WalletsAddComponent implements OnInit {
   async ngOnInit(): Promise<void> {
     this.values = await this.walletsService.getDefinitions();
     this.form = new FormGroup({
+      capability: new FormControl([], [Validators.required]),
+      type: new FormControl(''),
       name: new FormControl('', [Validators.required]),
       logo: new FormControl(''),
       company: new FormControl('', [Validators.required]),
       companyUrl: new FormControl(''),
-      type: new FormControl('', [Validators.required]),
-      openSource: new FormControl(false, [Validators.required]),
-      license: new FormControl('', [Validators.required]),
-      capability: new FormControl([]),
-      portability: new FormControl(),
-      linkToApp: new FormControl(''),
+      urlWebsite: new FormControl('', [Validators.required]),
+      urlAppStore: new FormControl(''),
+      urlGooglePlayStore: new FormControl(''),
+      urlWebApp: new FormControl(''),
+      downloadSource: new FormControl(''),
+      openSource: new FormControl(false),
+      license: new FormControl(''),
+      portability: new FormControl(false),
     });
 
     this.walletsService.resources.forEach((resource) => {
@@ -73,11 +77,10 @@ export class WalletsAddComponent implements OnInit {
   }
 
   getJSON() {
-    return JSON.stringify(
-      { ...this.form.value, $schema: '../viewer/src/assets/schema.json' },
-      null,
-      2
-    );
+    const json = { ...this.form.value, $schema: '../viewer/src/assets/schema.json' }
+    json.openSource = json.openSource == "true" ? true : false
+    json.portability = json.portability == "true" ? true : false
+    return JSON.stringify(json, null, 2);
   }
   copy() {
     this.clipboard.copy(this.getJSON());
diff --git a/viewer/src/app/wallets-list/wallets-list.component.html b/viewer/src/app/wallets-list/wallets-list.component.html
index 5997aa5..464d330 100644
--- a/viewer/src/app/wallets-list/wallets-list.component.html
+++ b/viewer/src/app/wallets-list/wallets-list.component.html
@@ -102,7 +102,7 @@
               ><mat-icon>phone_iphone</mat-icon></a
             >
             <a
-              *ngIf="element.url"
+              *ngIf="element.urlWebApp"
               mat-icon-button
               [href]="element.urlWebApp"
               target="_blank"