From 201357cb00eabe7b97ada443d7a1ed0d52a8e8ca Mon Sep 17 00:00:00 2001 From: bilalabbad Date: Mon, 17 Feb 2025 17:20:07 +0100 Subject: [PATCH] more --- .../app/src/entities/diff/api/get-diff-tree-from-api.ts | 5 ++--- frontend/app/src/entities/diff/domain/get-diff-tree.ts | 5 ++--- .../entities/nodes/api/generateRelationshipListQuery.ts | 5 ++--- .../entities/permission/api/get-permissions-from-api.ts | 7 ++----- .../entities/permission/domain/get-object-permissions.ts | 6 +----- 5 files changed, 9 insertions(+), 19 deletions(-) diff --git a/frontend/app/src/entities/diff/api/get-diff-tree-from-api.ts b/frontend/app/src/entities/diff/api/get-diff-tree-from-api.ts index 9422615592..e6e7f3c848 100644 --- a/frontend/app/src/entities/diff/api/get-diff-tree-from-api.ts +++ b/frontend/app/src/entities/diff/api/get-diff-tree-from-api.ts @@ -1,5 +1,6 @@ import { DiffTreeQueryFilters } from "@/shared/api/graphql/generated/graphql"; import graphqlClient from "@/shared/api/graphql/graphqlClientApollo"; +import { PaginationParams } from "@/shared/api/types"; import { gql } from "@apollo/client"; export const DIFF_TREE_QUERY = gql` @@ -127,11 +128,9 @@ export const DIFF_TREE_QUERY = gql` } `; -export type GetDiffTreeFromApiParams = { +export type GetDiffTreeFromApiParams = PaginationParams & { branchName: string; filters?: DiffTreeQueryFilters; - limit?: number; - offset?: number; }; export const getDiffTreeFromApi = async ({ diff --git a/frontend/app/src/entities/diff/domain/get-diff-tree.ts b/frontend/app/src/entities/diff/domain/get-diff-tree.ts index 3ba253b856..2810e3a55e 100644 --- a/frontend/app/src/entities/diff/domain/get-diff-tree.ts +++ b/frontend/app/src/entities/diff/domain/get-diff-tree.ts @@ -1,14 +1,13 @@ import { getDiffTreeFromApi } from "@/entities/diff/api/get-diff-tree-from-api"; import { DiffTree, DiffTreeQueryFilters } from "@/shared/api/graphql/generated/graphql"; +import { PaginationParams } from "@/shared/api/types"; import { infiniteQueryOptions, useInfiniteQuery } from "@tanstack/react-query"; export const DIFF_TREE_PER_PAGE = 300; -export type GetDiffTreeParams = { +export type GetDiffTreeParams = PaginationParams & { branchName: string; filters?: DiffTreeQueryFilters; - limit?: number; - offset: number; }; export type GetDiffTree = (params: GetDiffTreeParams) => Promise; diff --git a/frontend/app/src/entities/nodes/api/generateRelationshipListQuery.ts b/frontend/app/src/entities/nodes/api/generateRelationshipListQuery.ts index 2f3303cbb5..5ad672d030 100644 --- a/frontend/app/src/entities/nodes/api/generateRelationshipListQuery.ts +++ b/frontend/app/src/entities/nodes/api/generateRelationshipListQuery.ts @@ -1,3 +1,4 @@ +import { PaginationParams } from "@/shared/api/types"; import { jsonToGraphQLQuery } from "json-to-graphql-query"; export const generateRelationshipListQuery = ({ @@ -7,11 +8,9 @@ export const generateRelationshipListQuery = ({ offset = 0, search = "", peerField, -}: { +}: PaginationParams & { peer: string; parent?: { name?: string; value?: string }; - limit?: number; - offset?: number; search?: string; peerField?: string; }): string => { diff --git a/frontend/app/src/entities/permission/api/get-permissions-from-api.ts b/frontend/app/src/entities/permission/api/get-permissions-from-api.ts index 1b56d7658e..9731053e32 100644 --- a/frontend/app/src/entities/permission/api/get-permissions-from-api.ts +++ b/frontend/app/src/entities/permission/api/get-permissions-from-api.ts @@ -1,12 +1,9 @@ import { getObjectPermissionsQuery } from "@/entities/permission/queries/getObjectPermissions"; import graphqlClient from "@/shared/api/graphql/graphqlClientApollo"; +import { ContextParams } from "@/shared/api/types"; import { gql } from "@apollo/client"; -export type GetPermissionsFromApiParams = { - kind: string; - branchName?: string | null; - atDate?: Date | null; -}; +export type GetPermissionsFromApiParams = ContextParams & { kind: string }; export const getPermissionsFromApi = ({ kind, diff --git a/frontend/app/src/entities/permission/domain/get-object-permissions.ts b/frontend/app/src/entities/permission/domain/get-object-permissions.ts index 3bcf5ac1ce..c68338273b 100644 --- a/frontend/app/src/entities/permission/domain/get-object-permissions.ts +++ b/frontend/app/src/entities/permission/domain/get-object-permissions.ts @@ -3,11 +3,7 @@ import { Permission } from "@/entities/permission/types"; import { getPermission } from "@/entities/permission/utils"; import { ContextParams } from "@/shared/api/types"; -export type GetObjectPermissions = ( - args: ContextParams & { - kind: string; - } -) => Promise; +export type GetObjectPermissions = (args: ContextParams & { kind: string }) => Promise; export const getObjectPermissions: GetObjectPermissions = async ({ kind, branchName, atDate }) => { const { data } = await getPermissionsFromApi({ kind, branchName, atDate });