fix routing issue

raheeliftikhar5 · raheeliftikhar5 · commit b530982bb040 · 2025-04-21T13:41:55.000+05:00
diff --git a/client/packages/lowcoder/src/app.tsx b/client/packages/lowcoder/src/app.tsx
@@ -35,7 +35,7 @@ import React from "react";
 import { createRoot } from "react-dom/client";
 import { Helmet } from "react-helmet";
 import { connect, Provider } from "react-redux";
-import { Redirect, Router, Switch } from "react-router-dom";
+import { Redirect, Route, Router, Switch } from "react-router-dom";
 import type { AppState } from "redux/reducers";
 import { fetchConfigAction } from "redux/reduxActions/configActions";
 import { fetchUserAction } from "redux/reduxActions/userActions";
@@ -311,15 +311,10 @@ class AppIndex extends React.Component<AppIndexProps, any> {
                 component={LazyPublicAppEditor}
               />
 
-              <SimpleSubscriptionContextProvider>
-                <LazyRoute
-                  fallback="layout"
-                  path={APP_EDITOR_URL}
-                  component={LazyAppEditor}
-                />
-                <LazyRoute
-                  fallback="layout"
-                  path={[
+              <Route
+                path={
+                  [
+                    APP_EDITOR_URL,
                     USER_PROFILE_URL,
                     NEWS_URL,
                     ORG_HOME_URL,
@@ -335,11 +330,41 @@ class AppIndex extends React.Component<AppIndexProps, any> {
                     SETTING_URL,
                     MARKETPLACE_URL,
                     ADMIN_APP_URL
-                  ]}
-                  // component={ApplicationListPage}
-                  component={LazyApplicationHome}
-                />
-              </SimpleSubscriptionContextProvider>
+                  ]
+                }
+              >
+                <SimpleSubscriptionContextProvider>
+                  <Switch>
+                    <LazyRoute
+                      fallback="layout"
+                      path={APP_EDITOR_URL}
+                      component={LazyAppEditor}
+                    />
+                    <LazyRoute
+                      fallback="layout"
+                      path={[
+                        USER_PROFILE_URL,
+                        NEWS_URL,
+                        ORG_HOME_URL,
+                        ALL_APPLICATIONS_URL,
+                        DATASOURCE_CREATE_URL,
+                        DATASOURCE_EDIT_URL,
+                        DATASOURCE_URL,
+                        SUPPORT_URL,
+                        QUERY_LIBRARY_URL,
+                        FOLDERS_URL,
+                        FOLDER_URL,
+                        TRASH_URL,
+                        SETTING_URL,
+                        MARKETPLACE_URL,
+                        ADMIN_APP_URL
+                      ]}
+                      // component={ApplicationListPage}
+                      component={LazyApplicationHome}
+                    />
+                  </Switch>
+                </SimpleSubscriptionContextProvider>
+              </Route>
               <LazyRoute exact path={ADMIN_AUTH_URL} component={LazyUserAuthComp} />
               <LazyRoute path={USER_AUTH_URL} component={LazyUserAuthComp} />
               <LazyRoute
diff --git a/client/packages/lowcoder/src/util/context/SimpleSubscriptionContext.tsx b/client/packages/lowcoder/src/util/context/SimpleSubscriptionContext.tsx
@@ -95,12 +95,12 @@ export const SimpleSubscriptionContextProvider = (props: {
       }
     };
   
-    if (!productsLoaded && !subscriptionProductsLoading) {
+    if (!productsLoaded && !subscriptionProductsLoading && !user.isAnonymous) {
       console.log("Outer context: Fetching products...");
       setSubscriptionProductsLoading(true);
       fetchProducts();
     }
-  }, [productsLoaded, subscriptionProductsLoading]);
+  }, [user.isAnonymous, productsLoaded, subscriptionProductsLoading]);
 
   useEffect(() => {
     const initializeCustomer = async () => {

Original file line number	Diff line number	Diff line change
`@@ -95,12 +95,12 @@ export const SimpleSubscriptionContextProvider = (props: {`
`95`	`95`	`}`
`96`	`96`	`};`
`97`	`97`
`98`		`- if (!productsLoaded && !subscriptionProductsLoading) {`
	`98`	`+ if (!productsLoaded && !subscriptionProductsLoading && !user.isAnonymous) {`
`99`	`99`	`console.log("Outer context: Fetching products...");`
`100`	`100`	`setSubscriptionProductsLoading(true);`
`101`	`101`	`fetchProducts();`
`102`	`102`	`}`
`103`		`- }, [productsLoaded, subscriptionProductsLoading]);`
	`103`	`+ }, [user.isAnonymous, productsLoaded, subscriptionProductsLoading]);`
`104`	`104`
`105`	`105`	`useEffect(() => {`
`106`	`106`	`const initializeCustomer = async () => {`