Merge pull request #167 from rakutentech/feature/sanctum

(v2.9) allow empty json responses

Author: kevincobain2000

README.md

@@ -195,13 +195,9 @@ Fixing lints
 - v2.8 Show full activity on Eloquent models
 
 
-# Maintainers
+# Contributors
 
-<table>
-  <tr>
-    <td align="center"><a href="https://kevincobain2000.github.io"><img src="https://avatars2.githubusercontent.com/u/629055?v=4" width="100px;" alt=""/><br /><sub><b>Pulkit Kathuria</b></sub></a><br /><a href="https://github.com/kevincobain2000/laravel-alert-notifications/pulls?q=is%3Apr+reviewed-by%3Akevincobain2000" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/kevincobain2000/laravel-alert-notifications/commits?author=kevincobain2000" title="Tests">⚠️</a> <a href="https://github.com/kevincobain2000/laravel-alert-notifications/commits?author=kevincobain2000" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/kitloong"><img src="https://avatars2.githubusercontent.com/u/7660346?v=4" width="100px;" alt=""/><br /><sub><b>Kit Loong</b></sub></a><br /><a href="https://github.com/kevincobain2000/laravel-alert-notifications/pulls?q=is%3Apr+reviewed-by%3Akitloong" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/kevincobain2000/laravel-alert-notifications/commits?author=kitloong" title="Tests">⚠️</a> <a href="https://github.com/kevincobain2000/laravel-alert-notifications/commits?author=kitloong" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/truongns"><img src="https://avatars2.githubusercontent.com/u/11814875?v=4" width="100px;" alt=""/><br /><sub><b>Truong Nguyen</b></sub></a><br /><a href="https://github.com/kevincobain2000/laravel-alert-notifications/pulls?q=is%3Apr+reviewed-by%3Atruongns" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/kevincobain2000/laravel-alert-notifications/commits?author=truongns" title="Tests">⚠️</a> <a href="https://github.com/kevincobain2000/laravel-alert-notifications/commits?author=truongns" title="Code">💻</a></td>
-  </tr>
-</table>
 
+<a href="https://github.com/rakutentech/laravel-request-docs/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=rakutentech/laravel-request-docs" />
+</a>

ui/src/components/ApiAction.tsx

@@ -129,8 +129,15 @@ export default function ApiAction(props: Props) {
                 setResponseStatus(response.status)
                 setResponseHeaders(JSON.stringify(Object.fromEntries(response.headers), null, 2))
                 setSendingRequest(false)
-                return response.json();
+                return response.text()
             }).then((data) => {
+                let isJson = true
+                try {
+                    data = JSON.parse(data)
+                } catch (error: any) {
+                    isJson = false
+                    // do nothing
+                }
 
                 if (data && data._lrd && data._lrd.queries) {
                     const sqlQueries = data._lrd.queries.map((query: any) => {
@@ -164,7 +171,12 @@ export default function ApiAction(props: Props) {
                 if (data && data._lrd) {
                     delete data._lrd
                 }
-                setResponseData(JSON.stringify(data, null, 2))
+                if (isJson) {
+                    setResponseData(JSON.stringify(data, null, 2))
+                } else {
+                    setResponseData(data)
+                }
+
                 setActiveTab('response')
             }).catch((error) => {
                 setError("Response error: " + error)

ui/src/components/elements/ApiActionTabs.tsx

@@ -61,7 +61,7 @@ export default function ApiActionTabs(props: Props) {
                 <TableCellsIcon className='inline-block w-5 h-5 mr-1' /> Events
                 {responseStatus != 0 && (
                     <div className="ml-1 badge badge-xs badge-warning">
-                        {Object.keys(modelsData).length}
+                        {(modelsData && modelsData.modelsSummary) ? Object.keys(modelsData.modelsSummary).length : 0}
                     </div>
                 )}
             </a>

ui/src/global.css

@@ -102,7 +102,7 @@ td {
     @apply badge-ghost;
 }
 
-.badge-200,.badge-201,.badge-202,.response-204,  {
+.badge-200,.badge-201,.badge-202,.response-204  {
     @apply bg-success;
 }