Merge pull request #108 from hydroserver2/178-fix-fetch-metadata

178 fix fetch metadata

Author: kjlippold

src/composables/__tests__/useMetadata.spec.ts

@@ -38,7 +38,7 @@ let defaultThingId: string | null = 'thing1'
 const createDummyComponent = ({ thingId = defaultThingId } = {}) =>
   defineComponent({
     setup() {
-      return useMetadata(thingId, api)
+      return useMetadata(thingId, false, api)
     },
     template: '<div>{{sensors}}</div>',
   })

src/composables/useMetadata.ts

@@ -7,8 +7,19 @@ interface Api {
   fetchMetadataForThingOwner: (id: string) => Promise<DatastreamMetadata>
 }
 
-export function useMetadata(thingId?: string | null, api: Api = defaultApi) {
-  const metadata = ref<DatastreamMetadata | null>()
+/**
+ * Fetch metadata for a specific thing or its owner.
+ *
+ * @param {string | null} [thingId=null] - ID of the thing to fetch metadata for.
+ * @param {boolean} [forOwner=false] - Fetch metadata for the primary owner of this thing if true.
+ * @param {Api} [api=defaultApi] - API service for fetching metadata.
+ */
+export function useMetadata(
+  thingId?: string | null,
+  forOwner: boolean = false,
+  api: Api = defaultApi
+) {
+  const metadata = ref<DatastreamMetadata | null>(null)
 
   const sensors = computed(() => metadata.value?.sensors || [])
 
@@ -35,7 +46,9 @@ export function useMetadata(thingId?: string | null, api: Api = defaultApi) {
 
   const fetchMetadata = async (id: string) => {
     try {
-      metadata.value = await api.fetchMetadataForThing(id)
+      metadata.value = forOwner
+        ? await api.fetchMetadataForThingOwner(id)
+        : await api.fetchMetadataForThing(id)
     } catch (error) {
       console.error('Error fetching metadata', error)
     }

src/pages/DatastreamForm.vue

@@ -355,7 +355,7 @@ const {
   processingLevels,
   formattedProcessingLevels,
   fetchMetadata,
-} = useMetadata(thingId)
+} = useMetadata(thingId, true)
 
 const handleMetadataUploaded = async (dsKey: string, newId: string) => {
   await fetchMetadata(thingId)