From 796a0d9877d83db6a9166f0b8c0ac811cff4adc7 Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Mon, 4 Mar 2024 21:31:54 +0100 Subject: [PATCH 1/3] Check for Marketplace at lowcoder.cloud --- .../lowcoder/src/pages/ApplicationV2/HomeLayout.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx index c5749fd37..e82b6cee6 100644 --- a/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx +++ b/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx @@ -307,7 +307,6 @@ export function HomeLayout(props: HomeLayoutProps) { checkIsMobile(window.innerWidth) ? "card" : getHomeLayout() ); - useEffect(() => saveHomeLayout(layout), [layout]); useEffect(() => { @@ -329,13 +328,12 @@ export function HomeLayout(props: HomeLayoutProps) { // Merge local and global apps into the elements array displayElements = [...markedLocalApps, ...markedGlobalApps]; } - else if (mode === "marketplace") { + else if (mode === "marketplace" && !isSelfHost) { const markedLocalApps = localMarketplaceApps.map(app => ({ ...app, isLocalMarketplace: true })); displayElements = [...markedLocalApps]; + console.log("displayElements: ", displayElements, markedLocalApps); } - console.log("displayElements", displayElements, mode, window.location.host, isSelfHost); - const resList: HomeRes[] = displayElements .filter((e) => searchValue From 889fe4da3e14479a5832a927f6481cd4f1db1e6c Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Mon, 4 Mar 2024 21:55:04 +0100 Subject: [PATCH 2/3] Fix in Marketplace App Fetching --- .../lowcoder/src/pages/ApplicationV2/MarketplaceView.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/MarketplaceView.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/MarketplaceView.tsx index 8d4ac977a..4207cc821 100644 --- a/client/packages/lowcoder/src/pages/ApplicationV2/MarketplaceView.tsx +++ b/client/packages/lowcoder/src/pages/ApplicationV2/MarketplaceView.tsx @@ -46,9 +46,9 @@ export function MarketplaceView() { useEffect(() => { // Make sure we are fetching local marketplace apps for self-hosted environments if (window.location.host !== 'app.lowcoder.cloud') { - fetchLocalMarketplaceApps(); + fetchMarketplaceApps(); } - fetchMarketplaceApps(); + fetchLocalMarketplaceApps(); }, []); return ( From 11bfd375639cf848a5119b620bd3afa262028b39 Mon Sep 17 00:00:00 2001 From: FalkWolsky Date: Mon, 4 Mar 2024 21:57:00 +0100 Subject: [PATCH 3/3] Remove Console.log --- client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx b/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx index e82b6cee6..3bb84fba9 100644 --- a/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx +++ b/client/packages/lowcoder/src/pages/ApplicationV2/HomeLayout.tsx @@ -331,7 +331,6 @@ export function HomeLayout(props: HomeLayoutProps) { else if (mode === "marketplace" && !isSelfHost) { const markedLocalApps = localMarketplaceApps.map(app => ({ ...app, isLocalMarketplace: true })); displayElements = [...markedLocalApps]; - console.log("displayElements: ", displayElements, markedLocalApps); } const resList: HomeRes[] = displayElements