permission-submit

Author: stevenfrog

src/apps/admin/src/lib/components/DialogEditUserRoles/DialogEditUserRoles.tsx

@@ -100,7 +100,7 @@ export const DialogEditUserRoles: FC<Props> = (props: Props) => {
                         variant='danger'
                         label='Remove'
                         onClick={function onClick() {
-                            doRemoveRole(data.id)
+                            doRemoveRole(String(data.id))
                         }}
                         disabled={isRemoving[data.id]}
                     />

src/apps/admin/src/lib/components/RolesTable/RolesTable.tsx

@@ -34,7 +34,7 @@ export const RolesTable: FC<Props> = (props: Props) => {
                         <Link to={`${data.id}/role-members`}>{data.id}</Link>
                     </div>
                 ),
-                type: 'element',
+                type: 'numberElement', // Change from 'element' to 'numberElement'
             },
             {
                 label: 'Role Name',
@@ -187,6 +187,13 @@ export const RolesTable: FC<Props> = (props: Props) => {
             },
         ],
     ], [columns])
+
+    // Convert id fields to numbers to ensure proper sorting
+    const processedData = useMemo(() => props.datas.map(role => ({
+        ...role,
+        id: Number(role.id),
+    })), [props.datas])
+
     const {
         page,
         setPage,
@@ -195,7 +202,7 @@ export const RolesTable: FC<Props> = (props: Props) => {
         setSort,
         sort,
     }: useTableFilterLocalProps<UserRole> = useTableFilterLocal(
-        props.datas ?? [],
+        processedData ?? [],
         undefined,
         {
             createdAtString: 'createdAt',

src/apps/admin/src/lib/hooks/useManageAddGroupMembers.ts

@@ -102,12 +102,14 @@ export function useManageAddGroupMembers(
             )
                 .then(() => {
                     if (!hasSubmissionErrors) {
+                        // Change the success message based on the membership type
+                        const entityType = membershipType === 'user' ? 'Member' : 'Group'
                         toast.success(
                             `${
-                                memberIds.length > 1 ? 'Groups' : 'Group'
+                                memberIds.length > 1 ? `${entityType}s` : entityType
                             } added successfully`,
                             {
-                                toastId: 'Add groups',
+                                toastId: `Add ${entityType.toLowerCase()}s`,
                             },
                         )
                         callBack()

src/apps/admin/src/lib/hooks/useTableFilterLocal.ts

@@ -54,7 +54,24 @@ export function useTableFilterLocal<T>(
                 sortField = mappingSortField[sortField]
             }
 
-            datas = _.orderBy(datas, [sortField], [sort.direction])
+            datas = [...datas].sort((a, b) => {
+                const aValue = (a as Record<string, any>)[sortField]
+                const bValue = (b as Record<string, any>)[sortField]
+
+                // Add special case for id field
+                if (sortField === 'id') {
+                    return sort.direction === 'asc'
+                        ? Number(aValue) - Number(bValue)
+                        : Number(bValue) - Number(aValue)
+                }
+
+                // Existing string comparison logic
+                return sort.direction === 'asc'
+                    ? String(aValue)
+                        .localeCompare(String(bValue))
+                    : String(bValue)
+                        .localeCompare(String(aValue))
+            })
         }
 
         setSortedDatas(datas)

src/apps/admin/src/lib/models/MobileTableColumn.model.ts

@@ -4,5 +4,5 @@
 import { TableColumn } from '~/libs/ui'
 
 export interface MobileTableColumn<T> extends TableColumn<T> {
-    readonly mobileType?: 'label'
+    readonly mobileType?: 'label' | 'last-value'
 }

src/apps/admin/src/lib/models/UserRole.model.ts

@@ -6,7 +6,7 @@ import { TABLE_DATE_FORMAT } from '../../config/index.config'
  * Model for user role info
  */
 export interface UserRole {
-    id: string
+    id: string | number
     roleName: string
     createdBy?: string
     createdByHandle?: string