fix(wren-ui): allow back to previous steps for onboarding and improve (…

…#152)
Canner · Apr 23, 2024 · 337f837 · 337f837
1 parent d1ed527
commit 337f837
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/wren-ui/src/components/pages/setup/ConnectDataSource.tsx b/wren-ui/src/components/pages/setup/ConnectDataSource.tsx
@@ -71,13 +71,13 @@ export default function ConnectDataSource(props: Props) {
             </DataSource>
           </Col>
           <Col className="text-right" span={12}>
-            Learn more information in {current.label}{' '}
+            Learn more information in the {current.label}{' '}
             <Link
               href={current.guide}
               target="_blank"
               rel="noopener noreferrer"
             >
-              the setup guide
+              setup guide
             </Link>
             .
           </Col>

diff --git a/wren-ui/src/components/pages/setup/SelectModels.tsx b/wren-ui/src/components/pages/setup/SelectModels.tsx
@@ -52,7 +52,7 @@ export default function SelectModels(props: Props) {
         understand your data.
         <br />
         <Link
-          href="https://docs.getwren.ai/guides/modeling/models"
+          href="https://docs.getwren.ai/guide/modeling/overview"
           target="_blank"
           rel="noopener noreferrer"
         >

diff --git a/wren-ui/src/hooks/useCheckOnboarding.tsx b/wren-ui/src/hooks/useCheckOnboarding.tsx
@@ -13,11 +13,20 @@ const redirectRoute = {
 
 export const useWithOnboarding = () => {
   const router = useRouter();
-  const { data, loading } = useOnboardingStatusQuery({
-    fetchPolicy: 'network-only',
-  });
+  const { data, loading, refetch } = useOnboardingStatusQuery();
+
   const onboardingStatus = data?.onboardingStatus?.status;
 
+  useEffect(() => {
+    // do not refetch onboarding status when onboarding page
+    if (router.pathname.startsWith(Path.Onboarding)) {
+      return;
+    }
+
+    // refetch onboarding status when the route changes
+    refetch();
+  }, [router.pathname]);
+
   useEffect(() => {
     if (onboardingStatus) {
       const newPath = redirectRoute[onboardingStatus];
@@ -30,6 +39,14 @@ export const useWithOnboarding = () => {
           return;
         }
 
+        // allow return back to previous steps
+        if (
+          router.pathname.startsWith(Path.Onboarding) &&
+          onboardingStatus !== OnboardingStatus.ONBOARDING_FINISHED
+        ) {
+          return;
+        }
+
         router.push(newPath);
         return;
       }

diff --git a/wren-ui/src/hooks/useCombineFieldOptions.tsx b/wren-ui/src/hooks/useCombineFieldOptions.tsx
@@ -91,7 +91,9 @@ export default function useCombineFieldOptions(props: Props) {
 
   const [baseModel, setBaseModel] = useState<string>(model || '');
 
-  const { data } = useListModelsQuery();
+  const { data } = useListModelsQuery({
+    fetchPolicy: 'cache-and-network',
+  });
 
   const allModels = useMemo(() => {
     if (!data) return [];