From a563fa27c7591f020dd02c08c745cc3b0bacc038 Mon Sep 17 00:00:00 2001
From: Kristaps Fabians Geikins <fabians@speckle.systems>
Date: Mon, 8 Jan 2024 11:34:31 +0200
Subject: [PATCH] a couple of random FE2 fixes reported on Discord (#1943)

* fix(fe2): clearer error msg on failed upload

* fix(fe2): missing project.commentThreads access w/ admin override
---
 .../components/project/CardImportFileArea.vue          |  2 +-
 packages/frontend-2/lib/core/api/fileImport.ts         | 10 ++++++++++
 .../server/modules/comments/services/management.ts     |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/frontend-2/components/project/CardImportFileArea.vue b/packages/frontend-2/components/project/CardImportFileArea.vue
index f3dd08d11..27606b8ad 100644
--- a/packages/frontend-2/components/project/CardImportFileArea.vue
+++ b/packages/frontend-2/components/project/CardImportFileArea.vue
@@ -23,7 +23,7 @@
           v-if="errorMessage"
           class="text-danger inline-flex space-x-1 items-center text-center"
         >
-          <ExclamationTriangleIcon class="h-4 w-4" />
+          <ExclamationTriangleIcon class="h-4 w-4 shrink-0" />
           <span>{{ errorMessage }}</span>
         </span>
         <div
diff --git a/packages/frontend-2/lib/core/api/fileImport.ts b/packages/frontend-2/lib/core/api/fileImport.ts
index 56b03bf77..95552aca3 100644
--- a/packages/frontend-2/lib/core/api/fileImport.ts
+++ b/packages/frontend-2/lib/core/api/fileImport.ts
@@ -51,6 +51,16 @@ export function importFile(
   })
 
   request.addEventListener('load', () => {
+    if (!request.response) {
+      return rejectResponse(
+        new Error(
+          `Upload failed${
+            request.status ? ' with code ' + request.status : ''
+          } - no response`
+        )
+      )
+    }
+
     const uploadResults =
       (request.response as Optional<PostBlobResponse>)?.uploadResults || []
     const result = uploadResults.find((r) => r.formKey === formKey)
diff --git a/packages/server/modules/comments/services/management.ts b/packages/server/modules/comments/services/management.ts
index d0c6af991..1748b0be5 100644
--- a/packages/server/modules/comments/services/management.ts
+++ b/packages/server/modules/comments/services/management.ts
@@ -39,6 +39,7 @@ import {
   formatSerializedViewerState,
   inputToDataStruct
 } from '@/modules/comments/services/data'
+import { adminOverrideEnabled } from '@/modules/shared/helpers/envHelper'
 
 export async function authorizeProjectCommentsAccess(params: {
   projectId: string
@@ -60,6 +61,7 @@ export async function authorizeProjectCommentsAccess(params: {
   if (!project.isPublic && !project.role) success = false
   if (requireProjectRole && !project.role && !project.allowPublicComments)
     success = false
+  if (adminOverrideEnabled() && authCtx.role === Roles.Server.Admin) success = true
 
   if (!success) {
     throw new StreamInvalidAccessError('You are not authorized')