perf: Improve sorting API

packages/backend/src/core/admin/languages/services/show.service.ts

@@ -17,6 +17,8 @@ export class ShowLanguagesAdminService {
     last,
     cursor,
     search = '',
+    sortBy,
+    sortDirection,
   }: ShowLanguagesAdminQuery): Promise<ShowLanguagesAdminObj> {
     const where = ilike(core_languages.name, `%${search}%`);
 
@@ -25,6 +27,8 @@ export class ShowLanguagesAdminService {
       database: core_languages,
       first,
       last,
+      sortBy,
+      sortDirection,
       defaultSortBy: {
         direction: SortDirectionEnum.desc,
         column: 'created_at',

packages/backend/src/core/admin/members/staff/admin/services/show.service.ts

@@ -62,12 +62,16 @@ export class ShowAdminStaffMembersAdminService {
     first,
     last,
     cursor,
+    sortBy,
+    sortDirection,
   }: AdminStaffMembersAdminQuery): Promise<AdminStaffMembersAdminObj> {
     const pagination = await this.databaseService.paginationCursor({
       cursor,
       database: core_admin_permissions,
       first,
       last,
+      sortBy,
+      sortDirection,
       defaultSortBy: {
         direction: SortDirectionEnum.desc,
         column: 'updated_at',

packages/backend/src/core/admin/plugins/services/show.service.ts

@@ -17,6 +17,8 @@ export class ShowPluginsAdminService {
     last,
     cursor,
     search = '',
+    sortBy,
+    sortDirection,
   }: ShowPluginsAdminQuery): Promise<ShowPluginsAdminObj> {
     const where = ilike(core_plugins.name, `%${search}%`);
 
@@ -25,6 +27,8 @@ export class ShowPluginsAdminService {
       database: core_plugins,
       first,
       last,
+      sortBy,
+      sortDirection,
       defaultSortBy: {
         direction: SortDirectionEnum.desc,
         column: 'updated_at',

packages/frontend/src/components/ui/data-table.tsx

@@ -9,10 +9,6 @@ import { HeaderDataTable } from '../data-table/header';
 import { SkeletonDataTable } from '../data-table/skeleton';
 import { ToolbarDataTable } from '../data-table/toolbar/toolbar';
 import { Pagination } from './pagination';
-// import { HeaderDataTable } from '../data-table/header';
-// import { SkeletonDataTable } from '../data-table/skeleton';
-// import { ToolbarDataTable } from '../data-table/toolbar/toolbar';
-// import { Pagination } from './pagination';
 import {
   Table,
   TableBody,
@@ -39,7 +35,7 @@ export interface DataTableProps<T extends TMin> {
     sortBy: keyof T;
     sortDirection: 'asc' | 'desc';
   };
-  page_info?: PageInfo;
+  pageInfo?: PageInfo;
   searchPlaceholder?: string;
 }
 
@@ -48,7 +44,7 @@ export function DataTable<T extends TMin>({
   columns,
   defaultSorting,
   searchPlaceholder,
-  page_info,
+  pageInfo,
   defaultPageSize = 10,
 }: DataTableProps<T>) {
   const t = useTranslations('core.global');
@@ -146,8 +142,8 @@ export function DataTable<T extends TMin>({
         )}
       </div>
 
-      {page_info && (
-        <Pagination defaultPageSize={defaultPageSize} page_info={page_info} />
+      {pageInfo && (
+        <Pagination defaultPageSize={defaultPageSize} pageInfo={pageInfo} />
       )}
     </div>
   );

packages/frontend/src/components/ui/pagination.tsx

@@ -23,11 +23,11 @@ import {
 const PAGE_SIZES = [10, 20, 30, 40, 50];
 
 export const Pagination = ({
-  page_info,
-  defaultPageSize,
+  pageInfo,
+  defaultPageSize = 10,
 }: {
-  defaultPageSize: 10 | 20 | 30 | 40 | 50;
-  page_info: PageInfo;
+  defaultPageSize?: 10 | 20 | 30 | 40 | 50;
+  pageInfo: PageInfo;
 }) => {
   const t = useTranslations('core.global');
   const { push } = useRouter();
@@ -56,7 +56,7 @@ export const Pagination = ({
   return (
     <div className="flex flex-wrap items-center justify-center gap-4 sm:justify-end">
       <span className="text-muted-foreground text-sm">
-        {t('total_count', { count: page_info.total_count })}
+        {t('total_count', { count: pageInfo.total_count })}
       </span>
 
       <div className="flex flex-wrap items-center justify-center gap-4">
@@ -100,12 +100,12 @@ export const Pagination = ({
           <Button
             ariaLabel={t('previous')}
             className="bg-card size-9"
-            disabled={!page_info.has_previous_page}
+            disabled={!pageInfo.has_previous_page}
             onClick={() => {
-              if (!page_info.start_cursor) return;
+              if (!pageInfo.start_cursor) return;
 
               const params = new URLSearchParams(searchParams.toString());
-              params.set('cursor', `${page_info.start_cursor}`);
+              params.set('cursor', `${pageInfo.start_cursor}`);
               params.set('last', `${pageSizeValue}`);
               params.delete('first');
               push(`${pathname}?${params.toString()}`, {
@@ -120,12 +120,12 @@ export const Pagination = ({
           <Button
             ariaLabel={t('next')}
             className="bg-card size-9"
-            disabled={!page_info.has_next_page}
+            disabled={!pageInfo.has_next_page}
             onClick={() => {
-              if (!page_info.end_cursor) return;
+              if (!pageInfo.end_cursor) return;
 
               const params = new URLSearchParams(searchParams.toString());
-              params.set('cursor', `${page_info.end_cursor}`);
+              params.set('cursor', `${pageInfo.end_cursor}`);
               params.set('first', `${pageSizeValue}`);
               params.delete('last');
               push(`${pathname}?${params.toString()}`, {

packages/frontend/src/helpers/get-pagination-tool.ts

@@ -10,14 +10,14 @@ export interface SearchParamsPagination {
 }
 
 export async function getPaginationTool({
-  defaultPageSize,
+  defaultPageSize = 10,
   searchParams: searchParamsPromise,
-  columnsSortByEnum,
+  sortEnum,
 }: {
-  columnsSortByEnum?: Record<string, unknown>;
-  defaultPageSize: 10 | 20 | 30 | 40 | 50;
+  defaultPageSize?: 10 | 20 | 30 | 40 | 50;
   search?: boolean;
   searchParams: Promise<SearchParamsPagination>;
+  sortEnum?: Record<string, unknown>;
 }): Promise<{
   cursor?: number;
   first: number;
@@ -28,7 +28,7 @@ export async function getPaginationTool({
   const searchParams = await searchParamsPromise;
 
   const sortBy = getGetSortByParamsAPI({
-    constEnum: columnsSortByEnum,
+    constEnum: sortEnum,
     searchParams,
   });
   const pagination = {

packages/frontend/src/views/admin/views/core/langs/langs-core-admin-view.tsx

@@ -11,6 +11,7 @@ import {
   ShowLanguagesAdminObj,
   ShowLanguagesAdminQuery,
 } from 'vitnode-shared/admin/language.dto';
+import { ShowLanguagesAdminSortEnum } from 'vitnode-shared/admin/language.enum';
 
 import { CreateActionLangAdmin } from './actions/create';
 import { ContentLangsCoreAdminView } from './table/content';
@@ -43,7 +44,7 @@ export const LangsCoreAdminView = async ({
 }) => {
   const variables = await getPaginationTool({
     searchParams,
-    defaultPageSize: 10,
+    sortEnum: ShowLanguagesAdminSortEnum,
   });
 
   const [t, data] = await Promise.all([

packages/frontend/src/views/admin/views/core/langs/table/content.tsx

@@ -74,7 +74,7 @@ export const ContentLangsCoreAdminView = ({
         sortBy: 'created_at',
         sortDirection: 'desc',
       }}
-      page_info={page_info}
+      pageInfo={page_info}
       searchPlaceholder={t('search_placeholder')}
     />
   );

packages/frontend/src/views/admin/views/core/plugins/plugins-admin-view.tsx

@@ -10,6 +10,7 @@ import {
   ShowPluginsAdminObj,
   ShowPluginsAdminQuery,
 } from 'vitnode-shared/admin/plugins.dto';
+import { ShowPluginsAdminSortEnum } from 'vitnode-shared/admin/plugins.enum';
 
 import { WarnReqRestartServer } from '../warn-req-restart-server';
 import { ActionsPluginsAdmin } from './actions/actions';
@@ -39,7 +40,7 @@ export const PluginsAdminView = async ({
 }) => {
   const variables = await getPaginationTool({
     searchParams,
-    defaultPageSize: 10,
+    sortEnum: ShowPluginsAdminSortEnum,
   });
   const [t, data] = await Promise.all([
     getTranslations('admin.core.plugins'),

packages/frontend/src/views/admin/views/core/plugins/table/actions/delete/content.tsx

@@ -12,11 +12,10 @@ import { SubmitContentDeletePluginActionsAdmin } from './submit';
 
 export const ContentDeletePluginActionsAdmin = ({
   id,
-  name,
 }: Pick<ShowPluginAdmin, 'author' | 'id' | 'name'>) => {
   const t = useTranslations('admin.core.plugins.delete');
   const tCore = useTranslations('core.global');
-  const { onSubmit } = useDeletePluginAdmin({ id, name });
+  const { onSubmit } = useDeletePluginAdmin({ id });
 
   return (
     <form action={onSubmit}>

packages/frontend/src/views/admin/views/core/plugins/table/content.tsx

@@ -95,7 +95,7 @@ export const ContentPluginsCoreAdmin = ({
         sortBy: 'updated_at',
         sortDirection: 'desc',
       }}
-      page_info={page_info}
+      pageInfo={page_info}
       searchPlaceholder={t('search_placeholder')}
     />
   );

packages/frontend/src/views/admin/views/core/settings/email/logs/content.tsx

@@ -57,7 +57,7 @@ export const ContentLogsEmailSettingsAdmin = ({
         sortBy: 'created_at',
         sortDirection: 'desc',
       }}
-      page_info={page_info}
+      pageInfo={page_info}
     />
   );
 };

packages/frontend/src/views/admin/views/core/settings/email/logs/logs-email-settings-admin-view.tsx

@@ -41,7 +41,6 @@ export const LogsEmailSettingsAdminView = async ({
 }) => {
   const variables = await getPaginationTool({
     searchParams,
-    defaultPageSize: 10,
   });
 
   const [t, data] = await Promise.all([

packages/frontend/src/views/admin/views/core/settings/legal/legal-core-admin-view.tsx

@@ -48,7 +48,6 @@ export const LegalSettingsAdminView = async ({
   if (perm) return perm;
   const variables = await getPaginationTool({
     searchParams,
-    defaultPageSize: 10,
   });
   const [t, data] = await Promise.all([
     getTranslations('admin.core.settings.legal'),

packages/frontend/src/views/admin/views/core/settings/legal/table/table.tsx

@@ -68,7 +68,7 @@ export const TableLegalSettingsAdmin = ({ edges, page_info }: LegalsObj) => {
         sortBy: 'updated_at',
         sortDirection: 'desc',
       }}
-      page_info={page_info}
+      pageInfo={page_info}
     />
   );
 };

packages/frontend/src/views/admin/views/members/groups/groups-members-admin-view.tsx

@@ -11,7 +11,7 @@ import {
   GroupsMembersAdminObj,
   GroupsMembersAdminQuery,
 } from 'vitnode-shared/admin/members/groups.dto';
-import { ColumnsSortGroupsMembersAdmin } from 'vitnode-shared/admin/members/groups.enum';
+import { GroupsMembersAdminSortEnum } from 'vitnode-shared/admin/members/groups.enum';
 
 import { ActionsGroupsMembersAdmin } from './actions/actions-groups-members-admin';
 import { TableGroupsMembersAdmin } from './table/table';
@@ -46,8 +46,7 @@ export const GroupsMembersAdminView = async ({
 }: GroupsMembersAdminViewProps) => {
   const variables = await getPaginationTool({
     searchParams,
-    columnsSortByEnum: ColumnsSortGroupsMembersAdmin,
-    defaultPageSize: 10,
+    sortEnum: GroupsMembersAdminSortEnum,
   });
 
   const [data, t] = await Promise.all([

packages/frontend/src/views/admin/views/members/groups/table/table.tsx

@@ -72,7 +72,7 @@ export const TableGroupsMembersAdmin = ({
         sortBy: 'updated_at',
         sortDirection: 'desc',
       }}
-      page_info={page_info}
+      pageInfo={page_info}
       searchPlaceholder={t('search_placeholder')}
     />
   );

packages/frontend/src/views/admin/views/members/staff/admin/admin-view.tsx

@@ -12,6 +12,7 @@ import {
   AdminStaffMembersAdminObj,
   AdminStaffMembersAdminQuery,
 } from 'vitnode-shared/admin/members/staff/admin.dto';
+import { ShowStaffMembersAdminSortEnum } from 'vitnode-shared/admin/members/staff/admin.enum';
 
 import { ActionsAdministratorsStaffAdmin } from './actions/actions';
 import { TableAdministratorsStaffAdmin } from './table/table';
@@ -43,7 +44,7 @@ export const AdminStaffAdminView = async ({
 }) => {
   const variables = await getPaginationTool({
     searchParams,
-    defaultPageSize: 10,
+    sortEnum: ShowStaffMembersAdminSortEnum,
   });
 
   const [t, middleware, data] = await Promise.all([

packages/frontend/src/views/admin/views/members/staff/admin/table/table.tsx

@@ -96,7 +96,7 @@ export const TableAdministratorsStaffAdmin = ({
         sortBy: 'updated_at',
         sortDirection: 'desc',
       }}
-      page_info={page_info}
+      pageInfo={page_info}
     />
   );
 };

packages/frontend/src/views/admin/views/members/users/table.tsx

@@ -95,7 +95,7 @@ export const TableUsersMembersAdmin = ({
         sortBy: 'joined_at',
         sortDirection: 'desc',
       }}
-      page_info={page_info}
+      pageInfo={page_info}
       // filters={<GroupsFiltersUsersMembersAdmin />}
       searchPlaceholder={t('search_placeholder')}
     />

packages/frontend/src/views/admin/views/members/users/users-members-admin-view.tsx

@@ -10,7 +10,7 @@ import {
   UsersMembersAdminObj,
   UsersMembersAdminQuery,
 } from 'vitnode-shared/admin/members/users.dto';
-import { ColumnsSortUsersMembersAdminEnum } from 'vitnode-shared/admin/members/users.enum';
+import { UsersMembersAdminSortEnum } from 'vitnode-shared/admin/members/users.enum';
 
 import { CreateUserUsersMembersAdmin } from '../create/create';
 import { TableUsersMembersAdmin } from './table';
@@ -47,8 +47,7 @@ export const UsersMembersAdminView = async ({
   const { group_id } = await searchParams;
   const variables = await getPaginationTool({
     searchParams,
-    defaultPageSize: 10,
-    columnsSortByEnum: ColumnsSortUsersMembersAdminEnum,
+    sortEnum: UsersMembersAdminSortEnum,
   });
 
   const query: UsersMembersAdminQuery = {

packages/shared/src/admin/language.dto.ts

@@ -1,15 +1,29 @@
 import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
-import { IsBoolean, IsOptional, IsString } from 'class-validator';
+import { IsBoolean, IsEnum, IsOptional, IsString } from 'class-validator';
 
 import { PageInfoObj, PaginationQuery } from '../utils/pagination.dto';
+import { SortDirectionEnum } from '../utils/pagination.enum';
 import { TransformString } from '../utils/text-language';
+import { ShowLanguagesAdminSortEnum } from './language.enum';
 
 export class ShowLanguagesAdminQuery extends PaginationQuery {
   @ApiPropertyOptional()
   @IsString()
   @IsOptional()
   search?: string;
+
+  @ApiPropertyOptional({
+    enum: ShowLanguagesAdminSortEnum,
+  })
+  @IsEnum(ShowLanguagesAdminSortEnum)
+  @IsOptional()
+  sortBy?: ShowLanguagesAdminSortEnum;
+
+  @ApiPropertyOptional({ enum: SortDirectionEnum })
+  @IsEnum(SortDirectionEnum)
+  @IsOptional()
+  sortDirection?: SortDirectionEnum;
 }
 
 export class LanguagesAdminObj {

packages/shared/src/admin/language.enum.ts

@@ -0,0 +1,4 @@
+export enum ShowLanguagesAdminSortEnum {
+  created_at = 'created_at',
+  updated_at = 'updated_at',
+}