Fix: broken Apps in User list
- make `ConnectedAppPermissionEnum` nullable and enhance role display formatting
This commit is contained in:
parent
f02caef80c
commit
060526172f
@ -14,7 +14,7 @@ class PermissionData extends Data
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
public int $id,
|
public int $id,
|
||||||
public string $name,
|
public string $name,
|
||||||
public ConnectedAppPermissonEnum $type,
|
public ?ConnectedAppPermissonEnum $type,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public static function fromModel(Permission $permission): self
|
public static function fromModel(Permission $permission): self
|
||||||
|
|||||||
@ -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.
|
* @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);
|
$permission = explode('-', $permissionName);
|
||||||
|
|
||||||
return ConnectedAppPermissonEnum::from($permission[0]);
|
return ConnectedAppPermissonEnum::tryFrom($permission[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -199,7 +199,7 @@ public function saveRoles(): void
|
|||||||
@scope('cell_roles', $row)
|
@scope('cell_roles', $row)
|
||||||
<div class="flex flex-wrap gap-1">
|
<div class="flex flex-wrap gap-1">
|
||||||
@foreach($row->roles as $role)
|
@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
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
@endscope
|
@endscope
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user