From 61c78534d8557eeab681879a3a308af012b81eed Mon Sep 17 00:00:00 2001
From: James Collins <james.collins@outlook.com.au>
Date: Mon, 28 Aug 2023 14:21:09 +1000
Subject: [PATCH] loading status and fixes

---
 app/Http/Controllers/Api/MediaController.php  |  2 +-
 resources/js/components/SMLoading.vue         |  9 +++++-
 .../js/components/dialogs/SMDialogMedia.vue   | 32 +++++++++++++------
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Api/MediaController.php b/app/Http/Controllers/Api/MediaController.php
index 1d39573..7439289 100644
--- a/app/Http/Controllers/Api/MediaController.php
+++ b/app/Http/Controllers/Api/MediaController.php
@@ -87,7 +87,7 @@ class MediaController extends ApiController
             'name' => $file->getClientOriginalName(),
             'size' => $file->getSize(),
             'mime_type' => $file->getMimeType(),
-            'status' => 'Creating Media',
+            'status' => 'Processing Media',
         ]);
 
         // We store images by default locally
diff --git a/resources/js/components/SMLoading.vue b/resources/js/components/SMLoading.vue
index 9abd25d..918f5eb 100644
--- a/resources/js/components/SMLoading.vue
+++ b/resources/js/components/SMLoading.vue
@@ -1,10 +1,17 @@
 <template>
-    <div class="flex flex-items-center justify-center">
+    <div class="flex flex-col flex-items-center justify-center">
         <div :class="['spinner', { small: props.small }]"></div>
+        <div v-if="slots.default" :class="['mt-3', { small: props.small }]">
+            <slot name="default"></slot>
+        </div>
     </div>
 </template>
 
 <script setup lang="ts">
+import { useSlots } from "vue";
+
+const slots = useSlots();
+
 const props = defineProps({
     small: {
         type: Boolean,
diff --git a/resources/js/components/dialogs/SMDialogMedia.vue b/resources/js/components/dialogs/SMDialogMedia.vue
index 84cc00c..e1370ca 100644
--- a/resources/js/components/dialogs/SMDialogMedia.vue
+++ b/resources/js/components/dialogs/SMDialogMedia.vue
@@ -140,13 +140,16 @@
                                                 { 'mb-6': showMediaName(item) },
                                             ]"
                                             :style="{
-                                                backgroundImage: `url('${mediaGetThumbnail(
-                                                    item,
-                                                    null,
-                                                    itemRequiresRefresh(
-                                                        item.id,
-                                                    ),
-                                                )}')`,
+                                                backgroundImage:
+                                                    item.status === 'OK'
+                                                        ? `url('${mediaGetThumbnail(
+                                                              item,
+                                                              null,
+                                                              itemRequiresRefresh(
+                                                                  item.id,
+                                                              ),
+                                                          )}')`
+                                                        : 'initial',
                                                 backgroundColor:
                                                     item.status === 'OK'
                                                         ? 'initial'
@@ -165,7 +168,16 @@
                                                     ) === false
                                                 "
                                                 small
-                                                class="bg-white bg-op-90 w-full h-full" />
+                                                class="bg-white bg-op-90 w-full h-full"
+                                                >{{
+                                                    item.status.split(":")
+                                                        .length > 1
+                                                        ? item.status
+                                                              .split(":")[1]
+                                                              .trim()
+                                                        : item.status
+                                                }}</SMLoading
+                                            >
                                             <div
                                                 v-if="
                                                     item.status.startsWith(
@@ -947,6 +959,8 @@ const updateFiles = async () => {
                         if (updateResult.data) {
                             const updateData =
                                 updateResult.data as MediaResponse;
+                            mediaItems.value[index].status =
+                                updateData.medium.status;
                             if (updateData.medium.status == "OK") {
                                 mediaItems.value[index] = updateData.medium;
                                 forceRefresh.push(updateData.medium.id);
@@ -996,7 +1010,7 @@ const updateFiles = async () => {
             updateFilesNonce.value = setTimeout(() => {
                 updateFilesNonce.value = null;
                 updateFiles();
-            }, 2000);
+            }, 1000);
         } else {
             updateFilesNonce.value = null;
         }