fetch global branding when org branding isn't available

Author: raheeliftikhar5

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;

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));

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]);

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: ''}));
     }

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: {},
+      })
+    }
   }
 }