Skip to content

Commit 74e59cc

Browse files
authored
Merge pull request #1197 from lowcoder-org/subscription-handling
Subscription handling
2 parents c771ef9 + ed1a330 commit 74e59cc

Some content is hidden

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

44 files changed

+2078
-783
lines changed

client/packages/lowcoder-design/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"dependencies": {
1010
"colord": "^2.9.3",
1111
"react-fontawesome": "^0.2.0",
12-
"react-markdown": "^8.0.0",
12+
"react-markdown": "^9.0.1",
1313
"react-virtualized": "^9.22.3",
14-
"rehype-raw": "^6.1.1",
15-
"rehype-sanitize": "^5.0.1",
14+
"rehype-raw": "^7.0.0",
15+
"rehype-sanitize": "^6.0.0",
1616
"remark-gfm": "^4.0.0",
1717
"simplebar": "^6.2.5",
1818
"simplebar-react": "^3.2.4"

client/packages/lowcoder-design/src/components/markdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { lazy } from "react";
44
import rehypeRaw from "rehype-raw";
55
import rehypeSanitize, { defaultSchema } from "rehype-sanitize";
66
import remarkGfm from "remark-gfm";
7-
import type { ReactMarkdownOptions } from "react-markdown/lib/react-markdown";
7+
import type { Options as ReactMarkdownOptions } from "react-markdown/lib";
88

99
const ReactMarkdown = lazy(() => import('react-markdown'));
1010

client/packages/lowcoder/index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
<script>
5252
window.global = window;
5353
</script>
54+
<script
55+
src="https://tag.clearbitscripts.com/v1/pk_dfbc0aeefb28dc63475b67134facf127/tags.js"
56+
referrerPolicy="no-referrer"
57+
></script>
5458
</head>
5559
<body>
5660
<div id="not-supported-browser"></div>

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

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

15+
export interface FetchGroupApiResponse<T> extends GenericApiResponse<T> {
16+
totalAdmins: number,
17+
totalAdminsAndDevelopers: number,
18+
totalDevelopersOnly: number,
19+
totalOtherMembers: number,
20+
}
21+
1522
// NO_DATASOURCES_FOUND, 1000, "Unable to find {0} with id {1}"
1623
// INVALID_PARAMTER, 4000, "Invalid parameter {0} provided in the input"
1724
// PLUGIN_NOT_INSTALLED, 4001, "Plugin {0} not installed"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ class ConfigApi extends Api {
1717
}
1818
return Api.get(authConfigURL);
1919
}
20+
21+
static fetchDeploymentId(): AxiosPromise<ConfigResponse> {
22+
return Api.get(`${ConfigApi.configURL}/deploymentId`);
23+
}
2024
}
2125

2226
export default ConfigApi;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy