From 96ca097c7194597f32fd33e0cdbe8c777139fd16 Mon Sep 17 00:00:00 2001
From: Bob Steers <steers.bob@gmail.com>
Date: Mon, 1 Jul 2024 22:22:34 +0200
Subject: [PATCH] fix prop use in analog array editor

---
 src/plugins/spark/components/widget/AnalogArrayEditor.vue  | 2 +-
 src/plugins/spark/features/GpioModule/GpioModuleWidget.vue | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/spark/components/widget/AnalogArrayEditor.vue b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
index cf52f20b1..be201bd9c 100644
--- a/src/plugins/spark/components/widget/AnalogArrayEditor.vue
+++ b/src/plugins/spark/components/widget/AnalogArrayEditor.vue
@@ -22,7 +22,7 @@ const props = defineProps<Props>();
 
 const existingSensors = computed<{ [channelId: number]: Block[] }>(() => {
   const sensors = sparkStore
-    .blocksByType(props.serviceId, BlockOrIntfType.TempSensorAnalog)
+    .blocksByType(props.address.serviceId, BlockOrIntfType.TempSensorAnalog)
     .filter((block) => block.data.analogDevice.id === props.address.id);
   return props.channels.reduce((acc, channel) => {
     acc[channel.id] = sensors.filter(
diff --git a/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
index 40fce18f5..d5de15ad5 100644
--- a/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
+++ b/src/plugins/spark/features/GpioModule/GpioModuleWidget.vue
@@ -9,6 +9,7 @@ import {
 import { computed } from 'vue';
 import { useContext } from '@/composables';
 import { useBlockWidget } from '@/plugins/spark/composables';
+import { asBlockAddress } from '@/plugins/spark/utils/configuration';
 import { createDialogPromise } from '@/utils/dialog';
 
 /**
@@ -19,8 +20,7 @@ function listedPins(pins: GpioPins): number[] {
 }
 
 const { context } = useContext.setup();
-const { serviceId, block, patchBlock } =
-  useBlockWidget.setup<GpioModuleBlock>();
+const { block, patchBlock } = useBlockWidget.setup<GpioModuleBlock>();
 
 const power = computed<boolean>({
   get: () => block.value.data.useExternalPower,
@@ -143,8 +143,7 @@ const errors = computed<string[]>(() => {
         <q-separator />
         <AnalogArrayEditor
           v-model:channels="analogChannels"
-          :service-id="serviceId"
-          :block-id="block.id"
+          :address="asBlockAddress(block)"
         />
       </template>
       <div class="col-break" />