From 060526172f6a54cee0096b80429a46829fdf496c Mon Sep 17 00:00:00 2001
From: = <kushal.sentientgeeks@outlook.com>
Date: Thu, 21 May 2026 10:48:05 +0000
Subject: [PATCH] Fix: broken Apps in User list

- make `ConnectedAppPermissionEnum` nullable and enhance role display formatting
---
 app/Data/Permissions/PermissionData.php                      | 2 +-
 app/Helpers/AppPermission.php                                | 4 ++--
 resources/views/pages/access-manager/users/⚡index.blade.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Data/Permissions/PermissionData.php b/app/Data/Permissions/PermissionData.php
index 7ed32be..6081afa 100644
--- a/app/Data/Permissions/PermissionData.php
+++ b/app/Data/Permissions/PermissionData.php
@@ -14,7 +14,7 @@ class PermissionData extends Data
     public function __construct(
         public int $id,
         public string $name,
-        public ConnectedAppPermissonEnum $type,
+        public ?ConnectedAppPermissonEnum $type,
     ) {}
 
     public static function fromModel(Permission $permission): self
diff --git a/app/Helpers/AppPermission.php b/app/Helpers/AppPermission.php
index 4ac0c67..b34bd8f 100644
--- a/app/Helpers/AppPermission.php
+++ b/app/Helpers/AppPermission.php
@@ -22,10 +22,10 @@ public static function name(ConnectedAppPermissonEnum $permission, string|Connec
     /**
      * @param  string  $permissionName  This should be the name constructed by the {@see self::name()} method.
      */
-    public static function type(string $permissionName): ConnectedAppPermissonEnum
+    public static function type(string $permissionName): ?ConnectedAppPermissonEnum
     {
         $permission = explode('-', $permissionName);
 
-        return ConnectedAppPermissonEnum::from($permission[0]);
+        return ConnectedAppPermissonEnum::tryFrom($permission[0]);
     }
 }
diff --git a/resources/views/pages/access-manager/users/⚡index.blade.php b/resources/views/pages/access-manager/users/⚡index.blade.php
index 02eee3a..f764e33 100644
--- a/resources/views/pages/access-manager/users/⚡index.blade.php
+++ b/resources/views/pages/access-manager/users/⚡index.blade.php
@@ -199,7 +199,7 @@ public function saveRoles(): void
             @scope('cell_roles', $row)
             <div class="flex flex-wrap gap-1">
                 @foreach($row->roles as $role)
-                    <x-mary-badge class="badge-soft badge-neutral" :value="$role->name"/>
+                    <x-mary-badge class="badge-soft badge-neutral" :value="ucfirst($role->name)"/>
                 @endforeach
             </div>
             @endscope