Show correct file upload status

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 # These users will be the default owners for everything in the repo.
 # Unless a later match takes precedence, the following users will be
 # requested for review when someone opens a pull request.
-* @jujaga @kyle1morel @TimCsaky @wilwong89 @jatindersingh93 @norrisng-bc
+* @kyle1morel @TimCsaky @wilwong89 @jatindersingh93 @norrisng-bc

frontend/src/components/object/ObjectUpload.vue

@@ -63,7 +63,7 @@ const onUpload = async (event: any) => {
           );
           successfulFiles.value.push(file);
         } catch (error: any) {
-          toast.error(`Failed to upload file ${file.name}`, error);
+          toast.error(`Failed to upload file ${file.name}`, error, {life: 0});
           failedFiles.value.push(file);
         } finally {
           appStore.endUploading();
@@ -156,18 +156,8 @@ const submitObjectMetaTagConfig = (values: Array<ObjectMetadataTagFormType>) =>
         />
         <p class="mt-4 mb-0">Drag and drop files here to select for upload. Then click "Start upload".</p>
       </div>
-      <ObjectUploadFile
-        :files="successfulFiles"
-        :badge-props="{ value: 'Complete', severity: 'success' }"
-        :remove-callback="onRemoveUploadedFile"
-      />
-      <ObjectUploadFile
-        :files="failedFiles"
-        :badge-props="{ value: 'Failed', severity: 'danger' }"
-        :remove-callback="onRemoveFailedFile"
-      />
     </template>
-    <template #content="{ files, uploadedFiles, removeFileCallback, removeUploadedFileCallback }">
+    <template #content="{ files, removeFileCallback }">
       <ObjectUploadFile
         :editable="true"
         :files="files || pendingFiles"
@@ -177,14 +167,14 @@ const submitObjectMetaTagConfig = (values: Array<ObjectMetadataTagFormType>) =>
         @submit-object-metadatatag-config="submitObjectMetaTagConfig"
       />
       <ObjectUploadFile
-        :files="uploadedFiles || successfulFiles"
+        :files="successfulFiles"
         :badge-props="{ value: 'Complete', severity: 'success' }"
-        :remove-callback="removeUploadedFileCallback"
+        :remove-callback="onRemoveUploadedFile"
       />
       <ObjectUploadFile
         :files="failedFiles"
         :badge-props="{ value: 'Failed', severity: 'danger' }"
-        :remove-callback="removeUploadedFileCallback"
+        :remove-callback="onRemoveFailedFile"
       />
     </template>
   </FileUpload>

frontend/src/store/objectStore.ts

@@ -51,7 +51,7 @@ export const useObjectStore = defineStore('object', () => {
     },
     axiosOptions?: AxiosRequestConfig
   ) {
-    try {
+    try{
       appStore.beginIndeterminateLoading();
 
       // Ensure x-amz-meta- prefix exists
@@ -64,11 +64,11 @@ export const useObjectStore = defineStore('object', () => {
       }
 
       await objectService.createObject(object, headers, params, axiosOptions);
-    } catch (error: any) {
-      if (error?.response?.status === 409) {
-        toast.error('Creating object', 'File already exists');
+    } catch(error: any) {
+      if (error.response?.status === 409){
+        throw new Error(error.response.data.detail);
       } else {
-        toast.error('Creating object', error);
+        throw new Error('Network error');
       }
     } finally {
       appStore.endIndeterminateLoading();