Skip to content

Commit 9410dc7

Browse files
committed
Imported types from util/pagination
1 parent 63c376d commit 9410dc7

File tree

5 files changed

+9
-28
lines changed

5 files changed

+9
-28
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ export interface GenericApiResponse<T> {
1212
data: T;
1313
}
1414

15-
export interface GenericApiPaginationResponse<T> {
16-
total: number;
17-
success: boolean;
18-
code: number;
19-
message: string;
20-
data: T;
21-
}
22-
2315
export interface FetchGroupApiResponse<T> extends GenericApiResponse<T> {
2416
totalAdmins: number,
2517
totalAdminsAndDevelopers: number,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ import {
55
DeleteApplicationPayload,
66
DeleteAppPermissionPayload,
77
FetchAppInfoPayload,
8-
FetchApplicationElementsPaginationPayload,
98
HomeDataPayload,
109
PublishApplicationPayload,
1110
RecycleApplicationPayload,
1211
RestoreApplicationPayload,
1312
SetAppEditingStatePayload,
1413
UpdateAppPermissionPayload,
1514
} from "redux/reduxActions/applicationActions";
16-
import {ApiResponse, GenericApiPaginationResponse, GenericApiResponse} from "./apiResponses";
15+
import {ApiResponse, GenericApiResponse} from "./apiResponses";
1716
import { JSONObject, JSONValue } from "util/jsonTypes";
1817
import {
1918
ApplicationDetail,
@@ -25,6 +24,7 @@ import {
2524
} from "constants/applicationConstants";
2625
import { CommonSettingResponseData } from "./commonSettingApi";
2726
import { ResourceType } from "@lowcoder-ee/constants/queryConstants";
27+
import {fetchAppRequestType, GenericApiPaginationResponse} from "@lowcoder-ee/util/pagination/type";
2828

2929
export interface HomeOrgMeta {
3030
id: string;
@@ -109,7 +109,7 @@ class ApplicationApi extends Api {
109109
return Api.get(ApplicationApi.newURLPrefix + "/list", { ...request, withContainerSize: false });
110110
}
111111

112-
static fetchAllApplicationsPagination(request: FetchApplicationElementsPaginationPayload): AxiosPromise<GenericApiPaginationResponse<ApplicationMeta[]>> {
112+
static fetchAllApplicationsPagination(request: fetchAppRequestType): AxiosPromise<GenericApiPaginationResponse<ApplicationMeta[]>> {
113113
return Api.get(ApplicationApi.newURLPrefix + "/list", { ...request, withContainerSize: false, applicationStatus: "RECYCLED" });
114114
}
115115

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
import Api from "./api";
22
import { AxiosPromise } from "axios";
3-
import {GenericApiPaginationResponse, GenericApiResponse} from "./apiResponses";
3+
import { GenericApiResponse } from "./apiResponses";
44
import {
55
CreateFolderPayload,
66
DeleteFolderPayload,
7-
FetchFolderElementsPaginationPayload,
87
FetchFolderElementsPayload,
98
MoveToFolderPayload,
109
UpdateFolderPayload,
1110
} from "../redux/reduxActions/folderActions";
1211
import { ApplicationMeta, FolderMeta } from "../constants/applicationConstants";
12+
import {
13+
fetchFolderRequestType,
14+
GenericApiPaginationResponse
15+
} from "@lowcoder-ee/util/pagination/type";
1316

1417
export class FolderApi extends Api {
1518
static url = "/folders";
@@ -43,7 +46,7 @@ export class FolderApi extends Api {
4346
}
4447

4548
static fetchFolderElementsPagination(
46-
request: FetchFolderElementsPaginationPayload
49+
request: fetchFolderRequestType
4750
): AxiosPromise<GenericApiPaginationResponse<(ApplicationMeta | FolderMeta)[]>> {
4851
return Api.get(FolderApi.url + `/elements`, { ...request });
4952
}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,6 @@ export type SetAppEditingStatePayload = {
140140
editingFinished: boolean;
141141
};
142142

143-
export interface FetchApplicationElementsPaginationPayload {
144-
pageNum?: number;
145-
pageSize?: number;
146-
name?: string;
147-
applicationType?: number;
148-
}
149-
150143
export const fetchApplicationInfo = (payload: FetchAppInfoPayload) => ({
151144
type: ReduxActionTypes.FETCH_APPLICATION_DETAIL,
152145
payload: payload,

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,6 @@ export interface FetchFolderElementsPayload {
7878
folderId?: string;
7979
}
8080

81-
export interface FetchFolderElementsPaginationPayload {
82-
pageNum?: number;
83-
pageSize?: number;
84-
name?: string;
85-
applicationType?: string;
86-
}
87-
8881
export const fetchFolderElements = (
8982
payload: FetchFolderElementsPayload
9083
): ReduxAction<FetchFolderElementsPayload> => {

0 commit comments

Comments
 (0)