Content-Length: 106343 | pFad | http://github.com/lowcoder-org/lowcoder/pull/1494.diff
thub.com diff --git a/client/packages/lowcoder/src/api/commonSettingApi.ts b/client/packages/lowcoder/src/api/commonSettingApi.ts index d549b1ff8..b2f746454 100644 --- a/client/packages/lowcoder/src/api/commonSettingApi.ts +++ b/client/packages/lowcoder/src/api/commonSettingApi.ts @@ -82,35 +82,6 @@ export interface ThemeDetail { dataLoadingIndicator?: string; } -export interface BrandingSettings { - logo: string | null; - squareLogo: string | null; - mainBrandingColor: string; - appHeaderColor: string; - adminSidebarColor: string; - adminSidebarFontColor: string; - adminSidebarActiveBgColor: string; - adminSidebarActiveFontColor: string; - editorSidebarColor: string; - editorSidebarFontColor: string; - editorSidebarActiveBgColor: string; - editorSidebarActiveFontColor: string; - font: string; - errorPageText: string; - errorPageImage: string | null; - signUpPageText: string; - signUpPageImage: string | null; - loggedOutPageText: string; - loggedOutPageImage: string | null; - standardDescription: string; - standardTitle: string; - showDocumentation: boolean; - documentationLink: string | null; - submitIssue: boolean; - whatsNew: boolean; - whatsNewLink: string | null; -} - export function getThemeDetailName(key: keyof ThemeDetail) { switch (key) { case "primary": return trans("themeDetail.primary"); diff --git a/client/packages/lowcoder/src/api/enterpriseApi.ts b/client/packages/lowcoder/src/api/enterpriseApi.ts index 8301b6865..05a1e69c5 100644 --- a/client/packages/lowcoder/src/api/enterpriseApi.ts +++ b/client/packages/lowcoder/src/api/enterpriseApi.ts @@ -1,45 +1,110 @@ import axios from 'axios'; +export interface FetchBrandingSettingPayload { + orgId?: string; +} +export interface BrandingSettings { + logo?: string | null; + squareLogo?: string | null; + mainBrandingColor?: string; + appHeaderColor?: string; + adminSidebarColor?: string; + adminSidebarFontColor?: string; + adminSidebarActiveBgColor?: string; + adminSidebarActiveFontColor?: string; + editorSidebarColor?: string; + editorSidebarFontColor?: string; + editorSidebarActiveBgColor?: string; + editorSidebarActiveFontColor?: string; + font?: string; + errorPageText?: string; + errorPageImage?: string | null; + signUpPageText?: string; + signUpPageImage?: string | null; + loggedOutPageText?: string; + loggedOutPageImage?: string | null; + standardDescription?: string; + standardTitle?: string; + showDocumentation?: boolean; + documentationLink?: string | null; + submitIssue?: boolean; + whatsNew?: boolean; + whatsNewLink?: string | null; +} +export interface BrandingConfig { + config_name?: string, + config_description?: string, + config_icon?: string, + config_set?: BrandingSettings, + org_id?: string, + user_id?: string, + id?: string, +} + +export interface BrandingSettingResponse extends BrandingConfig {}; + +export interface EnterpriseLicenseResponse { + eeActive: boolean; + remainingAPICalls: number; + eeLicenses: Array<{ + uuid: string; + issuedTo: string; + apiCallsLimit: number; + }>; +} + // Existing functions export const getEnterpriseLicense = async () => { - const response = await axios.get('/api/plugins/enterprise/license'); - return response.data; + const response = await axios.get('/api/plugins/enterprise/license'); + return response.data; }; export const getAuditLogs = async (params = {}) => { - const query = new URLSearchParams(params).toString(); - const response = await axios.get(`/api/plugins/enterprise/audit-logs${query ? `?${query}` : ''}`); - return response.data; + const query = new URLSearchParams(params).toString(); + const response = await axios.get(`/api/plugins/enterprise/audit-logs${query ? `?${query}` : ''}`); + return response.data; }; export const getAuditLogStatistics = async (groupByParam : string) => { - const response = await axios.get(`/api/plugins/enterprise/audit-logs/statistics?groupByParam=${groupByParam}`); - return response.data; + const response = await axios.get(`/api/plugins/enterprise/audit-logs/statistics?groupByParam=${groupByParam}`); + return response.data; }; export const getAppUsageLogs = async (params = {}) => { - const query = new URLSearchParams(params).toString(); - const response = await axios.get(`/api/plugins/enterprise/app-usage-logs${query ? `?${query}` : ''}`); - return response.data; + const query = new URLSearchParams(params).toString(); + const response = await axios.get(`/api/plugins/enterprise/app-usage-logs${query ? `?${query}` : ''}`); + return response.data; }; export const getAppUsageStatistics = async (groupByParam : string) => { - const response = await axios.get(`/api/plugins/enterprise/app-usage-logs/statistics?groupByParam=${groupByParam}`); - return response.data; + const response = await axios.get(`/api/plugins/enterprise/app-usage-logs/statistics?groupByParam=${groupByParam}`); + return response.data; }; -export const getBranding = async () => { - const response = await axios.get('/api/plugins/enterprise/branding'); - return response.data; +export const getBranding = async (orgId: string = '') => { + const response = await axios.get('/api/plugins/enterprise/branding?orgId='+orgId); + const data = response.data; + if (Boolean(data.error)) { + return {}; + } + return { + ...data, + config_set: JSON.parse(data.config_set), + }; }; export const createBranding = async (brandingData : any) => { - const response = await axios.post('/api/plugins/enterprise/branding', brandingData); - return response.data; + let response; + if (brandingData.id) { + response = await axios.put(`/api/plugins/enterprise/branding?brandId=${brandingData.id}`, brandingData); + } else { + response = await axios.post('/api/plugins/enterprise/branding', brandingData); + } + return response.data; }; export const updateBranding = async (brandingData : any) => { - const response = await axios.put('/api/plugins/enterprise/branding', brandingData); - return response.data; + const response = await axios.put('/api/plugins/enterprise/branding', brandingData); + return response.data; }; diff --git a/client/packages/lowcoder/src/app.tsx b/client/packages/lowcoder/src/app.tsx index cc5332c9c..b8f40ae6d 100644 --- a/client/packages/lowcoder/src/app.tsx +++ b/client/packages/lowcoder/src/app.tsx @@ -60,7 +60,8 @@ import GlobalInstances from 'components/GlobalInstances'; import { fetchHomeData, fetchServerSettingsAction } from "./redux/reduxActions/applicationActions"; import { getNpmPackageMeta } from "./comps/utils/remote"; import { packageMetaReadyAction, setLowcoderCompsLoading } from "./redux/reduxActions/npmPluginActions"; -import { fetchCommonSettings } from "./redux/reduxActions/commonSettingsActions"; +import { fetchBrandingSetting } from "./redux/reduxActions/enterpriseActions"; +import { EnterpriseProvider } from "./util/context/EnterpriseContext"; const LazyUserAuthComp = React.lazy(() => import("pages/userAuth")); const LazyInviteLanding = React.lazy(() => import("pages/common/inviteLanding")); @@ -95,7 +96,7 @@ type AppIndexProps = { defaultHomePage: string | null | undefined; fetchHomeDataFinished: boolean; fetchConfig: (orgId?: string) => void; - fetchCommonSettings: (orgId: string) => void; + fetchBrandingSetting: (orgId?: string) => void; fetchHomeData: (currentUserAnonymous?: boolean | undefined) => void; fetchLowcoderCompVersions: () => void; getCurrentUser: () => void; @@ -123,7 +124,7 @@ class AppIndex extends React.Component