From 849cd28bcb6ab04c838651bc77d4ef96b073fe63 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Tue, 14 Jun 2022 21:36:35 -0500
Subject: [PATCH] Slightly easier validation page error access (#14044)

---
 resources/lang/en/validation.php         |  2 +-
 resources/views/validate/index.blade.php | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index dc1274842e..5ba7e498e3 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -164,7 +164,7 @@ return [
         'fix' => 'Fix',
         'fixed' => 'Fix has completed, refresh to re-run validations.',
         'fetch_failed' => 'Failed to fetch validation results',
-        'backend_failed' => 'Failed to load data from backend, check webserver.',
+        'backend_failed' => 'Failed to load data from backend, check console for error.',
         'invalid_fixer' => 'Invalid Fixer',
         'show_all' => 'Show all',
         'show_less' => 'Show less',
diff --git a/resources/views/validate/index.blade.php b/resources/views/validate/index.blade.php
index 0b4ae30a93..8d1860ded4 100644
--- a/resources/views/validate/index.blade.php
+++ b/resources/views/validate/index.blade.php
@@ -3,9 +3,17 @@
 @section('title', __('validation.results.validate'))
 
 @section('content')
-    <div x-data="{results: [], listItems: 10, errorMessage: ''}"
-         x-init="fetch('{{ route('validate.results') }}').then(response => response.json().then(data => results = data).catch(error => errorMessage=(error instanceof SyntaxError)?'{{ trans('validation.results.backend_failed') }}':error))"
-         >
+    <div x-data="{results: [], listItems: 10, errorMessage: ''}" x-init="fetch('{{ route('validate.results') }}')
+                .then(response => {
+                    if (response.ok) {
+                        response.json()
+                            .then(data => results = data)
+                            .catch(error => errorMessage = (error instanceof SyntaxError ? '{{ trans('validation.results.backend_failed') }}' : error))
+                    } else {
+                        errorMessage = '{{ trans('validation.results.backend_failed') }}';
+                        response.text().then(console.log);
+                    }
+                });">
         <div class="tw-grid tw-place-items-center" style="height: 80vh" x-show="! results.length">
             <h3 x-show="! errorMessage"><i class="fa-solid fa-spinner fa-spin"></i> {{ __('validation.results.validating') }}</h3>
             <div x-show="errorMessage" class="panel panel-danger">