Commit0060f16

authored

Merge pull request#1791 from iamfaran/folder-elements-endpoint

[Fix]: remove applications/list endpoint from home

2 parentsfa29568 +46a1477 commit0060f16Copy full SHA for 0060f16

File tree

+17

-10

lines changed

client/packages/lowcoder/src
- pages/ApplicationV2
  - index.tsx
- redux/sagas
  - folderSagas.ts

+17

-10

lines changed

Lines changed: 5 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import {`
`32`	`32`	`UserIcon,`
`33`	`33`	`}from"lowcoder-design";`
`34`	`34`	`importReact,{useCallback,useEffect,useState,useMemo}from"react";`
`35`		`-import{fetchAllApplications,fetchHomeData}from"redux/reduxActions/applicationActions";`
	`35`	`+import{fetchHomeData}from"redux/reduxActions/applicationActions";`
`36`	`36`	`import{fetchSubscriptionsAction}from"redux/reduxActions/subscriptionActions";`
`37`	`37`	`import{getHomeOrg,normalAppListSelector}from"redux/selectors/applicationSelector";`
`38`	`38`	`import{DatasourceHome}from"../datasource";`
`@@ -125,18 +125,13 @@ export default function ApplicationHome() {`
`125`	`125`	`},[org,orgHomeId]);`
`126`	`126`
`127`	`127`	`useEffect(()=>{`
`128`		`-if(allAppCount!==0){`
`129`		`-return;`
`130`		`-}`
`131`		`-user.currentOrgId&&dispatch(fetchAllApplications({}));`
`132`		`-},[dispatch,allAppCount,user.currentOrgId]);`
`133`		`-`
`134`		`-useEffect(()=>{`
`135`		`-if(allFoldersCount!==0){`
	`128`	`+// Check if we need to fetch data (either no folders or no applications)`
	`129`	`+if(allFoldersCount!==0&&allAppCount!==0){`
`136`	`130`	`return;`
`137`	`131`	`}`
	`132`	`+`
`138`	`133`	`user.currentOrgId&&dispatch(fetchFolderElements({}));`
`139`		`-},[dispatch,allFoldersCount,user.currentOrgId]);`
	`134`	`+},[dispatch,allFoldersCount,allAppCount,user.currentOrgId]);`
`140`	`135`
`141`	`136`	`if(fetchingUser\|\|!isPreloadCompleted){`
`142`	`137`	`return<ProductLoading/>;`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,19 @@ export function* fetchFolderElementsSaga(action: ReduxAction<FetchFolderElements`
`118`	`118`	`type:ReduxActionTypes.FETCH_ALL_FOLDERS_SUCCESS,`
`119`	`119`	`payload:response.data.data.filter((m)=>m.folder),`
`120`	`120`	`});`
	`121`	`+`
	`122`	`+// filter out applications with NORMAL status`
	`123`	`+`
	`124`	`+constapplications=response.data.data.filter((item):item isApplicationMeta=>`
	`125`	`+!item.folder&&item.applicationStatus==="NORMAL"`
	`126`	`+);`
	`127`	`+`
	`128`	`+yieldput({`
	`129`	`+type:ReduxActionTypes.FETCH_ALL_APPLICATIONS_SUCCESS,`
	`130`	`+payload:applications,`
	`131`	`+});`
`121`	`132`	`}`
	`133`	`+`
`122`	`134`	`yieldput({`
`123`	`135`	`type:ReduxActionTypes.FETCH_FOLDER_ELEMENTS_SUCCESS,`
`124`	`136`	`payload:{parentFolderId:action.payload.folderId,elements:response.data.data},`

Comments

(0)