fetch global branding when org branding isn't available

raheeliftikhar5 · raheeliftikhar5 · commit 288ff6514b3e · 2025-05-24T15:32:31.000+05:00
diff --git a/client/packages/lowcoder/src/api/enterpriseApi.ts b/client/packages/lowcoder/src/api/enterpriseApi.ts
@@ -2,6 +2,7 @@ import axios from 'axios';
 
 export interface FetchBrandingSettingPayload {
   orgId?: string;
+  fallbackToGlobal?: boolean;
 }
 export interface BrandingSettings {
   logo?: string | null;
diff --git a/client/packages/lowcoder/src/app.tsx b/client/packages/lowcoder/src/app.tsx
@@ -459,7 +459,7 @@ const mapDispatchToProps = (dispatch: any) => ({
   fetchHomeData: (currentUserAnonymous: boolean | undefined) => {
     dispatch(fetchHomeData({}));
   },
-  fetchBrandingSetting: (orgId?: string) => dispatch(fetchBrandingSetting({ orgId })),
+  fetchBrandingSetting: (orgId?: string) => dispatch(fetchBrandingSetting({ orgId, fallbackToGlobal: true })),
   fetchLowcoderCompVersions: async () => {
     try {
       dispatch(setLowcoderCompsLoading(true));
diff --git a/client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx b/client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx
@@ -184,7 +184,6 @@ export default function FormLoginSteps(props: FormLoginProps) {
     // and skip workspace selection step
     if (Boolean(organizationId)) {
       setSkipWorkspaceStep(true);
-      dispatch(fetchConfigAction(organizationId));
       setCurrentStep(CurrentStepEnum.AUTH_PROVIDERS);
       return;
     }
@@ -226,7 +225,6 @@ export default function FormLoginSteps(props: FormLoginProps) {
 
   useEffect(() => {
     if (isEnterpriseMode) {
-      // dispatch(fetchConfigAction());
       fetchOrgsByEmail();
     }
   }, [isEnterpriseMode]);
diff --git a/client/packages/lowcoder/src/pages/userAuth/index.tsx b/client/packages/lowcoder/src/pages/userAuth/index.tsx
@@ -30,7 +30,7 @@ export default function UserAuth() {
   useEffect(() => {
     if(organizationId) {
       dispatch(fetchConfigAction(organizationId));
-      dispatch(fetchBrandingSetting({orgId: organizationId}));
+      dispatch(fetchBrandingSetting({orgId: organizationId, fallbackToGlobal: true}));
     } else {
       dispatch(fetchBrandingSetting({orgId: ''}));
     }
diff --git a/client/packages/lowcoder/src/redux/sagas/enterpriseSagas.ts b/client/packages/lowcoder/src/redux/sagas/enterpriseSagas.ts
@@ -32,6 +32,13 @@ function* fetchBrandingSettingSaga(action: ReduxAction<FetchBrandingSettingPaylo
     }
   } catch (error) {
     console.error('Failed to fetch branding setting:', error);
+    // fetch global branding if org's branding setting is not available
+    if (Boolean(action.payload.orgId) && action.payload.fallbackToGlobal) {
+      yield put({
+        type: ReduxActionTypes.FETCH_BRANDING_SETTING,
+        payload: {},
+      })
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import axios from 'axios';`
`2`	`2`
`3`	`3`	`export interface FetchBrandingSettingPayload {`
`4`	`4`	`orgId?: string;`
	`5`	`+ fallbackToGlobal?: boolean;`
`5`	`6`	`}`
`6`	`7`	`export interface BrandingSettings {`
`7`	`8`	`logo?: string \| null;`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,6 @@ export default function FormLoginSteps(props: FormLoginProps) {`
`184`	`184`	`// and skip workspace selection step`
`185`	`185`	`if (Boolean(organizationId)) {`
`186`	`186`	`setSkipWorkspaceStep(true);`
`187`		`- dispatch(fetchConfigAction(organizationId));`
`188`	`187`	`setCurrentStep(CurrentStepEnum.AUTH_PROVIDERS);`
`189`	`188`	`return;`
`190`	`189`	`}`
`@@ -226,7 +225,6 @@ export default function FormLoginSteps(props: FormLoginProps) {`
`226`	`225`
`227`	`226`	`useEffect(() => {`
`228`	`227`	`if (isEnterpriseMode) {`
`229`		`- // dispatch(fetchConfigAction());`
`230`	`228`	`fetchOrgsByEmail();`
`231`	`229`	`}`
`232`	`230`	`}, [isEnterpriseMode]);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export default function UserAuth() {`
`30`	`30`	`useEffect(() => {`
`31`	`31`	`if(organizationId) {`
`32`	`32`	`dispatch(fetchConfigAction(organizationId));`
`33`		`- dispatch(fetchBrandingSetting({orgId: organizationId}));`
	`33`	`+ dispatch(fetchBrandingSetting({orgId: organizationId, fallbackToGlobal: true}));`
`34`	`34`	`} else {`
`35`	`35`	`dispatch(fetchBrandingSetting({orgId: ''}));`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,13 @@ function* fetchBrandingSettingSaga(action: ReduxAction<FetchBrandingSettingPaylo`
`32`	`32`	`}`
`33`	`33`	`} catch (error) {`
`34`	`34`	`console.error('Failed to fetch branding setting:', error);`
	`35`	`+ // fetch global branding if org's branding setting is not available`
	`36`	`+ if (Boolean(action.payload.orgId) && action.payload.fallbackToGlobal) {`
	`37`	`+ yield put({`
	`38`	`+ type: ReduxActionTypes.FETCH_BRANDING_SETTING,`
	`39`	`+ payload: {},`
	`40`	`+ })`
	`41`	`+ }`
`35`	`42`	`}`
`36`	`43`	`}`
`37`	`44`