Fixed pagination on relationship table (#5959)

Author: bilalabbad

frontend/app/src/entities/nodes/relationships/api/get-object-relationships-from-api.ts

@@ -7,17 +7,16 @@ import {
   addFiltersToRequest,
   addRelationshipsToRequest,
 } from "@/shared/api/graphql/utils";
+import { ContextParams, PaginationParams } from "@/shared/api/types";
 import { Filter } from "@/shared/hooks/useFilters";
 import { gql } from "@apollo/client";
 import { jsonToGraphQLQuery } from "json-to-graphql-query";
 
-type GenerateObjectRelationshipsQueryParams = {
+type GenerateObjectRelationshipsQueryParams = PaginationParams & {
   parentKind: string;
   parentId: string;
   relationshipName: string;
   relationshipSchema: ModelSchema;
-  limit?: number;
-  offset?: number;
   filters?: Array<Filter>;
 };
 
@@ -26,7 +25,7 @@ const generateObjectRelationshipsQuery = ({
   parentId,
   relationshipName,
   relationshipSchema,
-  limit,
+  limit = 0,
   offset = 0,
   filters,
 }: GenerateObjectRelationshipsQueryParams) => {
@@ -45,6 +44,8 @@ const generateObjectRelationshipsQuery = ({
           node: {
             [relationshipName]: {
               __args: {
+                limit,
+                offset,
                 ...(filters ? addFiltersToRequest(filters) : {}),
               },
               edges: {
@@ -73,10 +74,8 @@ const generateObjectRelationshipsQuery = ({
   return jsonToGraphQLQuery(request);
 };
 
-export type GetObjectRelationshipsFromApiParams = GenerateObjectRelationshipsQueryParams & {
-  branchName: string;
-  atDate: Date | null;
-};
+export type GetObjectRelationshipsFromApiParams = ContextParams &
+  GenerateObjectRelationshipsQueryParams;
 
 export const getObjectRelationshipsFromApi = ({
   branchName,

frontend/app/src/entities/nodes/relationships/domain/get-object-relationships/get-object-relationships.query.ts

@@ -1,6 +1,8 @@
 import { getCurrentBranchName } from "@/entities/branches/domain/get-current-branch";
-import { OBJECTS_PER_PAGE } from "@/entities/nodes/object/domain/get-objects";
-import { getObjectRelationships } from "@/entities/nodes/relationships/domain/get-object-relationships/get-object-relationships";
+import {
+  OBJECT_RELATIONSHIPS_PER_PAGE,
+  getObjectRelationships,
+} from "@/entities/nodes/relationships/domain/get-object-relationships/get-object-relationships";
 import { ModelSchema } from "@/entities/schema/types";
 import { Filter } from "@/shared/hooks/useFilters";
 import { store } from "@/shared/stores";
@@ -49,10 +51,10 @@ export function getObjectRelationshipsQueryOptions({
     },
     initialPageParam: 0,
     getNextPageParam: (lastPage, _, lastPageParam) => {
-      if (lastPage.length < OBJECTS_PER_PAGE) {
+      if (lastPage.length < OBJECT_RELATIONSHIPS_PER_PAGE) {
         return undefined;
       }
-      return lastPageParam + OBJECTS_PER_PAGE;
+      return lastPageParam + OBJECT_RELATIONSHIPS_PER_PAGE;
     },
   });
 }

frontend/app/src/entities/nodes/relationships/domain/get-object-relationships/get-object-relationships.ts

@@ -1,19 +1,23 @@
 import { getObjectRelationshipsFromApi } from "@/entities/nodes/relationships/api/get-object-relationships-from-api";
 import { NodeObject } from "@/entities/nodes/types";
 import { ModelSchema } from "@/entities/schema/types";
+import { ContextParams, PaginationParams } from "@/shared/api/types";
 import { Filter } from "@/shared/hooks/useFilters";
 
-export type GetObjectRelationshipsParams = {
-  parentKind: string;
-  parentId: string;
-  relationshipName: string;
-  relationshipSchema: ModelSchema;
-  branchName: string;
-  atDate: Date | null;
-  limit?: number;
-  offset?: number;
-  filters?: Array<Filter>;
-};
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+export const OBJECT_RELATIONSHIPS_PER_PAGE = 40;
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+export type GetObjectRelationshipsParams = ContextParams &
+  PaginationParams & {
+    parentKind: string;
+    parentId: string;
+    relationshipName: string;
+    relationshipSchema: ModelSchema;
+    filters?: Array<Filter>;
+  };
 
 export type GetObjectRelationships = (
   params: GetObjectRelationshipsParams
@@ -22,11 +26,13 @@ export type GetObjectRelationships = (
 export const getObjectRelationships: GetObjectRelationships = async ({
   parentKind,
   relationshipName,
+  limit = OBJECT_RELATIONSHIPS_PER_PAGE,
   ...params
 }) => {
   const { data } = await getObjectRelationshipsFromApi({
     parentKind,
     relationshipName,
+    limit,
     ...params,
   });
 

frontend/app/src/shared/components/table/style.tsx

@@ -1,5 +1,4 @@
-export const cellsStyle =
-  "flex items-center gap-1.5 p-2 text-sm h-10 bg-white disabled:bg-white max-w-lg";
+export const cellsStyle = "flex items-center gap-1.5 p-2 text-sm h-10 bg-white disabled:bg-white";
 
 export const cellHeaderStyle = "z-[1] sticky top-0 border-r border-y hover:bg-gray-100 font-medium";