Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

default landing fix #1380

Merged
merged 2 commits into from
Sep 10, 2024
Merged

default landing fix #1380

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ce15b6
default landing fix
NabeelAyubee Sep 10, 2024
20aa122
added multiroottenant check
NabeelAyubee Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions micro-ui/web/micro-ui-internals/packages/modules/core/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,22 @@ export const DigitAppWrapper = ({ stateCode, modules, appTenants, logoUrl, initD
}
>
<Switch>
<Route exact path={`/${window?.globalPath}/user/sign-up`}>
<SignUp stateCode={stateCode} />
</Route>
<Route exact path={`/${window?.globalPath}/user/otp`}>
<Otp />
</Route>
<Route exact path={`/${window?.globalPath}/user/url`}>
<ViewUrl />
</Route>
{Digit.Utils.getMultiRootTenant() && (
<Route path={`/${window?.globalPath}`}>
<Route exact path={`/${window?.globalPath}/user/sign-up`}>
<SignUp stateCode={stateCode} />
</Route>
<Route exact path={`/${window?.globalPath}/user/otp`}>
<Otp />
</Route>
<Route exact path={`/${window?.globalPath}/user/url`}>
<ViewUrl />
</Route>
<Route>
<Redirect to={Digit.Utils.getMultiRootTenant() ? `/${window?.globalPath}/user/sign-up` : `/${window?.contextPath}/${defaultLanding}`} />
</Route>
</Route>
)}
{window?.globalPath !== window?.contextPath && (
<Route path={`/${window?.contextPath}`}>
<DigitApp
Expand All @@ -120,7 +127,7 @@ export const DigitAppWrapper = ({ stateCode, modules, appTenants, logoUrl, initD
</Route>
)}
<Route>
<Redirect to={`/${window?.globalPath}/user/sign-up`} />
<Redirect to={Digit.Utils.getMultiRootTenant() ? `/${window?.globalPath}/user/sign-up` : `/${window?.contextPath}/${defaultLanding}`} />
</Route>
</Switch>
</div>
Expand Down