Fix for optional values being added without overwriting previous entries (Issue 1816)

[awjh-ibm]

#1816

Fix to keep user's previously entered data for fields when the user ticks the optional data checkbox. Optional data is discarded when box is unticked to match possible solution 3 of the issue.

Work performed:

• Added function to go through the optional data JSON and existing data JSON and use values from existing data for the key of the optional data, including treating each key in sub objects individually.
• Wrote tests to test new function worked and that existing functions called it when needed.
• Manually verified functionality in local build of playground

[cazfletch]

When i press the generate random data button nothing happens

[awjh-ibm]

Updated code to fix generate code issue

Changes requested have since been committed

[cazfletch]

@awjh-ibm can you fix the conflicts please?

[cazfletch]

@awjh-ibm i'd expect this to work for non optional properties too. So if i enter some data then press the generate random button i'd expect the properties i have already set to keep their values too not just optional ones

new reviw needed

[cazfletch]

If you show the optional properties then generate random data, then edit one of the optional properties, then generate random data, the property changed previosuly will be overwriten

[bestbeforetoday]

@caroline-church Note that this issue is not intended to change the behaviour of random data generation; just the behaviour of ticking and un-ticking the Optional properties checkbox. See the discussion in #1816

To recap, the behaviour suggested is simply:

Ticking the Optional Properties checkbox adds any missing optional properties, using "empty" values; existing property values are left unchanged. Unticking the checkbox removes any optional properties that have been defined.

[cazfletch]

I know but it is related and he has already fixed other properties when generating random data just not for optional properties.

…

On Fri, 27 Oct 2017 at 17:49, Mark S. Lewis ***@***.***> wrote: Note that this issue is not intended to change the behaviour of random data generation; just the behaviour of ticking and un-ticking the *Optional properties* checkbox. See the discussion in #1816 <https://github.com/hyperledger/composer/issues/1816> — You are receiving this because your review was requested. Reply to this email directly, view it on GitHub <https://github.com/hyperledger/composer/pull/2322#issuecomment-340024044>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AV-gMQs9S9VyQ61YRfJfv_ctvLaBEtNoks5swgjMgaJpZM4PyfkU> .