Skip to content

Commit be24fe3

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request #1137 from lowcoder-org/subscription-handling
Subscription handling #2
2 parents 67a01ad + fe89b29 commit be24fe3

File tree

1,501 files changed

+1162059
-7045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,501 files changed

+1162059
-7045
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ application-dev-localhost.yaml
1616
.vscode/settings.json
1717
.vscode/launch.json
1818
server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml
19+
translations/locales/node_modules/

‎client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-root",
3-
"version": "2.3.1",
3+
"version": "2.4.5",
44
"type": "module",
55
"private": true,
66
"workspaces": [

‎client/packages/lowcoder-cli/config/vite.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ export default defineConfig({
2727
extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"],
2828
},
2929
build: {
30-
target: "es2015",
31-
cssTarget: "chrome63",
30+
target: "es2020",
31+
cssTarget: "chrome87",
3232
outDir: paths.appOutPath,
3333
emptyOutDir: true,
3434
lib: {

‎client/packages/lowcoder-design/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"react-virtualized": "^9.22.3",
1414
"rehype-raw": "^6.1.1",
1515
"rehype-sanitize": "^5.0.1",
16-
"remark-gfm": "^3.0.1",
16+
"remark-gfm": "^4.0.0",
1717
"simplebar": "^6.2.5",
1818
"simplebar-react": "^3.2.4"
1919
},

‎client/packages/lowcoder-design/src/icons/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ export { ReactComponent as HomeListIcon } from "./v1/icon-application-list.svg";
127127
export { ReactComponent as HomeCardIcon } from "./v1/icon-application-card.svg";
128128
export { ReactComponent as APIDocsIcon } from "./remix/instance-line.svg";
129129
export { ReactComponent as SubscriptionIcon } from "./remix/award-fill.svg";
130+
export { ReactComponent as SupportIcon } from "./remix/user-heart-line.svg";
130131
// export { ReactComponent as AllAppIcon } from "./v1/icon-all-app.svg";
131132

132133

‎client/packages/lowcoder/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"react-helmet": "^6.1.0",
7474
"react-joyride": "^2.4.0",
7575
"react-json-view": "^1.21.3",
76-
"react-markdown": "^8.0.0",
76+
"react-markdown": "^9.0.1",
7777
"react-qr-barcode-scanner": "^1.0.6",
7878
"react-quill": "^2.0.0",
7979
"react-redux": "^7.2.6",
@@ -91,7 +91,7 @@
9191
"regenerator-runtime": "^0.13.9",
9292
"rehype-raw": "^6.1.1",
9393
"rehype-sanitize": "^5.0.1",
94-
"remark-gfm": "^3.0.1",
94+
"remark-gfm": "^4.0.0",
9595
"resize-observer-polyfill": "^1.5.1",
9696
"simplebar-react": "^3.2.4",
9797
"sql-formatter": "^8.2.0",

‎client/packages/lowcoder/src/api/apiUtils.ts

+14
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,17 @@ export function doValidResponse(response: AxiosResponse<ApiResponse>) {
207207
}
208208
return response.data.success;
209209
}
210+
211+
function toHex(num: number | bigint, length: number): string {
212+
return num.toString(16).padStart(length, '0');
213+
}
214+
215+
export function calculateFlowCode() {
216+
// flow generation
217+
const part1: number = 2527698043;
218+
const part2: number = 15000 - 832;
219+
const part3: number = 20000 - 472;
220+
const part4: number = (46000 + 257);
221+
const part5: bigint = 185593952632172n;
222+
return `${toHex(part1, 8)}-${toHex(part2, 4)}-${toHex(part3, 4)}-${toHex(part4, 4)}-${toHex(part5, 12)}`;
223+
}

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -77,25 +77,25 @@ interface GrantAppPermissionReq {
7777

7878
class ApplicationApi extends Api {
7979
static newURLPrefix = "/applications";
80-
static fetchHomeDataURL = "/v1/applications/home";
81-
static createApplicationURL = "/v1/applications";
82-
static fetchAllMarketplaceAppsURL = "/v1/applications/marketplace-apps";
83-
static deleteApplicationURL = (applicationId: string) => `/v1/applications/${applicationId}`;
84-
static getAppPublishInfoURL = (applicationId: string) => `/v1/applications/${applicationId}/view`;
85-
static getAppEditingInfoURL = (applicationId: string) => `/v1/applications/${applicationId}`;
86-
static updateApplicationURL = (applicationId: string) => `/v1/applications/${applicationId}`;
80+
static fetchHomeDataURL = "/applications/home";
81+
static createApplicationURL = "/applications";
82+
static fetchAllMarketplaceAppsURL = "/applications/marketplace-apps";
83+
static deleteApplicationURL = (applicationId: string) => `/applications/${applicationId}`;
84+
static getAppPublishInfoURL = (applicationId: string) => `/applications/${applicationId}/view`;
85+
static getAppEditingInfoURL = (applicationId: string) => `/applications/${applicationId}`;
86+
static updateApplicationURL = (applicationId: string) => `/applications/${applicationId}`;
8787
static getApplicationPermissionURL = (applicationId: string) =>
88-
`/v1/applications/${applicationId}/permissions`;
88+
`/applications/${applicationId}/permissions`;
8989
static grantAppPermissionURL = (applicationId: string) =>
90-
`/v1/applications/${applicationId}/permissions`;
90+
`/applications/${applicationId}/permissions`;
9191
static publishApplicationURL = (applicationId: string) =>
92-
`/v1/applications/${applicationId}/publish`;
92+
`/applications/${applicationId}/publish`;
9393
static updateAppPermissionURL = (applicationId: string, permissionId: string) =>
94-
`/v1/applications/${applicationId}/permissions/${permissionId}`;
95-
static createFromTemplateURL = `/v1/applications/createFromTemplate`;
94+
`/applications/${applicationId}/permissions/${permissionId}`;
95+
static createFromTemplateURL = `/applications/createFromTemplate`;
9696
static publicToAllURL = (applicationId: string) => `/applications/${applicationId}/public-to-all`;
97-
static publicToMarketplaceURL = (applicationId: string) => `/v1/applications/${applicationId}/public-to-marketplace`;
98-
static getMarketplaceAppURL = (applicationId: string) => `/v1/applications/${applicationId}/view_marketplace`;
97+
static publicToMarketplaceURL = (applicationId: string) => `/applications/${applicationId}/public-to-marketplace`;
98+
static getMarketplaceAppURL = (applicationId: string) => `/applications/${applicationId}/view_marketplace`;
9999

100100

101101
static fetchHomeData(request: HomeDataPayload): AxiosPromise<HomeDataResponse> {

‎client/packages/lowcoder/src/api/datasourceApi.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export interface DataSourceTypeInfo {
155155
}
156156

157157
export class DatasourceApi extends Api {
158-
static url = "v1/datasources";
158+
static url = "datasources";
159159

160160
// this api can be accessed by anonymous users when app is public.
161161
static fetchJsDatasourceByApp(
@@ -207,7 +207,7 @@ export class DatasourceApi extends Api {
207207
static fetchDatasourceType(
208208
orgId: string
209209
): AxiosPromise<GenericApiResponse<DataSourceTypeInfo[]>> {
210-
return Api.get(`/v1/organizations/${orgId}/datasourceTypes`);
210+
return Api.get(`/organizations/${orgId}/datasourceTypes`);
211211
}
212212

213213
static fetchDynamicPluginConfig<T = any>(

‎client/packages/lowcoder/src/api/inviteApi.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export type InviteInfo = {
1919

2020
class InviteApi extends Api {
2121
static getInviteURL = "/invitation";
22-
static acceptInviteURL = (invitationId: string) => `/v1/invitation/${invitationId}/invite`;
22+
static acceptInviteURL = (invitationId: string) => `/invitation/${invitationId}/invite`;
2323

2424
// generate invitation
2525
static getInvite(request: GetInviteRequest): AxiosPromise<GenericApiResponse<InviteInfo>> {

‎client/packages/lowcoder/src/api/orgApi.ts

+18-18
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,24 @@ export interface OrgAPIUsageResponse extends ApiResponse {
3434
}
3535

3636
export class OrgApi extends Api {
37-
static createGroupURL = "/v1/groups";
38-
static updateGroupURL = (groupId: string) => `/v1/groups/${groupId}/update`;
39-
static fetchGroupURL = "/v1/groups/list";
40-
static fetchGroupUsersURL = (groupId: string) => `/v1/groups/${groupId}/members`;
41-
static deleteGroupURL = (groupId: string) => `/v1/groups/${groupId}`;
42-
static fetchOrgUsersURL = (orgId: string) => `/v1/organizations/${orgId}/members`;
43-
static deleteOrgUsersURL = (orgId: string) => `/v1/organizations/${orgId}/remove`;
44-
static deleteGroupUserURL = (groupId: string) => `/v1/groups/${groupId}/remove`;
45-
static addGroupUserURL = (groupId: string) => `/v1/groups/${groupId}/addMember`;
46-
static updateUserOrgRoleURL = (orgId: string) => `/v1/organizations/${orgId}/role`;
47-
static updateUserGroupRoleURL = (groupId: string) => `/v1/groups/${groupId}/role`;
48-
static quitOrgURL = (orgId: string) => `/v1/organizations/${orgId}/leave`;
49-
static quitGroupURL = (groupId: string) => `/v1/groups/${groupId}/leave`;
50-
static switchOrgURL = (orgId: string) => `/v1/organizations/switchOrganization/${orgId}`;
51-
static createOrgURL = "/v1/organizations";
52-
static deleteOrgURL = (orgId: string) => `/v1/organizations/${orgId}`;
53-
static updateOrgURL = (orgId: string) => `/v1/organizations/${orgId}/update`;
54-
static fetchUsage = (orgId: string) => `/v1/organizations/${orgId}/api-usage`;
37+
static createGroupURL = "/groups";
38+
static updateGroupURL = (groupId: string) => `/groups/${groupId}/update`;
39+
static fetchGroupURL = "/groups/list";
40+
static fetchGroupUsersURL = (groupId: string) => `/groups/${groupId}/members`;
41+
static deleteGroupURL = (groupId: string) => `/groups/${groupId}`;
42+
static fetchOrgUsersURL = (orgId: string) => `/organizations/${orgId}/members`;
43+
static deleteOrgUsersURL = (orgId: string) => `/organizations/${orgId}/remove`;
44+
static deleteGroupUserURL = (groupId: string) => `/groups/${groupId}/remove`;
45+
static addGroupUserURL = (groupId: string) => `/groups/${groupId}/addMember`;
46+
static updateUserOrgRoleURL = (orgId: string) => `/organizations/${orgId}/role`;
47+
static updateUserGroupRoleURL = (groupId: string) => `/groups/${groupId}/role`;
48+
static quitOrgURL = (orgId: string) => `/organizations/${orgId}/leave`;
49+
static quitGroupURL = (groupId: string) => `/groups/${groupId}/leave`;
50+
static switchOrgURL = (orgId: string) => `/organizations/switchOrganization/${orgId}`;
51+
static createOrgURL = "/organizations";
52+
static deleteOrgURL = (orgId: string) => `/organizations/${orgId}`;
53+
static updateOrgURL = (orgId: string) => `/organizations/${orgId}/update`;
54+
static fetchUsage = (orgId: string) => `/organizations/${orgId}/api-usage`;
5555

5656
static createGroup(request: { name: string }): AxiosPromise<GenericApiResponse<OrgGroup>> {
5757
return Api.post(OrgApi.createGroupURL, request);

‎client/packages/lowcoder/src/api/platformApi.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { AxiosPromise } from "axios";
22
import Api from "./api";
33

44
export class PlatformApi extends Api {
5-
static url = "v1/query";
5+
static url = "query";
66

77
static version(): AxiosPromise<string> {
88
return Api.get("/VERSION", { _t: Date.now() }, { baseURL: "/" });

‎client/packages/lowcoder/src/api/queryApi.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export type QueryExecuteResponse = {
4646
};
4747

4848
export class QueryApi extends Api {
49-
static url = "v1/query";
49+
static url = "query";
5050

5151
static queryExecuteCancelTokenSource: Record<string, CancelTokenSource> = {};
5252

0 commit comments

Comments
 (0)