improve error display on early errors

Author: mki-c2c

backend/maelstro/core/copy_manager.py

@@ -114,18 +114,20 @@ def copy_preview(
                 for layer in layers.values():
                     styles.update(self.get_styles_from_layer(layer).keys())
 
-            preview["geoserver_resources"].append(
-                {
-                    "src": server_url,
-                    "dst": dst_gs_url,
-                    "layers": (
-                        [str(layer_name) for layer_name in layer_names]
-                        if self.include_layers
-                        else []
-                    ),
-                    "styles": list(styles) if self.include_styles else [],
-                }
-            )
+            if layer_names or styles:
+                # only output servers where some layers or styles have been identified
+                preview["geoserver_resources"].append(
+                    {
+                        "src": server_url,
+                        "dst": dst_gs_url,
+                        "layers": (
+                            [str(layer_name) for layer_name in layer_names]
+                            if self.include_layers
+                            else []
+                        ),
+                        "styles": list(styles) if self.include_styles else [],
+                    }
+                )
 
         return CopyPreview(**preview)  # type: ignore
 

frontend/src/services/synchronize.service.ts

@@ -28,8 +28,15 @@ export type CopyPreviewGeoserver = {
 }
 
 export type CopyPreview = {
-  geonetwork_resources: CopyPreviewGeonetwork[]
-  geoserver_resources: CopyPreviewGeoserver[]
+  geonetwork_resources?: CopyPreviewGeonetwork[]
+  geoserver_resources?: CopyPreviewGeoserver[]
+  info?: string
+  operations?: LogDetail[]
+}
+
+export type CopyResponse = {
+  info: string
+  operations: LogDetail[]
 }
 
 function toSynchronizeParams(params: SynchronizeParams): URLSearchParams {
@@ -47,14 +54,14 @@ export const synchronizeService = {
     return await response.json()
   },
 
-  async synchronize(params: SynchronizeParams): Promise<LogDetail[]> {
+  async synchronize(params: SynchronizeParams): Promise<CopyResponse> {
     const response = await fetch('/maelstro-backend/copy?' + toSynchronizeParams(params), {
       method: 'PUT',
       headers: {
         Accept: 'application/json',
         'Content-Type': 'application/json',
       },
     })
-    return (await response.json()).operations
+    return await response.json()
   },
 }

frontend/src/views/FormView.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import LogsReport from '@/components/LogsReport.vue'
 import type { SearchResult } from '@/services/geonetworkSearch.service'
-import type { LogDetail } from '@/services/logs.service'
 import {
   synchronizeService,
   type CopyPreview,
+  type CopyResponse,
   type SynchronizeParams,
 } from '@/services/synchronize.service'
 import { useConfigStore } from '@/stores/config.store'
@@ -57,7 +57,7 @@ const copyPreview = ref<CopyPreview>({
   geoserver_resources: [],
 })
 
-const logs = ref<LogDetail[]>([])
+const copyResponse = ref<CopyResponse>({})
 
 const synchronizeParams = computed(
   () =>
@@ -98,14 +98,16 @@ const confirm = async () => {
   } as unknown as SynchronizeParams
 
   try {
-    logs.value = await synchronizeService.synchronize(params)
+    copyResponse.value = await synchronizeService.synchronize(params)
   } catch (error) {
     console.error(error)
   } finally {
     isRunning.value = false
   }
 }
 
+const logs = computed(() => copyPreview.value.operations || copyResponse.value.operations || [])
+
 const backToForm = () => {
   confirmation.value = false
   logs.value = []
@@ -124,12 +126,13 @@ const metaFailed = computed(() => metaLogs.value.some((l) => l.status != 'OK'))
 const layerFailed = computed(() => layerLogs.value.some((l) => l.status != 'OK'))
 const styleFailed = computed(() => styleLogs.value.some((l) => l.status != 'OK'))
 
-const hasMeta = computed(() => copyPreview.value.geonetwork_resources.some((gn) => gn.metadata.length > 0))
-const hasLayers = computed(() => copyPreview.value.geoserver_resources.some((gs) => gs.layers.length > 0))
-const hasStyles = computed(() => copyPreview.value.geoserver_resources.some((gs) => gs.styles.length > 0))
+const hasMeta = computed(() => copyPreview.value.geonetwork_resources?.some((gn) => gn.metadata.length > 0))
+const hasLayers = computed(() => copyPreview.value.geoserver_resources?.some((gs) => gs.layers.length > 0))
+const hasStyles = computed(() => copyPreview.value.geoserver_resources?.some((gs) => gs.styles.length > 0))
 
 const success = computed(() => (
-  (!hasMeta.value || metaSuccessful.value)
+  (metaSuccessful.value || layerSuccessful.value || styleSuccessful.value)
+  && (!hasMeta.value || metaSuccessful.value)
   && (!hasLayers.value || layerSuccessful.value)
   && (!hasStyles.value || styleSuccessful.value)
 ))
@@ -220,7 +223,7 @@ const success = computed(() => (
 
         <div
           class="mt-4 p-4 border rounded shadow"
-          v-for="(geonetwork, index) in copyPreview.geonetwork_resources"
+          v-for="(geonetwork, index) in copyPreview.geonetwork_resources || []"
           :key="index"
         >
           <div class="my-1">{{ $t('Source:') }} {{ geonetwork.src }}</div>
@@ -240,7 +243,7 @@ const success = computed(() => (
 
         <div
           class="mt-4 p-4 border rounded shadow"
-          v-for="(server, index) in copyPreview.geoserver_resources"
+          v-for="(server, index) in copyPreview.geoserver_resources || []"
           :key="index"
         >
           <div class="my-1">{{ $t('Source:') }} {{ server.src }}</div>
@@ -281,6 +284,16 @@ const success = computed(() => (
           <template #header>
             <div class="my-1">{{ success ? $t('Success') + ' ✅' : $t('Failure') + ' ❌' }}</div>
           </template>
+          <div v-if="!success">
+            <div v-if="copyPreview.info.err">
+              {{ copyPreview.info.err }} [{{ copyPreview.info.status_code }}]<br>
+              {{ copyPreview.info.server }}
+            </div>
+            <div v-else>
+              {{ copyResponse.info.err }} [{{ copyResponse.info.status_code }}]<br>
+              {{ copyResponse.info.server }}
+            </div>
+          </div>
           <LogsReport :logs="logs"></LogsReport>
         </Panel>
       </div>