From d1c8a3a11610c582762f691a01dc7c79742dcee1 Mon Sep 17 00:00:00 2001
From: Matt Hill <matthewonthemoon@gmail.com>
Date: Sat, 11 Dec 2021 14:08:59 -0700
Subject: [PATCH] closes #939

---
 .../form-object/form-object.component.html    |   4 +-
 .../form-object/form-object.component.ts      |  11 +-
 ui/src/app/services/api/api.fixures.ts        | 213 +++++++++++-------
 3 files changed, 144 insertions(+), 84 deletions(-)

diff --git a/ui/src/app/components/form-object/form-object.component.html b/ui/src/app/components/form-object/form-object.component.html
index 7e69cf043..f70fe67a8 100644
--- a/ui/src/app/components/form-object/form-object.component.html
+++ b/ui/src/app/components/form-object/form-object.component.html
@@ -91,7 +91,7 @@
         </ion-item-divider>
         <!-- body -->
         <div
-          [id]="entry.key"
+          [id]="getElementId(entry.key)"
           [ngStyle]="{
             'max-height': objectDisplay[entry.key].height,
             'overflow': 'hidden',
@@ -155,7 +155,7 @@
                 </ion-item>
                 <!-- nested body -->
                 <div
-                  [id]="entry.key"
+                  [id]="getElementId(entry.key)"
                   [ngStyle]="{
                     'max-height': objectListDisplay[entry.key][i].height,
                     'overflow': 'hidden',
diff --git a/ui/src/app/components/form-object/form-object.component.ts b/ui/src/app/components/form-object/form-object.component.ts
index e3103a702..da1161900 100644
--- a/ui/src/app/components/form-object/form-object.component.ts
+++ b/ui/src/app/components/form-object/form-object.component.ts
@@ -6,6 +6,7 @@ import { FormService } from 'src/app/services/form.service'
 import { Range } from 'src/app/pkg-config/config-utilities'
 import { EnumListPage } from 'src/app/modals/enum-list/enum-list.page'
 import { pauseFor } from 'src/app/util/misc.util'
