Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 82ab433

Browse files
Imiss-U1025Imiss-U1025
committed
Remove all of subscribe of route and its dependencies.
1 parent 8ab325c commit 82ab433

File tree

10 files changed

+11
-537
lines changed

10 files changed

+11
-537
lines changed

‎viewer/packages/lowcoder/src/constants/routesURL.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export const COMPONENT_DOC_URL = "/components";
1010
export const SETTING_URL = "/setting";
1111
export const PERMISSION_SETTING = "/setting/permission";
1212
export const ORGANIZATION_SETTING = "/setting/organization";
13-
export const SUBSCRIPTION_SETTING = "/setting/subscription";
1413
export const THEME_SETTING = "/setting/theme";
1514
export const PLUGINS_SETTING = "/setting/plugins";
1615
export const THEME_DETAIL = "/setting/theme/detail";
@@ -19,11 +18,6 @@ export const THEME_DETAIL_URL = `${THEME_DETAIL}/:themeId`;
1918
export const OAUTH_PROVIDER_SETTING = "/setting/oauth-provider";
2019
export const OAUTH_PROVIDER_DETAIL = "/setting/oauth-provider/detail";
2120

22-
export const SUBSCRIPTION_SUCCESS = `${SUBSCRIPTION_SETTING}/success`;
23-
export const SUBSCRIPTION_ERROR = `${SUBSCRIPTION_SETTING}/error`;
24-
export const SUBSCRIPTION_DETAIL = `${SUBSCRIPTION_SETTING}/details/:subscriptionId/:productId`;
25-
export const SUBSCRIPTION_INFO = `${SUBSCRIPTION_SETTING}/info/:productId`;
26-
2721
export const ALL_APPLICATIONS_URL = "/apps";
2822
export const ADMIN_APP_URL = "/ee/:applicationId/:viewMode";
2923
export const APPLICATION_MARKETPLACE_URL = `https://app.lowcoder.cloud/apps`;
@@ -101,6 +95,3 @@ export const buildGroupId = (groupId: string) => `${PERMISSION_SETTING}/${groupI
10195

10296
export const buildOrgId = (orgId: string) => `${ORGANIZATION_SETTING}/${orgId}`;
10397

104-
export const buildSubscriptionSettingsLink = (subscriptionId: string, productId : string) => `${SUBSCRIPTION_SETTING}/details/${subscriptionId}/${productId}`;
105-
export const buildSubscriptionInfoLink = (productId: string) => `${SUBSCRIPTION_SETTING}/info/${productId}`;
106-

‎viewer/packages/lowcoder/src/pages/setting/settingHome.tsx

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import AuditSetting from "@lowcoder-ee/pages/setting/audit";
88
import { isEE, isEnterpriseMode, isSelfDomain, showAuditLog } from "util/envUtils";
99
import { TwoColumnSettingPageContent } from "./styled";
1010
import SubSideBar from "components/layout/SubSideBar";
11-
import {
11+
import {
1212
Menu,
1313
UserGroupIcon,
1414
UserShieldIcon,
1515
LeftSettingIcon,
1616
ThemeIcon,
1717
WorkspacesIcon,
1818
SubscriptionIcon,
19-
} from "lowcoder-design";
19+
} from "lowcoder-design";
2020
import { useSelector } from "react-redux";
2121
import { useEffect } from "react";
2222
import { getUser } from "redux/selectors/usersSelectors";
@@ -29,7 +29,6 @@ import { enableCustomBrand } from "util/featureFlagUtils";
2929
import FreeLimitTag from "pages/common/freeLimitTag";
3030
import { Helmet } from "react-helmet";
3131
import { Card } from "antd";
32-
import { Subscription } from "./subscriptions";
3332

3433
enum SettingPageEnum {
3534
UserGroups = "permission",
@@ -53,28 +52,28 @@ export function SettingHome() {
5352
{
5453
key: SettingPageEnum.Organization,
5554
label: trans("settings.organization"),
56-
icon: <WorkspacesIcon width={"20px"}/>,
55+
icon: <WorkspacesIcon width={"20px"} />,
5756
},
5857
{
5958
key: SettingPageEnum.OAuthProvider,
6059
label: (trans("settings.oauthProviders")),
6160
disabled: !currentOrgAdmin(user),
62-
icon: <UserShieldIcon width={"20px"}/>,
61+
icon: <UserShieldIcon width={"20px"} />,
6362
},
6463
{
6564
key: SettingPageEnum.UserGroups,
6665
label: trans("settings.userGroups"),
67-
icon: <UserGroupIcon width={"20px"}/>,
66+
icon: <UserGroupIcon width={"20px"} />,
6867
},
6968
{
7069
key: SettingPageEnum.Theme,
7170
label: trans("settings.theme"),
72-
icon: <ThemeIcon width={"20px"}/>,
71+
icon: <ThemeIcon width={"20px"} />,
7372
},
7473
{
7574
key: SettingPageEnum.Advanced,
7675
label: trans("settings.advanced"),
77-
icon: <LeftSettingIcon width={"20px"}/>,
76+
icon: <LeftSettingIcon width={"20px"} />,
7877
},
7978

8079
// Premium features
@@ -120,8 +119,8 @@ export function SettingHome() {
120119
!currentOrgAdmin(user) ||
121120
!enableCustomBrand(config) ||
122121
(!isSelfDomain(config) && !isEnterpriseMode(config))) && (
123-
<FreeLimitTag text={trans("settings.premium")} />
124-
)}
122+
<FreeLimitTag text={trans("settings.premium")} />
123+
)}
125124
</span>
126125
),
127126
disabled:
@@ -143,10 +142,10 @@ export function SettingHome() {
143142
selectedKeys={[selectKey]}
144143
onClick={(value) => {
145144
history.push("/setting/" + value.key);
146-
} }
145+
}}
147146
items={items} />
148147

149-
<Card style={{marginTop: "40px", color:"#aaa"}}>
148+
<Card style={{ marginTop: "40px", color: "#aaa" }}>
150149
<div>If you are interested in early access to the upcoming Enterprise Edition, please contact us: <a href="mailto:[email protected]">[email protected]</a></div>
151150
</Card>
152151
</SubSideBar>
@@ -157,7 +156,6 @@ export function SettingHome() {
157156
{selectKey === SettingPageEnum.Audit && <AuditSetting />}
158157
{selectKey === SettingPageEnum.Branding && <BrandingSetting />}
159158
{selectKey === SettingPageEnum.Advanced && <AdvancedSetting />}
160-
{selectKey === SettingPageEnum.Subscription && <Subscription />}
161159
</TwoColumnSettingPageContent>
162160
</>
163161
);

‎viewer/packages/lowcoder/src/pages/setting/subscriptions/index.tsx

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎viewer/packages/lowcoder/src/pages/setting/subscriptions/productCard.tsx

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎viewer/packages/lowcoder/src/pages/setting/subscriptions/styledComponents.tsx

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎viewer/packages/lowcoder/src/pages/setting/subscriptions/subscriptionDetail.tsx

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎viewer/packages/lowcoder/src/pages/setting/subscriptions/subscriptionError.tsx

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)