Merge pull request #1137 from lowcoder-org/subscription-handling

Subscription handling #2

Author: FalkWolsky

.gitignore

@@ -16,3 +16,4 @@ application-dev-localhost.yaml
 .vscode/settings.json
 .vscode/launch.json
 server/api-service/lowcoder-server/src/main/resources/application-local-dev.yaml
+translations/locales/node_modules/

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-root",
-  "version": "2.3.1",
+  "version": "2.4.5",
   "type": "module",
   "private": true,
   "workspaces": [

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

@@ -27,8 +27,8 @@ export default defineConfig({
     extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json"],
   },
   build: {
-    target: "es2015",
-    cssTarget: "chrome63",
+    target: "es2020",
+    cssTarget: "chrome87",
     outDir: paths.appOutPath,
     emptyOutDir: true,
     lib: {

client/packages/lowcoder-design/package.json

@@ -13,7 +13,7 @@
     "react-virtualized": "^9.22.3",
     "rehype-raw": "^6.1.1",
     "rehype-sanitize": "^5.0.1",
-    "remark-gfm": "^3.0.1",
+    "remark-gfm": "^4.0.0",
     "simplebar": "^6.2.5",
     "simplebar-react": "^3.2.4"
   },

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

@@ -127,6 +127,7 @@ export { ReactComponent as HomeListIcon } from "./v1/icon-application-list.svg";
 export { ReactComponent as HomeCardIcon } from "./v1/icon-application-card.svg";
 export { ReactComponent as APIDocsIcon } from "./remix/instance-line.svg";
 export { ReactComponent as SubscriptionIcon } from "./remix/award-fill.svg";
+export { ReactComponent as SupportIcon } from "./remix/user-heart-line.svg";
 // export { ReactComponent as AllAppIcon } from "./v1/icon-all-app.svg";
 
 

client/packages/lowcoder/package.json

@@ -73,7 +73,7 @@
     "react-helmet": "^6.1.0",
     "react-joyride": "^2.4.0",
     "react-json-view": "^1.21.3",
-    "react-markdown": "^8.0.0",
+    "react-markdown": "^9.0.1",
     "react-qr-barcode-scanner": "^1.0.6",
     "react-quill": "^2.0.0",
     "react-redux": "^7.2.6",
@@ -91,7 +91,7 @@
     "regenerator-runtime": "^0.13.9",
     "rehype-raw": "^6.1.1",
     "rehype-sanitize": "^5.0.1",
-    "remark-gfm": "^3.0.1",
+    "remark-gfm": "^4.0.0",
     "resize-observer-polyfill": "^1.5.1",
     "simplebar-react": "^3.2.4",
     "sql-formatter": "^8.2.0",

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

@@ -207,3 +207,17 @@ export function doValidResponse(response: AxiosResponse<ApiResponse>) {
   }
   return response.data.success;
 }
+
+function toHex(num: number | bigint, length: number): string {
+  return num.toString(16).padStart(length, '0');
+}
+
+export function calculateFlowCode() {
+  // flow generation
+  const part1: number = 2527698043;
+  const part2: number = 15000 - 832;
+  const part3: number = 20000 - 472;
+  const part4: number = (46000 + 257);
+  const part5: bigint = 185593952632172n;
+  return `${toHex(part1, 8)}-${toHex(part2, 4)}-${toHex(part3, 4)}-${toHex(part4, 4)}-${toHex(part5, 12)}`;
+}

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

@@ -77,25 +77,25 @@ interface GrantAppPermissionReq {
 
 class ApplicationApi extends Api {
   static newURLPrefix = "/applications";
-  static fetchHomeDataURL = "/v1/applications/home";
-  static createApplicationURL = "/v1/applications";
-  static fetchAllMarketplaceAppsURL = "/v1/applications/marketplace-apps";
-  static deleteApplicationURL = (applicationId: string) => `/v1/applications/${applicationId}`;
-  static getAppPublishInfoURL = (applicationId: string) => `/v1/applications/${applicationId}/view`;
-  static getAppEditingInfoURL = (applicationId: string) => `/v1/applications/${applicationId}`;
-  static updateApplicationURL = (applicationId: string) => `/v1/applications/${applicationId}`;
+  static fetchHomeDataURL = "/applications/home";
+  static createApplicationURL = "/applications";
+  static fetchAllMarketplaceAppsURL = "/applications/marketplace-apps";
+  static deleteApplicationURL = (applicationId: string) => `/applications/${applicationId}`;
+  static getAppPublishInfoURL = (applicationId: string) => `/applications/${applicationId}/view`;
+  static getAppEditingInfoURL = (applicationId: string) => `/applications/${applicationId}`;
+  static updateApplicationURL = (applicationId: string) => `/applications/${applicationId}`;
   static getApplicationPermissionURL = (applicationId: string) =>
-    `/v1/applications/${applicationId}/permissions`;
+    `/applications/${applicationId}/permissions`;
   static grantAppPermissionURL = (applicationId: string) =>
-    `/v1/applications/${applicationId}/permissions`;
+    `/applications/${applicationId}/permissions`;
   static publishApplicationURL = (applicationId: string) =>
-    `/v1/applications/${applicationId}/publish`;
+    `/applications/${applicationId}/publish`;
   static updateAppPermissionURL = (applicationId: string, permissionId: string) =>
-    `/v1/applications/${applicationId}/permissions/${permissionId}`;
-  static createFromTemplateURL = `/v1/applications/createFromTemplate`;
+    `/applications/${applicationId}/permissions/${permissionId}`;
+  static createFromTemplateURL = `/applications/createFromTemplate`;
   static publicToAllURL = (applicationId: string) => `/applications/${applicationId}/public-to-all`;
-  static publicToMarketplaceURL = (applicationId: string) => `/v1/applications/${applicationId}/public-to-marketplace`;
-  static getMarketplaceAppURL = (applicationId: string) => `/v1/applications/${applicationId}/view_marketplace`;
+  static publicToMarketplaceURL = (applicationId: string) => `/applications/${applicationId}/public-to-marketplace`;
+  static getMarketplaceAppURL = (applicationId: string) => `/applications/${applicationId}/view_marketplace`;
 
 
   static fetchHomeData(request: HomeDataPayload): AxiosPromise<HomeDataResponse> {

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

@@ -155,7 +155,7 @@ export interface DataSourceTypeInfo {
 }
 
 export class DatasourceApi extends Api {
-  static url = "v1/datasources";
+  static url = "datasources";
 
   // this api can be accessed by anonymous users when app is public.
   static fetchJsDatasourceByApp(
@@ -207,7 +207,7 @@ export class DatasourceApi extends Api {
   static fetchDatasourceType(
     orgId: string
   ): AxiosPromise<GenericApiResponse<DataSourceTypeInfo[]>> {
-    return Api.get(`/v1/organizations/${orgId}/datasourceTypes`);
+    return Api.get(`/organizations/${orgId}/datasourceTypes`);
   }
 
   static fetchDynamicPluginConfig<T = any>(

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

@@ -19,7 +19,7 @@ export type InviteInfo = {
 
 class InviteApi extends Api {
   static getInviteURL = "/invitation";
-  static acceptInviteURL = (invitationId: string) => `/v1/invitation/${invitationId}/invite`;
+  static acceptInviteURL = (invitationId: string) => `/invitation/${invitationId}/invite`;
 
   // generate invitation
   static getInvite(request: GetInviteRequest): AxiosPromise<GenericApiResponse<InviteInfo>> {