+import { v4 } from 'uuid'
 const Mustache = require('mustache')
 
 @Component({
@@ -25,6 +26,8 @@ export class FormObjectComponent {
   unmasked: { [key: string]: boolean } = { }
   objectDisplay: { [key: string]: { expanded: boolean, height: string } } = { }
   objectListDisplay: { [key: string]: { expanded: boolean, height: string, displayAs: string }[] } = { }
+  private objectId = v4()
+
   Object = Object
 
   constructor (
@@ -247,11 +250,15 @@ export class FormObjectComponent {
     })
   }
 
-  private getDocSize (selected: string) {
-    const element = document.getElementById(selected)
+  private getDocSize (key: string) {
+    const element = document.getElementById(this.getElementId(key))
     return `${element.scrollHeight}px`
   }
 
+  getElementId (key: string): string {
+    return `${key}-${this.objectId}`
+  }
+
   async presentUnionTagDescription (name: string, description: string) {
 
     const alert = await this.alertCtrl.create({
diff --git a/ui/src/app/services/api/api.fixures.ts b/ui/src/app/services/api/api.fixures.ts
index 929cf5e27..26c3e36da 100644
--- a/ui/src/app/services/api/api.fixures.ts
+++ b/ui/src/app/services/api/api.fixures.ts
@@ -1,3 +1,4 @@
+import { ConfigSpec } from 'src/app/pkg-config/config-types'
 import { DependencyErrorType, DockerIoFormat, Manifest, PackageDataEntry, PackageMainStatus, PackageState } from 'src/app/services/patch-db/data-model'
 import { Log, MarketplacePkg, Metric, NotificationLevel, RR, ServerNotifications } from './api.types'
 
@@ -1363,9 +1364,7 @@ export module Mock {
     },
  }
 
-  export const ConfigSpec: RR.GetPackageConfigRes['spec'] = realWorldConfigSpec.spec
-
-  const testSpec = {
+  const testSpec: ConfigSpec = {
     'testnet': {
       'name': 'Testnet',
       'type': 'boolean',
@@ -1636,82 +1635,6 @@ export module Mock {
         },
       },
     },
-    'advanced': {
-      'name': 'Advanced',
-      'type': 'object',
-      'unique-by': null,
-      'description': 'Advanced settings',
-      'spec': {
-        'bitcoin-node': {
-          'name': 'Bitcoin Node Settings',
-          'type': 'union',
-          'unique-by': null,
-          'description': 'The node settings',
-          'default': 'internal',
-          'warning': 'Careful changing this',
-          'tag': {
-            'id': 'type',
-            'name': 'Type',
-            'variant-names': {
-              'internal': 'Internal',
-              'external': 'External',
-            },
-          },
-          'variants': {
-            'internal': {
-              'lan-address': {
-                'name': 'LAN Address',
-                'type': 'pointer',
-                'subtype': 'package',
-                'target': 'lan-address',
-                'package-id': 'bitcoind',
-                'description': 'the lan address',
-                'interface': 'interface',
-              },
-            },
-            'external': {
-              'public-domain': {
-                'name': 'Public Domain',
-                'type': 'string',
-                'description': 'the public address of the node',
-                'nullable': false,
-                'default': 'bitcoinnode.com',
-                'pattern': '.*',
-                'pattern-description': 'anything',
-                'masked': false,
-                'copyable': true,
-              },
-            },
-          },
-        },
-        'notifications': {
-          'name': 'Notification Preferences',
-          'type': 'list',
-          'subtype': 'enum',
-          'description': 'how you want to be notified',
-          'range': '[1,3]',
-          'default': [
-            'email',
-          ],
-          'spec': {
-            'value-names': {
-              'email': 'EEEEmail',
-              'text': 'Texxxt',
-              'call': 'Ccccall',
-              'push': 'PuuuusH',
-              'webhook': 'WebHooookkeee',
-            },
-            'values': [
-              'email',
-              'text',
-              'call',
-              'push',
-              'webhook',
-            ],
-          },
-        },
-      },
-    },
     'bitcoin-node': {
       'name': 'Bitcoin Node Settings',
       'type': 'union',
@@ -1800,9 +1723,139 @@ export module Mock {
         'copyable': false,
       },
     },
+    'advanced': {
+      'name': 'Advanced',
+      'type': 'object',
+      'unique-by': null,
+      'description': 'Advanced settings',
+      'spec': {
+        'notifications': {
+          'name': 'Notification Preferences',
+          'type': 'list',
+          'subtype': 'enum',
+          'description': 'how you want to be notified',
+          'range': '[1,3]',
+          'default': [
+            'email',
+          ],
+          'spec': {
+            'value-names': {
+              'email': 'EEEEmail',
+              'text': 'Texxxt',
+              'call': 'Ccccall',
+              'push': 'PuuuusH',
+              'webhook': 'WebHooookkeee',
+            },
+            'values': [
+              'email',
+              'text',
+              'call',
+              'push',
+              'webhook',
+            ],
+          },
+        },
+        'rpcsettings': {
+          'name': 'RPC Settings',
+          'type': 'object',
+          'unique-by': null,
+          'description': 'rpc username and password',
+          'warning': 'Adding RPC users gives them special permissions on your node.',
+          'spec': {
+            'laws': {
+              'name': 'Laws',
+              'type': 'object',
+              'unique-by': 'law1',
+              'description': 'the law of the realm',
+              'spec': {
+                'law1': {
+                  'name': 'First Law',
+                  'type': 'string',
+                  'description': 'the first law',
+                  'nullable': true,
+                  'masked': false,
+                  'copyable': true,
+                },
+                'law2': {
+                  'name': 'Second Law',
+                  'type': 'string',
+                  'description': 'the second law',
+                  'nullable': true,
+                  'masked': false,
+                  'copyable': true,
+                },
+              },
+            },
+            'rulemakers': {
+              'name': 'Rule Makers',
+              'type': 'list',
+              'subtype': 'object',
+              'description': 'the people who make the rules',
+              'range': '[0,2]',
+              'default': [],
+              'spec': {
+                'unique-by': null,
+                'spec': {
+                  'rulemakername': {
+                    'name': 'Rulemaker Name',
+                    'type': 'string',
+                    'description': 'the name of the rule maker',
+                    'nullable': false,
+                    'default': {
+                      'charset': 'a-g,2-9',
+                      'len': 12,
+                    },
+                    'masked': false,
+                    'copyable': false,
+                  },
+                  'rulemakerip': {
+                    'name': 'Rulemaker IP',
+                    'type': 'string',
+                    'description': 'the ip of the rule maker',
+                    'nullable': false,
+                    'default': '192.168.1.0',
+                    'pattern': '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$',
+                    'pattern-description': 'may only contain numbers and periods',
+                    'masked': false,
+                    'copyable': true,
+                  },
+                },
+              },
+            },
+            'rpcuser': {
+              'name': 'RPC Username',
+              'type': 'string',
+              'description': 'rpc username',
+              'nullable': false,
+              'default': 'defaultrpcusername',
+              'pattern': '^[a-zA-Z]+$',
+              'pattern-description': 'must contain only letters.',
+              'masked': false,
+              'copyable': true,
+            },
+            'rpcpass': {
+              'name': 'RPC User Password',
+              'type': 'string',
+              'description': 'rpc password',
+              'nullable': false,
+              'default': {
+                'charset': 'a-z,A-Z,2-9',
+                'len': 20,
+              },
+              'masked': true,
+              'copyable': true,
+            },
+          },
+        },
+      },
+    },
   }
 
-  export const MockConfig = realWorldConfigSpec.config
+  export const ConfigSpec: RR.GetPackageConfigRes['spec'] = testSpec
+  export const MockConfig = { }
+
+  // export const ConfigSpec: RR.GetPackageConfigRes['spec'] = realWorldConfigSpec.spec
+  // export const MockConfig = realWorldConfigSpec.config
 
   export const MockDependencyConfig = {
     testnet: true,