From dd865ae3212114a49c6405a4963c61e9e28a4c76 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 9 Mar 2026 08:37:36 +0530 Subject: [PATCH 1/3] fix: update sort key name case as api response --- .../organizations/details/apis/index.tsx | 2 +- .../organizations/details/invoices/index.tsx | 2 +- .../organizations/details/members/index.tsx | 29 ++++++++++--------- .../organizations/details/projects/index.tsx | 17 +++++------ .../organizations/details/tokens/index.tsx | 2 +- .../admin/views/organizations/list/index.tsx | 2 +- web/sdk/admin/views/users/list/list.tsx | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/web/sdk/admin/views/organizations/details/apis/index.tsx b/web/sdk/admin/views/organizations/details/apis/index.tsx index ba9af4631f..f1eaa9ae92 100644 --- a/web/sdk/admin/views/organizations/details/apis/index.tsx +++ b/web/sdk/admin/views/organizations/details/apis/index.tsx @@ -49,7 +49,7 @@ const ErrorState = () => { ); }; -const DEFAULT_SORT: DataTableSort = { name: "created_at", order: "desc" }; +const DEFAULT_SORT: DataTableSort = { name: 'createdAt', order: 'desc' }; const INITIAL_QUERY: DataTableQuery = { offset: 0, limit: DEFAULT_PAGE_SIZE, diff --git a/web/sdk/admin/views/organizations/details/invoices/index.tsx b/web/sdk/admin/views/organizations/details/invoices/index.tsx index 038d0e9989..2df554b8ba 100644 --- a/web/sdk/admin/views/organizations/details/invoices/index.tsx +++ b/web/sdk/admin/views/organizations/details/invoices/index.tsx @@ -16,7 +16,7 @@ import { import { transformDataTableQueryToRQLRequest } from "../../../../utils/transform-query"; import { useDebounceValue } from "usehooks-ts"; -const DEFAULT_SORT: DataTableSort = { name: "created_at", order: "desc" }; +const DEFAULT_SORT: DataTableSort = { name: 'createdAt', order: 'desc' }; const INITIAL_QUERY: DataTableQuery = { offset: 0, limit: DEFAULT_PAGE_SIZE, diff --git a/web/sdk/admin/views/organizations/details/members/index.tsx b/web/sdk/admin/views/organizations/details/members/index.tsx index cc1d168960..c33179bf0e 100644 --- a/web/sdk/admin/views/organizations/details/members/index.tsx +++ b/web/sdk/admin/views/organizations/details/members/index.tsx @@ -9,19 +9,22 @@ import { AdminServiceQueries } from "@raystack/proton/frontier"; import { useInfiniteQuery, createConnectQueryKey, - useTransport, -} from "@connectrpc/connect-query"; -import { useQueryClient } from "@tanstack/react-query"; -import { UsersIcon } from "../../../../assets/icons/UsersIcon"; -import { ExclamationTriangleIcon } from "@radix-ui/react-icons"; -import { OrganizationContext } from "../contexts/organization-context"; -import { AssignRole } from "../../../../components/AssignRole"; -import { RemoveMember } from "./remove-member"; -import { getConnectNextPageParam, DEFAULT_PAGE_SIZE } from "../../../../utils/connect-pagination"; -import { transformDataTableQueryToRQLRequest } from "../../../../utils/transform-query"; -import { useDebounceValue } from "usehooks-ts"; - -const DEFAULT_SORT: DataTableSort = { name: "org_joined_at", order: "desc" }; + useTransport +} from '@connectrpc/connect-query'; +import { useQueryClient } from '@tanstack/react-query'; +import { UsersIcon } from '../../../../assets/icons/UsersIcon'; +import { ExclamationTriangleIcon } from '@radix-ui/react-icons'; +import { OrganizationContext } from '../contexts/organization-context'; +import { AssignRole } from '../../../../components/AssignRole'; +import { RemoveMember } from './remove-member'; +import { + getConnectNextPageParam, + DEFAULT_PAGE_SIZE +} from '../../../../utils/connect-pagination'; +import { transformDataTableQueryToRQLRequest } from '../../../../utils/transform-query'; +import { useDebounceValue } from 'usehooks-ts'; + +const DEFAULT_SORT: DataTableSort = { name: 'orgJoinedAt', order: 'desc' }; const INITIAL_QUERY: DataTableQuery = { offset: 0, limit: DEFAULT_PAGE_SIZE, diff --git a/web/sdk/admin/views/organizations/details/projects/index.tsx b/web/sdk/admin/views/organizations/details/projects/index.tsx index 678eb5bf70..e1392f18a8 100644 --- a/web/sdk/admin/views/organizations/details/projects/index.tsx +++ b/web/sdk/admin/views/organizations/details/projects/index.tsx @@ -12,16 +12,13 @@ import { getColumns } from "./columns"; import type { SearchOrganizationProjectsResponse_OrganizationProject } from "@raystack/proton/frontier"; import { AdminServiceQueries } from "@raystack/proton/frontier"; import { - useInfiniteQuery, -} from "@connectrpc/connect-query"; -import { OrganizationContext } from "../contexts/organization-context"; -import { FileIcon, ExclamationTriangleIcon } from "@radix-ui/react-icons"; -import { ProjectMembersDialog } from "./members"; -import { getConnectNextPageParam, DEFAULT_PAGE_SIZE } from "../../../../utils/connect-pagination"; -import { transformDataTableQueryToRQLRequest } from "../../../../utils/transform-query"; -import { useDebounceValue } from "usehooks-ts"; - -const DEFAULT_SORT: DataTableSort = { name: "created_at", order: "desc" }; + getConnectNextPageParam, + DEFAULT_PAGE_SIZE +} from '../../../../utils/connect-pagination'; +import { transformDataTableQueryToRQLRequest } from '../../../../utils/transform-query'; +import { useDebounceValue } from 'usehooks-ts'; + +const DEFAULT_SORT: DataTableSort = { name: 'createdAt', order: 'desc' }; const INITIAL_QUERY: DataTableQuery = { offset: 0, limit: DEFAULT_PAGE_SIZE, diff --git a/web/sdk/admin/views/organizations/details/tokens/index.tsx b/web/sdk/admin/views/organizations/details/tokens/index.tsx index 173b9cca97..41c9f5891d 100644 --- a/web/sdk/admin/views/organizations/details/tokens/index.tsx +++ b/web/sdk/admin/views/organizations/details/tokens/index.tsx @@ -13,7 +13,7 @@ import { transformDataTableQueryToRQLRequest } from "../../../../utils/transform import { getColumns } from "./columns"; import { useDebounceValue } from "usehooks-ts"; -const DEFAULT_SORT: DataTableSort = { name: "created_at", order: "desc" }; +const DEFAULT_SORT: DataTableSort = { name: 'createdAt', order: 'desc' }; const INITIAL_QUERY: DataTableQuery = { offset: 0, limit: DEFAULT_PAGE_SIZE, diff --git a/web/sdk/admin/views/organizations/list/index.tsx b/web/sdk/admin/views/organizations/list/index.tsx index e4a37ed40f..f0486ca213 100644 --- a/web/sdk/admin/views/organizations/list/index.tsx +++ b/web/sdk/admin/views/organizations/list/index.tsx @@ -39,7 +39,7 @@ const NoOrganizations = () => { ); }; -const DEFAULT_SORT: DataTableSort = { name: "created_at", order: "desc" }; +const DEFAULT_SORT: DataTableSort = { name: 'createdAt', order: 'desc' }; const INITIAL_QUERY: DataTableQuery = { offset: 0, limit: DEFAULT_PAGE_SIZE, diff --git a/web/sdk/admin/views/users/list/list.tsx b/web/sdk/admin/views/users/list/list.tsx index 8537b6256f..d3726f18a9 100644 --- a/web/sdk/admin/views/users/list/list.tsx +++ b/web/sdk/admin/views/users/list/list.tsx @@ -30,7 +30,7 @@ const NoUsers = () => { ); }; -const DEFAULT_SORT: DataTableSort = { name: "created_at", order: "desc" }; +const DEFAULT_SORT: DataTableSort = { name: 'createdAt', order: 'desc' }; const INITIAL_QUERY: DataTableQuery = { offset: 0, limit: DEFAULT_PAGE_SIZE, From e22e38b21a439fa573f4b2ffe37a04a42f1af61e Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 9 Mar 2026 08:47:31 +0530 Subject: [PATCH 2/3] fix: add missing imports in organization projects view Co-Authored-By: Claude Opus 4.6 --- web/sdk/admin/views/organizations/details/projects/index.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/sdk/admin/views/organizations/details/projects/index.tsx b/web/sdk/admin/views/organizations/details/projects/index.tsx index e1392f18a8..aa08280291 100644 --- a/web/sdk/admin/views/organizations/details/projects/index.tsx +++ b/web/sdk/admin/views/organizations/details/projects/index.tsx @@ -11,6 +11,10 @@ import { useContext, useEffect, useMemo, useState } from "react"; import { getColumns } from "./columns"; import type { SearchOrganizationProjectsResponse_OrganizationProject } from "@raystack/proton/frontier"; import { AdminServiceQueries } from "@raystack/proton/frontier"; +import { useInfiniteQuery } from "@connectrpc/connect-query"; +import { OrganizationContext } from "../contexts/organization-context"; +import { FileIcon, ExclamationTriangleIcon } from "@radix-ui/react-icons"; +import { ProjectMembersDialog } from "./members"; import { getConnectNextPageParam, DEFAULT_PAGE_SIZE From 01120f44e2d5f87867c6f8649f53f539fa00cb49 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Tue, 10 Mar 2026 10:19:50 +0530 Subject: [PATCH 3/3] fix: update @raystack/apsara to 0.56.6 Co-Authored-By: Claude Opus 4.6 --- web/apps/admin/package.json | 2 +- web/pnpm-lock.yaml | 14 +++++++------- web/sdk/package.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/apps/admin/package.json b/web/apps/admin/package.json index effc05911a..b9e6209908 100644 --- a/web/apps/admin/package.json +++ b/web/apps/admin/package.json @@ -18,7 +18,7 @@ "@hookform/resolvers": "^3.0.1", "@radix-ui/react-form": "^0.0.2", "@radix-ui/react-icons": "^1.3.0", - "@raystack/apsara": "0.56.5", + "@raystack/apsara": "0.56.6", "@raystack/frontier": "workspace:^", "@raystack/proton": "0.1.0-b1687af73f994fa9612a023c850aa97c35735af8", "@stitches/react": "^1.2.8", diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 424828c528..422d14434a 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -58,8 +58,8 @@ importers: specifier: ^1.3.0 version: 1.3.2(react@18.3.1) '@raystack/apsara': - specifier: 0.56.5 - version: 0.56.5(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 0.56.6 + version: 0.56.6(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@raystack/frontier': specifier: workspace:^ version: link:../../sdk @@ -286,8 +286,8 @@ importers: specifier: ^1.3.2 version: 1.3.2(react@18.3.1) '@raystack/apsara': - specifier: 0.56.5 - version: 0.56.5(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 0.56.6 + version: 0.56.6(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@raystack/eslint-config': specifier: workspace:^ version: link:../tools/eslint-config @@ -2277,8 +2277,8 @@ packages: '@types/react': optional: true - '@raystack/apsara@0.56.5': - resolution: {integrity: sha512-jpFknvaka2F3SsTpDl6de2u8PK1FlyyGvIt4BPL7GKGU6IE7Tm+1ZF0S9537z0UMSzCgyoNb4LGVu/9IX0nxhQ==} + '@raystack/apsara@0.56.6': + resolution: {integrity: sha512-Qt+Nh3CQAaLGtlpo+bNujsgj52PpNVgRG5VySBKEqkTIUZch+R4fOQ5F5zSC8Iv2/4yweuaknTVllNF9o691Eg==} engines: {node: '>=22'} peerDependencies: '@types/react': ^18 || ^19 @@ -9630,7 +9630,7 @@ snapshots: transitivePeerDependencies: - '@types/react-dom' - '@raystack/apsara@0.56.5(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@raystack/apsara@0.56.6(@types/react-dom@18.3.7(@types/react@18.3.27))(@types/react@18.3.27)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@ariakit/react': 0.4.21(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-icons': 1.3.2(react@18.3.1) diff --git a/web/sdk/package.json b/web/sdk/package.json index c7e2071242..26653f50f6 100644 --- a/web/sdk/package.json +++ b/web/sdk/package.json @@ -68,7 +68,7 @@ "@jest/globals": "^29.7.0", "@radix-ui/react-form": "^0.0.2", "@radix-ui/react-icons": "^1.3.2", - "@raystack/apsara": "0.56.5", + "@raystack/apsara": "0.56.6", "@raystack/eslint-config": "workspace:^", "@raystack/frontier-tsconfig": "workspace:^", "@size-limit/preset-small-lib": "^8.2.6",