diff --git a/datahub-web-react/src/app/identity/group/GroupList.tsx b/datahub-web-react/src/app/identity/group/GroupList.tsx index ba74ecc792f96..5ef77b4dfc8a8 100644 --- a/datahub-web-react/src/app/identity/group/GroupList.tsx +++ b/datahub-web-react/src/app/identity/group/GroupList.tsx @@ -49,7 +49,7 @@ export const GroupList = () => { const { loading, error, data, refetch, client } = useListGroupsQuery({ variables: { input: { - start: query && start === 0 ? null : start, + start, count: pageSize, query: (query?.length && query) || undefined, }, diff --git a/datahub-web-react/src/app/identity/user/UserList.tsx b/datahub-web-react/src/app/identity/user/UserList.tsx index 8e8bf0626b2ce..e50005b08377e 100644 --- a/datahub-web-react/src/app/identity/user/UserList.tsx +++ b/datahub-web-react/src/app/identity/user/UserList.tsx @@ -65,7 +65,7 @@ export const UserList = () => { } = useListUsersQuery({ variables: { input: { - start: query && start === 0 ? null : start, + start, count: pageSize, query: (query?.length && query) || undefined, }, diff --git a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx b/datahub-web-react/src/app/ingest/secret/SecretsList.tsx index 863a558e5175a..2728fff0ccba3 100644 --- a/datahub-web-react/src/app/ingest/secret/SecretsList.tsx +++ b/datahub-web-react/src/app/ingest/secret/SecretsList.tsx @@ -52,7 +52,7 @@ export const SecretsList = () => { const { loading, error, data, client } = useListSecretsQuery({ variables: { input: { - start: query && start === 0 ? null : start, + start, count: pageSize, query: (query?.length && query) || undefined, }, diff --git a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx index 4a188a5ffc7fc..6188845694f9e 100644 --- a/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx +++ b/datahub-web-react/src/app/ingest/source/IngestionSourceList.tsx @@ -105,7 +105,7 @@ export const IngestionSourceList = () => { const { loading, error, data, client, refetch } = useListIngestionSourcesQuery({ variables: { input: { - start: query && start === 0 ? null : start, + start, count: pageSize, query: (query?.length && query) || undefined, }, diff --git a/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx b/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx index dfac59dbc5eb9..49b0ec922fd57 100644 --- a/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx +++ b/datahub-web-react/src/app/permissions/policy/ManagePolicies.tsx @@ -168,7 +168,7 @@ export const ManagePolicies = () => { } = useListPoliciesQuery({ variables: { input: { - start: query && start === 0 ? null : start, + start, count: pageSize, query, }, diff --git a/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx b/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx index 8db0b115589e4..011109e2eb915 100644 --- a/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx +++ b/datahub-web-react/src/app/permissions/roles/ManageRoles.tsx @@ -74,7 +74,7 @@ export const ManageRoles = () => { } = useListRolesQuery({ variables: { input: { - start: query && start === 0 ? null : start, + start, count: pageSize, query, },