Commit288ff65

committed

fetch global branding when org branding isn't available

1 parent54925ea commit288ff65Copy full SHA for 288ff65

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import axios from 'axios';`
`2`	`2`
`3`	`3`	`exportinterfaceFetchBrandingSettingPayload{`
`4`	`4`	`orgId?:string;`
	`5`	`+fallbackToGlobal?:boolean;`
`5`	`6`	`}`
`6`	`7`	`exportinterfaceBrandingSettings{`
`7`	`8`	`logo?:string\|null;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ const mapDispatchToProps = (dispatch: any) => ({`
`459`	`459`	`fetchHomeData:(currentUserAnonymous:boolean\|undefined)=>{`
`460`	`460`	`dispatch(fetchHomeData({}));`
`461`	`461`	`},`
`462`		`-fetchBrandingSetting:(orgId?:string)=>dispatch(fetchBrandingSetting({ orgId})),`
	`462`	`+fetchBrandingSetting:(orgId?:string)=>dispatch(fetchBrandingSetting({ orgId,fallbackToGlobal:true})),`
`463`	`463`	`fetchLowcoderCompVersions:async()=>{`
`464`	`464`	`try{`
`465`	`465`	`dispatch(setLowcoderCompsLoading(true));`

Lines changed: 0 additions & 2 deletions

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

Lines changed: 1 addition & 1 deletion

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`	`}`

Lines changed: 7 additions & 0 deletions

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`	`+yieldput({`
	`38`	`+type:ReduxActionTypes.FETCH_BRANDING_SETTING,`
	`39`	`+payload:{},`
	`40`	`+})`
	`41`	`+}`
`35`	`42`	`}`
`36`	`43`	`}`
`37`	`44`

Comments

(0)