Adapting Base Path in routesURL

FalkWolsky · FalkWolsky · commit 45c42133d119 · 2024-05-25T11:06:00.000+02:00
diff --git a/client/packages/lowcoder/src/constants/routesURL.ts b/client/packages/lowcoder/src/constants/routesURL.ts
@@ -4,38 +4,41 @@ import { UserGuideLocationState } from "pages/tutorials/tutorialsConstant";
 import { DatasourceType } from "@lowcoder-ee/constants/queryConstants";
 
 export const BASE_URL = "/";
-export const USER_AUTH_URL = "/user/auth";
-export const USER_PROFILE_URL = "/user/profile";
-export const NEWS_URL = "/news";
-export const ORG_HOME_URL = "/org/home";
-export const COMPONENT_DOC_URL = "/components";
-export const SETTING = "/setting";
-export const PERMISSION_SETTING = "/setting/permission";
-export const ORGANIZATION_SETTING = "/setting/organization";
-export const THEME_SETTING = "/setting/theme";
-export const PLUGINS_SETTING = "/setting/plugins";
-export const THEME_DETAIL = "/setting/theme/detail";
-
-export const OAUTH_PROVIDER_SETTING = "/setting/oauth-provider";
-export const OAUTH_PROVIDER_DETAIL = "/setting/oauth-provider/detail";
+
+export const USER_AUTH_URL = `${BASE_URL}/user/auth`;
+export const USER_PROFILE_URL = `${BASE_URL}user/profile`;
+export const NEWS_URL = `${BASE_URL}news`;
+export const ORG_HOME_URL = `${BASE_URL}org/home`;
+export const COMPONENT_DOC_URL = `${BASE_URL}components`;
+export const SETTING = `${BASE_URL}setting`;
+export const PERMISSION_SETTING = `${BASE_URL}setting/permission`;
+export const ORGANIZATION_SETTING = `${BASE_URL}setting/organization`;
+export const THEME_SETTING = `${BASE_URL}setting/theme`;
+export const PLUGINS_SETTING = `${BASE_URL}setting/plugins`;
+export const THEME_DETAIL = `${BASE_URL}setting/theme/detail`;
+export const API_DOCS_URL = `${BASE_URL}lowcoder-api`;
+
+export const ALL_APPLICATIONS_URL = `${BASE_URL}apps`;
+export const ADMIN_APP_URL = `${BASE_URL}ee/:applicationId/:viewMode`;
+
+export const OAUTH_PROVIDER_SETTING = `${BASE_URL}setting/oauth-provider`;
+export const OAUTH_PROVIDER_DETAIL = `${BASE_URL}setting/oauth-provider/detail`;
 
 export const PERMISSION_SETTING_DETAIL = `${PERMISSION_SETTING}/:groupId`;
 export const ORGANIZATION_SETTING_DETAIL = `${ORGANIZATION_SETTING}/:orgId`;
 
-export const ALL_APPLICATIONS_URL = "/apps";
-export const ADMIN_APP_URL = "/ee/:applicationId/:viewMode";
 export const APPLICATION_MARKETPLACE_URL = `https://app.lowcoder.cloud/apps`;
-export const MODULE_APPLICATIONS_URL = "/apps/module";
-export const MARKETPLACE_URL = `/marketplace`;
-export const DATASOURCE_URL = `/datasource`;
+
+export const MODULE_APPLICATIONS_URL = `${BASE_URL}apps/module`;
+export const MARKETPLACE_URL = `${BASE_URL}marketplace`;
+export const DATASOURCE_URL = `${BASE_URL}datasource`;
 export const DATASOURCE_CREATE_URL = `${DATASOURCE_URL}/new/:datasourceType`;
 export const DATASOURCE_EDIT_URL = `${DATASOURCE_URL}/:datasourceId`;
-export const QUERY_LIBRARY_URL = `/query-library`;
-export const API_DOCS_URL = `/lowcoder-api`;
-export const FOLDER_URL_PREFIX = `/folder`;
+export const QUERY_LIBRARY_URL = `${BASE_URL}query-library`;
+export const FOLDER_URL_PREFIX = `${BASE_URL}folder`;
 export const FOLDER_URL = `${FOLDER_URL_PREFIX}/:folderId`;
-export const FOLDERS_URL = `/folders`;
-export const TRASH_URL = `/trash`;
+export const FOLDERS_URL = `${BASE_URL}folders`;
+export const TRASH_URL = `${BASE_URL}trash`;
 export const IMPORT_APP_FROM_TEMPLATE_URL = `${ALL_APPLICATIONS_URL}/template-import/:templateId`;
 export const APP_EDITOR_URL = `${ALL_APPLICATIONS_URL}/:applicationId/:viewMode/:appPageId?`;
 
@@ -48,7 +51,7 @@ export const QR_CODE_OAUTH_URL = `${USER_AUTH_URL}/oauth/qrcode`;
 export const OAUTH_REDIRECT = `${USER_AUTH_URL}/oauth/redirect`;
 export const CAS_AUTH_REDIRECT = `${USER_AUTH_URL}/cas/redirect`;
 export const LDAP_AUTH_LOGIN_URL = `${USER_AUTH_URL}/ldap/login`;
-export const INVITE_LANDING_URL = "/invite/:invitationId";
+export const INVITE_LANDING_URL = `${BASE_URL}invite/:invitationId`;
 export const ORG_AUTH_LOGIN_URL = `/org/:orgId/auth/login`;
 export const ORG_AUTH_REGISTER_URL = `/org/:orgId/auth/register`;
 export const ORG_AUTH_FORGOT_PASSWORD_URL = `/org/:orgId/auth/forgot-password`;
diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/ApiDocLayout.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/ApiDocLayout.tsx
@@ -137,7 +137,7 @@ export function ApiDoc(props: ApiDocLayoutProps) {
                 hideExport={true}
                 tryItCredentialsPolicy="include"
                 tryItCorsProxy={isSelfHost ? undefined : 'https://api-service.lowcoder.cloud'}
-                basePath="lowcoder-api"
+                basePath={API_DOCS_URL}
                 apiDescriptionUrl="https://api-service.lowcoder.cloud/api/docs/api-docs"
               />
             </div>
