## Description Added ESLint rule to force blank lines between statements. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > 🔴 🔴 🔴 Some tests have failed. > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/10924926728> > Commit: 34f57714a1575ee04e94e03cbcaf95e57a96c86c > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10924926728&attempt=1&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank">Cypress dashboard</a>. > Tags: @tag.All > Spec: > The following are new failures, please fix them before merging the PR: <ol> > <li>cypress/e2e/Regression/ClientSide/Anvil/AnvilModal_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts</ol> > <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">List of identified flaky tests</a>. > <hr>Wed, 18 Sep 2024 16:33:36 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No --------- Co-authored-by: Valera Melnikov <valera@appsmith.com>
202 lines
6.9 KiB
TypeScript
202 lines
6.9 KiB
TypeScript
import React, { Suspense, useEffect } from "react";
|
|
import history from "utils/history";
|
|
import AppHeader from "ee/pages/common/AppHeader";
|
|
import { Redirect, Route, Router, Switch } from "react-router-dom";
|
|
import {
|
|
ADMIN_SETTINGS_CATEGORY_PATH,
|
|
ADMIN_SETTINGS_PATH,
|
|
APPLICATIONS_URL,
|
|
AUTH_LOGIN_URL,
|
|
BASE_LOGIN_URL,
|
|
BASE_SIGNUP_URL,
|
|
BASE_URL,
|
|
BUILDER_CUSTOM_PATH,
|
|
BUILDER_PATCH_PATH,
|
|
BUILDER_PATH,
|
|
BUILDER_PATH_DEPRECATED,
|
|
CUSTOM_WIDGETS_DEPRECATED_EDITOR_ID_PATH,
|
|
CUSTOM_WIDGETS_EDITOR_ID_PATH,
|
|
CUSTOM_WIDGETS_EDITOR_ID_PATH_CUSTOM,
|
|
PROFILE,
|
|
SETUP,
|
|
SIGNUP_SUCCESS_URL,
|
|
SIGN_UP_URL,
|
|
TEMPLATES_PATH,
|
|
USERS_URL,
|
|
USER_AUTH_URL,
|
|
VIEWER_CUSTOM_PATH,
|
|
VIEWER_PATCH_PATH,
|
|
VIEWER_PATH,
|
|
VIEWER_PATH_DEPRECATED,
|
|
WORKSPACE_URL,
|
|
} from "constants/routes";
|
|
import WorkspaceLoader from "pages/workspace/loader";
|
|
import ApplicationListLoader from "pages/Applications/loader";
|
|
import EditorLoader from "pages/Editor/loader";
|
|
import AppViewerLoader from "pages/AppViewer/loader";
|
|
import LandingScreen from "../LandingScreen";
|
|
import UserAuth from "pages/UserAuth";
|
|
import Users from "pages/users";
|
|
import ErrorPage from "pages/common/ErrorPage";
|
|
import PageNotFound from "pages/common/ErrorPages/PageNotFound";
|
|
import PageLoadingBar from "pages/common/PageLoadingBar";
|
|
import ErrorPageHeader from "pages/common/ErrorPageHeader";
|
|
import { useDispatch, useSelector } from "react-redux";
|
|
|
|
import * as Sentry from "@sentry/react";
|
|
import { getSafeCrash, getSafeCrashCode } from "selectors/errorSelectors";
|
|
import UserProfile from "pages/UserProfile";
|
|
import Setup from "pages/setup";
|
|
import SettingsLoader from "pages/AdminSettings/loader";
|
|
import SignupSuccess from "pages/setup/SignupSuccess";
|
|
import type { ERROR_CODES } from "ee/constants/ApiConstants";
|
|
import TemplatesListLoader from "pages/Templates/loader";
|
|
import { getCurrentUser as getCurrentUserSelector } from "selectors/usersSelectors";
|
|
import { getTenantPermissions } from "ee/selectors/tenantSelectors";
|
|
import useBrandingTheme from "utils/hooks/useBrandingTheme";
|
|
import RouteChangeListener from "RouteChangeListener";
|
|
import { initCurrentPage } from "../actions/initActions";
|
|
import Walkthrough from "components/featureWalkthrough";
|
|
import ProductAlertBanner from "components/editorComponents/ProductAlertBanner";
|
|
import { getAdminSettingsPath } from "ee/utils/BusinessFeatures/adminSettingsHelpers";
|
|
import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
|
|
import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
|
|
import CustomWidgetBuilderLoader from "pages/Editor/CustomWidgetBuilder/loader";
|
|
import { getIsConsolidatedPageLoading } from "selectors/ui";
|
|
import { useFeatureFlagOverride } from "utils/hooks/useFeatureFlagOverride";
|
|
|
|
export const SentryRoute = Sentry.withSentryRouting(Route);
|
|
|
|
export const loadingIndicator = <PageLoadingBar />;
|
|
|
|
export function Routes() {
|
|
const user = useSelector(getCurrentUserSelector);
|
|
const tenantPermissions = useSelector(getTenantPermissions);
|
|
const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
|
|
|
|
useFeatureFlagOverride();
|
|
|
|
return (
|
|
<Switch>
|
|
<SentryRoute component={LandingScreen} exact path={BASE_URL} />
|
|
<Redirect exact from={BASE_LOGIN_URL} to={AUTH_LOGIN_URL} />
|
|
<Redirect exact from={BASE_SIGNUP_URL} to={SIGN_UP_URL} />
|
|
<SentryRoute component={WorkspaceLoader} path={WORKSPACE_URL} />
|
|
<SentryRoute component={Users} exact path={USERS_URL} />
|
|
<SentryRoute component={UserAuth} path={USER_AUTH_URL} />
|
|
<SentryRoute
|
|
component={ApplicationListLoader}
|
|
exact
|
|
path={APPLICATIONS_URL}
|
|
/>
|
|
<SentryRoute component={SignupSuccess} exact path={SIGNUP_SUCCESS_URL} />
|
|
<SentryRoute component={UserProfile} path={PROFILE} />
|
|
<SentryRoute component={Setup} exact path={SETUP} />
|
|
<SentryRoute component={TemplatesListLoader} path={TEMPLATES_PATH} />
|
|
<Redirect
|
|
exact
|
|
from={ADMIN_SETTINGS_PATH}
|
|
to={
|
|
!user
|
|
? ADMIN_SETTINGS_PATH
|
|
: getAdminSettingsPath(
|
|
isFeatureEnabled,
|
|
user?.isSuperUser || false,
|
|
tenantPermissions,
|
|
)
|
|
}
|
|
/>
|
|
<SentryRoute
|
|
component={SettingsLoader}
|
|
exact
|
|
path={ADMIN_SETTINGS_CATEGORY_PATH}
|
|
/>
|
|
<SentryRoute
|
|
component={CustomWidgetBuilderLoader}
|
|
exact
|
|
path={CUSTOM_WIDGETS_DEPRECATED_EDITOR_ID_PATH}
|
|
/>
|
|
<SentryRoute component={EditorLoader} path={BUILDER_PATH_DEPRECATED} />
|
|
<SentryRoute component={AppViewerLoader} path={VIEWER_PATH_DEPRECATED} />
|
|
<SentryRoute
|
|
component={CustomWidgetBuilderLoader}
|
|
exact
|
|
path={CUSTOM_WIDGETS_EDITOR_ID_PATH}
|
|
/>
|
|
<SentryRoute
|
|
component={CustomWidgetBuilderLoader}
|
|
exact
|
|
path={CUSTOM_WIDGETS_EDITOR_ID_PATH_CUSTOM}
|
|
/>
|
|
{/*
|
|
* Note: When making changes to the order of these paths
|
|
* Be sure to check if it is sync with the order of checks in getUpdatedRoute helper method
|
|
* Context: https://github.com/appsmithorg/appsmith/pull/19833
|
|
*/}
|
|
<SentryRoute component={EditorLoader} path={BUILDER_PATH} />
|
|
<SentryRoute component={EditorLoader} path={BUILDER_CUSTOM_PATH} />
|
|
<SentryRoute component={AppViewerLoader} path={VIEWER_PATH} />
|
|
<SentryRoute component={AppViewerLoader} path={VIEWER_CUSTOM_PATH} />
|
|
{/*
|
|
* End Note: When making changes to the order of the paths above
|
|
*/}
|
|
<Redirect from={BUILDER_PATCH_PATH} to={BUILDER_PATH} />
|
|
<Redirect from={VIEWER_PATCH_PATH} to={VIEWER_PATH} />
|
|
<SentryRoute component={PageNotFound} />
|
|
</Switch>
|
|
);
|
|
}
|
|
|
|
export default function AppRouter() {
|
|
const safeCrash: boolean = useSelector(getSafeCrash);
|
|
const safeCrashCode: ERROR_CODES | undefined = useSelector(getSafeCrashCode);
|
|
const isConsolidatedPageLoading = useSelector(getIsConsolidatedPageLoading);
|
|
const dispatch = useDispatch();
|
|
|
|
useEffect(() => {
|
|
dispatch(initCurrentPage());
|
|
}, []);
|
|
|
|
useBrandingTheme();
|
|
|
|
const isLoading = isConsolidatedPageLoading;
|
|
|
|
// hide the top loader once the tenant is loaded
|
|
useEffect(() => {
|
|
if (!isLoading) {
|
|
const loader = document.getElementById("loader") as HTMLDivElement;
|
|
|
|
if (loader) {
|
|
loader.style.width = "100vw";
|
|
setTimeout(() => {
|
|
loader.style.opacity = "0";
|
|
});
|
|
}
|
|
}
|
|
}, [isLoading]);
|
|
|
|
if (isLoading) return null;
|
|
|
|
return (
|
|
<Router history={history}>
|
|
<Suspense fallback={loadingIndicator}>
|
|
<RouteChangeListener />
|
|
{safeCrash && safeCrashCode ? (
|
|
<>
|
|
<ErrorPageHeader />
|
|
<ErrorPage code={safeCrashCode} />
|
|
</>
|
|
) : (
|
|
<>
|
|
<Walkthrough>
|
|
<AppHeader />
|
|
<Routes />
|
|
</Walkthrough>
|
|
<ProductAlertBanner />
|
|
</>
|
|
)}
|
|
</Suspense>
|
|
</Router>
|
|
);
|
|
}
|