There were more than one values for the same property in the saved data.

atsushieno · Mar 5, 2024 · 081ee9a · 081ee9a
1 parent 05697ca
commit 081ee9a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/ktmidi-ci-tool/src/commonMain/kotlin/dev/atsushieno/ktmidi/citool/view/PropertyViews.kt b/ktmidi-ci-tool/src/commonMain/kotlin/dev/atsushieno/ktmidi/citool/view/PropertyViews.kt
@@ -320,6 +320,7 @@ fun PropertyValueEditor(isLocalEditor: Boolean,
         }
 
         if (isTextRenderable) {
+            // FIXME: we have state loss problem here, value vanishes after "Commit changes"
             val bodyText = MidiCIConverter.decodeASCIIToString(body.toByteArray().decodeToString())
             if (isEditable) {
                 Row(verticalAlignment = Alignment.CenterVertically) {

diff --git a/ktmidi-ci/src/commonMain/kotlin/dev/atsushieno/ktmidi/ci/ObservablePropertyList.kt b/ktmidi-ci/src/commonMain/kotlin/dev/atsushieno/ktmidi/ci/ObservablePropertyList.kt
@@ -154,7 +154,9 @@ class ServiceObservablePropertyList(values: MutableList<PropertyValue>, private
 
     init {
         initializeCatalogUpdatedEvent()
-        internalValues.addAll(propertyService.getMetadataList() ?.map {
+        internalValues.addAll(propertyService.getMetadataList()
+            ?.filter { p -> !internalValues.any { v -> v.id == p.propertyId } }
+            ?.map {
             PropertyValue(it.propertyId, it.mediaTypes?.firstOrNull() ?: "", listOf())
         } ?: listOf())
     }

diff --git a/...onMain/kotlin/dev/atsushieno/ktmidi/ci/propertycommonrules/PropertyCommonRules.Service.kt b/...onMain/kotlin/dev/atsushieno/ktmidi/ci/propertycommonrules/PropertyCommonRules.Service.kt
@@ -61,7 +61,7 @@ class CommonRulesPropertyService(private val device: MidiCIDevice)
         get() = device.config.jsonSchemaString
         @JvmName("set_jsonSchemaString")
         set(value) { device.config.jsonSchemaString = value }
-    private val values
+    private val values: List<PropertyValue>
         @JvmName("get_propertyValues")
         get() = device.config.propertyValues
     private val metadataList
@@ -289,7 +289,7 @@ class CommonRulesPropertyService(private val device: MidiCIDevice)
         else if (existing != null)
             existing.body = decodedBody
         else
-            values.add(PropertyValue(header.resource, header.mediaType ?: CommonRulesKnownMimeTypes.APPLICATION_JSON, decodedBody))
+            device.config.propertyValues.add(PropertyValue(header.resource, header.mediaType ?: CommonRulesKnownMimeTypes.APPLICATION_JSON, decodedBody))
         return Result.success(getReplyHeaderJson(PropertyCommonReplyHeader(PropertyExchangeStatus.OK)))
     }