Merge branch 'dev' of http://134.175.228.187:10880/kyle/autocde2.0 into dev

app/Http/Requests/API/File/KeepDirectoryUploadRequest.php

@@ -42,7 +42,7 @@ class KeepDirectoryUploadRequest extends FormRequest
             $rules['uuid'] = "required|max:40";
         }
 
-        $extensions = ['txt', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'zip', 'wps', 'docx', 'doc'];
+        $extensions = ['jpg','txt', 'jpeg', 'png', 'gif', 'pdf', 'xls', 'xlsx', 'zip', 'wps', 'docx', 'doc'];
         if ($this->request->get("object_type") == FileObjectType::CONTAINER->value) {
             $extensions = [...$extensions, ...config("bim.extensions")];
         }

app/Http/Resources/API/ApprovalFlowDetailResource.php

@@ -29,7 +29,8 @@ class ApprovalFlowDetailResource extends JsonResource
         foreach ($this->nodes as $node) {
             $userObjects = [];
             foreach ($node['approval_users'] as $userId) {
-                $userObjects[] = new UserProfileResource($users->get($userId));
+                //$userObjects[] = new UserProfileResource($users->get($userId));
+                $userObjects[] = $userId;
             }
 
             $node['approval_users'] = $userObjects;