Imported types from util/pagination

Author: Imiss-U1025

client/packages/lowcoder/src/api/apiResponses.ts

@@ -12,14 +12,6 @@ export interface GenericApiResponse<T> {
   data: T;
 }
 
-export interface GenericApiPaginationResponse<T> {
-  total: number;
-  success: boolean;
-  code: number;
-  message: string;
-  data: T;
-}
-
 export interface FetchGroupApiResponse<T> extends GenericApiResponse<T> {
   totalAdmins: number,
   totalAdminsAndDevelopers: number,

client/packages/lowcoder/src/api/applicationApi.ts

@@ -5,15 +5,14 @@ import {
   DeleteApplicationPayload,
   DeleteAppPermissionPayload,
   FetchAppInfoPayload,
-  FetchApplicationElementsPaginationPayload,
   HomeDataPayload,
   PublishApplicationPayload,
   RecycleApplicationPayload,
   RestoreApplicationPayload,
   SetAppEditingStatePayload,
   UpdateAppPermissionPayload,
 } from "redux/reduxActions/applicationActions";
-import {ApiResponse, GenericApiPaginationResponse, GenericApiResponse} from "./apiResponses";
+import {ApiResponse, GenericApiResponse} from "./apiResponses";
 import { JSONObject, JSONValue } from "util/jsonTypes";
 import {
   ApplicationDetail,
@@ -25,6 +24,7 @@ import {
 } from "constants/applicationConstants";
 import { CommonSettingResponseData } from "./commonSettingApi";
 import { ResourceType } from "@lowcoder-ee/constants/queryConstants";
+import {fetchAppRequestType, GenericApiPaginationResponse} from "@lowcoder-ee/util/pagination/type";
 
 export interface HomeOrgMeta {
   id: string;
@@ -109,7 +109,7 @@ class ApplicationApi extends Api {
     return Api.get(ApplicationApi.newURLPrefix + "/list", { ...request, withContainerSize: false });
   }
 
-  static fetchAllApplicationsPagination(request: FetchApplicationElementsPaginationPayload): AxiosPromise<GenericApiPaginationResponse<ApplicationMeta[]>> {
+  static fetchAllApplicationsPagination(request: fetchAppRequestType): AxiosPromise<GenericApiPaginationResponse<ApplicationMeta[]>> {
     return Api.get(ApplicationApi.newURLPrefix + "/list", { ...request, withContainerSize: false, applicationStatus: "RECYCLED" });
   }
 

client/packages/lowcoder/src/api/folderApi.ts

@@ -1,15 +1,18 @@
 import Api from "./api";
 import { AxiosPromise } from "axios";
-import {GenericApiPaginationResponse, GenericApiResponse} from "./apiResponses";
+import { GenericApiResponse } from "./apiResponses";
 import {
   CreateFolderPayload,
   DeleteFolderPayload,
-  FetchFolderElementsPaginationPayload,
   FetchFolderElementsPayload,
   MoveToFolderPayload,
   UpdateFolderPayload,
 } from "../redux/reduxActions/folderActions";
 import { ApplicationMeta, FolderMeta } from "../constants/applicationConstants";
+import {
+  fetchFolderRequestType,
+  GenericApiPaginationResponse
+} from "@lowcoder-ee/util/pagination/type";
 
 export class FolderApi extends Api {
   static url = "/folders";
@@ -43,7 +46,7 @@ export class FolderApi extends Api {
   }
 
   static fetchFolderElementsPagination(
-      request: FetchFolderElementsPaginationPayload
+      request: fetchFolderRequestType
   ): AxiosPromise<GenericApiPaginationResponse<(ApplicationMeta | FolderMeta)[]>> {
     return Api.get(FolderApi.url + `/elements`, { ...request });
   }

client/packages/lowcoder/src/redux/reduxActions/applicationActions.ts

@@ -140,13 +140,6 @@ export type SetAppEditingStatePayload = {
   editingFinished: boolean;
 };
 
-export interface FetchApplicationElementsPaginationPayload {
-  pageNum?: number;
-  pageSize?: number;
-  name?: string;
-  applicationType?: number;
-}
-
 export const fetchApplicationInfo = (payload: FetchAppInfoPayload) => ({
   type: ReduxActionTypes.FETCH_APPLICATION_DETAIL,
   payload: payload,

client/packages/lowcoder/src/redux/reduxActions/folderActions.ts

@@ -78,13 +78,6 @@ export interface FetchFolderElementsPayload {
   folderId?: string;
 }
 
-export interface FetchFolderElementsPaginationPayload {
-  pageNum?: number;
-  pageSize?: number;
-  name?: string;
-  applicationType?: string;
-}
-
 export const fetchFolderElements = (
   payload: FetchFolderElementsPayload
 ): ReduxAction<FetchFolderElementsPayload> => {