Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactored numbered cursors to type unknown; #546

Merged
merged 1 commit into from
Jan 23, 2025
Merged

Refactored numbered cursors to type unknown; #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/common/common-app/src/hooks/connections/useConnections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ export const useActiveConnections = (
const dotYouClient = useDotYouClientContext();

const fetchConnections = async (
{ pageSize, cursor }: { pageSize: number; cursor?: number } = {
{ pageSize, cursor }: { pageSize: number; cursor?: unknown } = {
pageSize: 10,
}
) => {
Expand All @@ -202,7 +202,7 @@ export const useActiveConnections = (
return {
fetch: useInfiniteQuery({
queryKey: ['active-connections', pageSize],
initialPageParam: undefined as number | undefined,
initialPageParam: undefined as unknown | undefined,
queryFn: ({ pageParam }) => fetchConnections({ pageSize: pageSize, cursor: pageParam }),
getNextPageParam: (lastPage) =>
lastPage.results?.length >= pageSize && lastPage.cursor !== 0 ? lastPage.cursor : undefined,
Expand Down
6 changes: 3 additions & 3 deletions packages/common/common-app/src/hooks/connections/useDomains.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { getDomains } from '../../provider/network/domainNetwork/DomainProvider'

interface useActiveDomainsProps {
pageSize: number;
cursor?: number;
cursor?: unknown;
}

export const useDomains = (
Expand All @@ -15,7 +15,7 @@ export const useDomains = (
const dotYouClient = useDotYouClientContext();

const fetchDomains = async (
{ pageSize, cursor }: { pageSize: number; cursor?: number } = {
{ pageSize, cursor }: { pageSize: number; cursor?: unknown } = {
pageSize: 10,
}
) => {
Expand All @@ -37,7 +37,7 @@ export const useDomains = (
fetch: useInfiniteQuery({
queryKey: ['active-domains', activePageSize, activePage],
queryFn: ({ pageParam }) => fetchDomains({ pageSize: activePageSize, cursor: pageParam }),
initialPageParam: undefined as number | undefined,
initialPageParam: undefined as unknown | undefined,
getNextPageParam: (lastPage) =>
lastPage.results?.length >= activePageSize ? lastPage.cursor : undefined,
refetchOnWindowFocus: false,
Expand Down
24 changes: 12 additions & 12 deletions packages/common/common-app/src/hooks/notifications/usePushNotifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const usePushNotifications = () => {
const dotYouClient = useDotYouClientContext();
const queryClient = useQueryClient();

const getNotifications = async (cursor: number | undefined) =>
const getNotifications = async (cursor: unknown | undefined) =>
await GetNotifications(dotYouClient, undefined, PAGE_SIZE, cursor);

const markAsRead = async (notificationIds: string[]) =>
Expand All @@ -38,7 +38,7 @@ export const usePushNotifications = () => {
return {
fetch: useInfiniteQuery({
queryKey: ['push-notifications'],
initialPageParam: undefined as number | undefined,
initialPageParam: undefined as unknown | undefined,
queryFn: ({ pageParam }) => getNotifications(pageParam),
getNextPageParam: (lastPage) =>
lastPage?.results && lastPage?.results?.length >= PAGE_SIZE ? lastPage.cursor : undefined,
Expand All @@ -50,14 +50,14 @@ export const usePushNotifications = () => {
const existingData = queryClient.getQueryData<
InfiniteData<{
results: PushNotification[];
cursor: number;
cursor: unknown;
}>
>(['push-notifications']);

if (!existingData) return;
const newData: InfiniteData<{
results: PushNotification[];
cursor: number;
cursor: unknown;
}> = {
...existingData,
pages: existingData.pages.map((page) => ({
Expand All @@ -71,7 +71,7 @@ export const usePushNotifications = () => {
queryClient.setQueryData<
InfiniteData<{
results: PushNotification[];
cursor: number;
cursor: unknown;
}>
>(['push-notifications'], newData);

Expand All @@ -87,14 +87,14 @@ export const usePushNotifications = () => {
const existingData = queryClient.getQueryData<
InfiniteData<{
results: PushNotification[];
cursor: number;
cursor: unknown;
}>
>(['push-notifications']);

if (!existingData) return;
const newData: InfiniteData<{
results: PushNotification[];
cursor: number;
cursor: unknown;
}> = {
...existingData,
pages: existingData.pages.map((page) => ({
Expand All @@ -105,7 +105,7 @@ export const usePushNotifications = () => {
queryClient.setQueryData<
InfiniteData<{
results: PushNotification[];
cursor: number;
cursor: unknown;
}>
>(['push-notifications'], newData);

Expand All @@ -125,14 +125,14 @@ export const insertNewNotification = (
const existingData = queryClient.getQueryData<
InfiniteData<{
results: PushNotification[];
cursor: number;
cursor: unknown;
}>
>(['push-notifications']);

if (!existingData) return;
const newData: InfiniteData<{
results: PushNotification[];
cursor: number;
cursor: unknown;
}> = {
...existingData,
pages: existingData.pages.map((page, index) => ({
Expand All @@ -150,7 +150,7 @@ export const insertNewNotification = (
queryClient.setQueryData<
InfiniteData<{
results: PushNotification[];
cursor: number;
cursor: unknown;
}>
>(['push-notifications'], newData);
};
Expand Down Expand Up @@ -244,7 +244,7 @@ export const insertPushNotification = async (
) => {
const existingNotificationData = queryClient.getQueryData<{
results: PushNotification[] | undefined;
cursor: number;
cursor: unknown;
}>(['push-notifications']);

if (existingNotificationData) {
Expand Down
2 changes: 1 addition & 1 deletion packages/common/common-app/src/provider/network/domainNetwork/DomainProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const getDomains = async (
// eslint-disable-next-line @typescript-eslint/no-unused-vars
data: {
count: number;
cursor?: number;
cursor?: unknown;
}
): Promise<NumberCursoredResult<DomainMembership>> => {
const client = dotYouClient.createAxiosClient();
Expand Down
2 changes: 1 addition & 1 deletion packages/libs/js-lib/src/core/DriveData/Drive/DriveTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export interface GetBatchQueryResultOptions {

export interface QueryModifiedResponse {
includeHeaderContent: boolean;
cursor: number;
cursor: unknown;
searchResults: (HomebaseFile | DeletedHomebaseFile)[];
}

Expand Down
2 changes: 1 addition & 1 deletion packages/libs/js-lib/src/core/DriveData/Query/DriveQueryTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export interface CursoredResult<T> {

export interface NumberCursoredResult<T> {
results: T[];
cursor: number;
cursor: unknown;
}

export interface MultiRequestCursoredResult<T> {
Expand Down
2 changes: 1 addition & 1 deletion packages/libs/js-lib/src/core/NotificationData/PushNotificationsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const GetNotifications = async (
dotYouClient: DotYouClient,
appId: string | undefined,
count: number | undefined = 50,
cursor: number | undefined
cursor: unknown | undefined
) => {
const axiosClient = dotYouClient.createAxiosClient();
return await axiosClient
Expand Down
2 changes: 1 addition & 1 deletion packages/libs/js-lib/src/network/connection/ConnectionManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const getConnections = async (
dotYouClient: DotYouClient,
data: {
count: number;
cursor?: number;
cursor?: unknown;
}
): Promise<NumberCursoredResult<DotYouProfile>> => {
const client = dotYouClient.createAxiosClient();
Expand Down
Loading