2022-03-25 10:43:26 +00:00
|
|
|
import React, { Suspense, useEffect } from "react";
|
2020-08-03 14:18:48 +00:00
|
|
|
import history from "utils/history";
|
|
|
|
|
import AppHeader from "pages/common/AppHeader";
|
2020-09-24 16:05:18 +00:00
|
|
|
import { Redirect, Route, Router, Switch } from "react-router-dom";
|
2020-08-03 14:18:48 +00:00
|
|
|
import {
|
2022-10-04 11:18:35 +00:00
|
|
|
ADMIN_SETTINGS_CATEGORY_PATH,
|
|
|
|
|
ADMIN_SETTINGS_PATH,
|
2020-08-03 14:18:48 +00:00
|
|
|
APPLICATIONS_URL,
|
|
|
|
|
AUTH_LOGIN_URL,
|
|
|
|
|
BASE_LOGIN_URL,
|
|
|
|
|
BASE_SIGNUP_URL,
|
|
|
|
|
BASE_URL,
|
2022-07-11 04:06:29 +00:00
|
|
|
BUILDER_CUSTOM_PATH,
|
2022-10-04 11:18:35 +00:00
|
|
|
BUILDER_PATCH_PATH,
|
|
|
|
|
BUILDER_PATH,
|
|
|
|
|
BUILDER_PATH_DEPRECATED,
|
2021-03-04 09:37:02 +00:00
|
|
|
PROFILE,
|
2021-09-12 16:36:43 +00:00
|
|
|
SETUP,
|
2022-10-04 11:18:35 +00:00
|
|
|
SIGNUP_SUCCESS_URL,
|
|
|
|
|
SIGN_UP_URL,
|
2022-03-25 10:43:26 +00:00
|
|
|
TEMPLATES_PATH,
|
2022-10-04 11:18:35 +00:00
|
|
|
USERS_URL,
|
|
|
|
|
USER_AUTH_URL,
|
|
|
|
|
VIEWER_CUSTOM_PATH,
|
2022-04-08 14:57:19 +00:00
|
|
|
VIEWER_PATCH_PATH,
|
2022-10-04 11:18:35 +00:00
|
|
|
VIEWER_PATH,
|
|
|
|
|
VIEWER_PATH_DEPRECATED,
|
|
|
|
|
WORKSPACE_URL,
|
2020-08-03 14:18:48 +00:00
|
|
|
} from "constants/routes";
|
2022-06-15 15:37:41 +00:00
|
|
|
import WorkspaceLoader from "pages/workspace/loader";
|
2020-08-03 14:18:48 +00:00
|
|
|
import ApplicationListLoader from "pages/Applications/loader";
|
|
|
|
|
import EditorLoader from "pages/Editor/loader";
|
|
|
|
|
import AppViewerLoader from "pages/AppViewer/loader";
|
2023-01-10 05:39:15 +00:00
|
|
|
import LandingScreen from "../LandingScreen";
|
2020-08-03 14:18:48 +00:00
|
|
|
import UserAuth from "pages/UserAuth";
|
|
|
|
|
import Users from "pages/users";
|
2020-12-17 07:03:59 +00:00
|
|
|
import ErrorPage from "pages/common/ErrorPage";
|
2022-12-09 14:43:47 +00:00
|
|
|
import PageNotFound from "pages/common/ErrorPages/PageNotFound";
|
2020-08-18 08:48:06 +00:00
|
|
|
import PageLoadingBar from "pages/common/PageLoadingBar";
|
2020-12-17 07:03:59 +00:00
|
|
|
import ErrorPageHeader from "pages/common/ErrorPageHeader";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { AppState } from "@appsmith/reducers";
|
2022-12-01 06:30:50 +00:00
|
|
|
import { connect, useSelector } from "react-redux";
|
2020-09-24 16:05:18 +00:00
|
|
|
|
|
|
|
|
import * as Sentry from "@sentry/react";
|
2020-12-17 07:03:59 +00:00
|
|
|
import { getSafeCrash, getSafeCrashCode } from "selectors/errorSelectors";
|
2021-03-04 09:37:02 +00:00
|
|
|
import UserProfile from "pages/UserProfile";
|
2021-08-05 06:10:19 +00:00
|
|
|
import { getCurrentUser } from "actions/authActions";
|
2023-02-07 09:23:15 +00:00
|
|
|
import {
|
|
|
|
|
getCurrentUserLoading,
|
|
|
|
|
selectFeatureFlags,
|
|
|
|
|
} from "selectors/usersSelectors";
|
2021-09-12 16:36:43 +00:00
|
|
|
import Setup from "pages/setup";
|
2022-05-05 05:37:50 +00:00
|
|
|
import Settings from "@appsmith/pages/AdminSettings";
|
2021-10-21 05:36:17 +00:00
|
|
|
import SignupSuccess from "pages/setup/SignupSuccess";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type { ERROR_CODES } from "@appsmith/constants/ApiConstants";
|
2022-03-03 10:56:53 +00:00
|
|
|
import TemplatesListLoader from "pages/Templates/loader";
|
2022-04-07 17:57:32 +00:00
|
|
|
import { fetchFeatureFlagsInit } from "actions/userActions";
|
chore: upgrade to prettier v2 + enforce import types (#21013)Co-authored-by: Satish Gandham <hello@satishgandham.com> Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
## Description
This PR upgrades Prettier to v2 + enforces TypeScript’s [`import
type`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export)
syntax where applicable. It’s submitted as a separate PR so we can merge
it easily.
As a part of this PR, we reformat the codebase heavily:
- add `import type` everywhere where it’s required, and
- re-format the code to account for Prettier 2’s breaking changes:
https://prettier.io/blog/2020/03/21/2.0.0.html#breaking-changes
This PR is submitted against `release` to make sure all new code by team
members will adhere to new formatting standards, and we’ll have fewer
conflicts when merging `bundle-optimizations` into `release`. (I’ll
merge `release` back into `bundle-optimizations` once this PR is
merged.)
### Why is this needed?
This PR is needed because, for the Lodash optimization from
https://github.com/appsmithorg/appsmith/commit/7cbb12af886621256224be0c93e6a465dd710ad3,
we need to use `import type`. Otherwise, `babel-plugin-lodash` complains
that `LoDashStatic` is not a lodash function.
However, just using `import type` in the current codebase will give you
this:
<img width="962" alt="Screenshot 2023-03-08 at 17 45 59"
src="https://user-images.githubusercontent.com/2953267/223775744-407afa0c-e8b9-44a1-90f9-b879348da57f.png">
That’s because Prettier 1 can’t parse `import type` at all. To parse it,
we need to upgrade to Prettier 2.
### Why enforce `import type`?
Apart from just enabling `import type` support, this PR enforces
specifying `import type` everywhere it’s needed. (Developers will get
immediate TypeScript and ESLint errors when they forget to do so.)
I’m doing this because I believe `import type` improves DX and makes
refactorings easier.
Let’s say you had a few imports like below. Can you tell which of these
imports will increase the bundle size? (Tip: it’s not all of them!)
```ts
// app/client/src/workers/Linting/utils.ts
import { Position } from "codemirror";
import { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
It’s pretty hard, right?
What about now?
```ts
// app/client/src/workers/Linting/utils.ts
import type { Position } from "codemirror";
import type { LintError as JSHintError, LintOptions } from "jshint";
import { get, isEmpty, isNumber, keys, last, set } from "lodash";
```
Now, it’s clear that only `lodash` will be bundled.
This helps developers to see which imports are problematic, but it
_also_ helps with refactorings. Now, if you want to see where
`codemirror` is bundled, you can just grep for `import \{.*\} from
"codemirror"` – and you won’t get any type-only imports.
This also helps (some) bundlers. Upon transpiling, TypeScript erases
type-only imports completely. In some environment (not ours), this makes
the bundle smaller, as the bundler doesn’t need to bundle type-only
imports anymore.
## Type of change
- Chore (housekeeping or task changes that don't impact user perception)
## How Has This Been Tested?
This was tested to not break the build.
### Test Plan
> Add Testsmith test cases links that relate to this PR
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [ ] Test plan has been approved by relevant developers
- [ ] Test plan has been peer reviewed by QA
- [ ] Cypress test cases have been added and approved by either SDET or
manual QA
- [ ] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [ ] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Satish Gandham <hello@satishgandham.com>
Co-authored-by: Satish Gandham <satish.iitg@gmail.com>
2023-03-16 11:41:47 +00:00
|
|
|
import type FeatureFlags from "entities/FeatureFlags";
|
2022-10-15 14:51:25 +00:00
|
|
|
import { getCurrentTenant } from "@appsmith/actions/tenantActions";
|
2022-12-01 06:30:50 +00:00
|
|
|
import { getDefaultAdminSettingsPath } from "@appsmith/utils/adminSettingsHelpers";
|
|
|
|
|
import { getCurrentUser as getCurrentUserSelector } from "selectors/usersSelectors";
|
2023-02-07 09:23:15 +00:00
|
|
|
import {
|
|
|
|
|
getTenantPermissions,
|
|
|
|
|
isTenantLoading,
|
|
|
|
|
} from "@appsmith/selectors/tenantSelectors";
|
2022-12-09 14:43:47 +00:00
|
|
|
import useBrandingTheme from "utils/hooks/useBrandingTheme";
|
2022-12-26 07:10:09 +00:00
|
|
|
import RouteChangeListener from "RouteChangeListener";
|
2020-10-26 07:00:01 +00:00
|
|
|
|
2023-01-10 05:39:15 +00:00
|
|
|
export const SentryRoute = Sentry.withSentryRouting(Route);
|
2020-08-03 14:18:48 +00:00
|
|
|
|
2023-01-10 05:39:15 +00:00
|
|
|
export const loadingIndicator = <PageLoadingBar />;
|
|
|
|
|
|
|
|
|
|
export function Routes() {
|
|
|
|
|
const user = useSelector(getCurrentUserSelector);
|
|
|
|
|
const tenantPermissions = useSelector(getTenantPermissions);
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
: getDefaultAdminSettingsPath({
|
|
|
|
|
isSuperUser: user?.isSuperUser || false,
|
|
|
|
|
tenantPermissions,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
/>
|
|
|
|
|
<SentryRoute
|
|
|
|
|
component={Settings}
|
|
|
|
|
exact
|
|
|
|
|
path={ADMIN_SETTINGS_CATEGORY_PATH}
|
|
|
|
|
/>
|
|
|
|
|
<SentryRoute component={EditorLoader} path={BUILDER_PATH_DEPRECATED} />
|
|
|
|
|
<SentryRoute component={AppViewerLoader} path={VIEWER_PATH_DEPRECATED} />
|
2023-01-20 09:55:06 +00:00
|
|
|
{/*
|
|
|
|
|
* 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
|
|
|
|
|
*/}
|
2023-01-10 05:39:15 +00:00
|
|
|
<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} />
|
2023-01-20 09:55:06 +00:00
|
|
|
{/*
|
|
|
|
|
* End Note: When making changes to the order of the paths above
|
|
|
|
|
*/}
|
2023-01-10 05:39:15 +00:00
|
|
|
<Redirect from={BUILDER_PATCH_PATH} to={BUILDER_PATH} />
|
|
|
|
|
<Redirect from={VIEWER_PATCH_PATH} to={VIEWER_PATH} />
|
|
|
|
|
<SentryRoute component={PageNotFound} />
|
|
|
|
|
</Switch>
|
|
|
|
|
);
|
|
|
|
|
}
|
2020-08-03 14:18:48 +00:00
|
|
|
|
2022-03-25 10:43:26 +00:00
|
|
|
function AppRouter(props: {
|
|
|
|
|
safeCrash: boolean;
|
|
|
|
|
getCurrentUser: () => void;
|
2022-04-07 17:57:32 +00:00
|
|
|
getFeatureFlags: () => void;
|
2022-10-15 14:51:25 +00:00
|
|
|
getCurrentTenant: () => void;
|
2022-03-25 10:43:26 +00:00
|
|
|
safeCrashCode?: ERROR_CODES;
|
2022-04-07 17:57:32 +00:00
|
|
|
featureFlags: FeatureFlags;
|
2022-03-25 10:43:26 +00:00
|
|
|
}) {
|
2022-10-15 14:51:25 +00:00
|
|
|
const { getCurrentTenant, getCurrentUser, getFeatureFlags } = props;
|
2023-02-07 09:23:15 +00:00
|
|
|
const tenantIsLoading = useSelector(isTenantLoading);
|
|
|
|
|
const currentUserIsLoading = useSelector(getCurrentUserLoading);
|
|
|
|
|
|
2022-03-25 10:43:26 +00:00
|
|
|
useEffect(() => {
|
2022-04-07 17:57:32 +00:00
|
|
|
getCurrentUser();
|
|
|
|
|
getFeatureFlags();
|
2022-10-15 14:51:25 +00:00
|
|
|
getCurrentTenant();
|
2022-03-25 10:43:26 +00:00
|
|
|
}, []);
|
2020-10-12 12:56:03 +00:00
|
|
|
|
2022-12-09 14:43:47 +00:00
|
|
|
useBrandingTheme();
|
|
|
|
|
|
2023-02-07 09:23:15 +00:00
|
|
|
// hide the top loader once the tenant is loaded
|
|
|
|
|
useEffect(() => {
|
|
|
|
|
if (tenantIsLoading === false && currentUserIsLoading === false) {
|
|
|
|
|
const loader = document.getElementById("loader") as HTMLDivElement;
|
|
|
|
|
|
|
|
|
|
if (loader) {
|
|
|
|
|
loader.style.width = "100vw";
|
|
|
|
|
|
|
|
|
|
setTimeout(() => {
|
|
|
|
|
loader.style.opacity = "0";
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-03-23 11:41:58 +00:00
|
|
|
}, [tenantIsLoading, currentUserIsLoading]);
|
2023-02-07 09:23:15 +00:00
|
|
|
|
|
|
|
|
if (tenantIsLoading || currentUserIsLoading) return null;
|
|
|
|
|
|
2022-03-25 10:43:26 +00:00
|
|
|
return (
|
|
|
|
|
<Router history={history}>
|
|
|
|
|
<Suspense fallback={loadingIndicator}>
|
2022-12-26 07:10:09 +00:00
|
|
|
<RouteChangeListener />
|
2022-03-25 10:43:26 +00:00
|
|
|
{props.safeCrash && props.safeCrashCode ? (
|
|
|
|
|
<>
|
|
|
|
|
<ErrorPageHeader />
|
|
|
|
|
<ErrorPage code={props.safeCrashCode} />
|
|
|
|
|
</>
|
|
|
|
|
) : (
|
|
|
|
|
<>
|
|
|
|
|
<AppHeader />
|
2023-01-10 05:39:15 +00:00
|
|
|
<Routes />
|
2022-03-25 10:43:26 +00:00
|
|
|
</>
|
|
|
|
|
)}
|
|
|
|
|
</Suspense>
|
|
|
|
|
</Router>
|
|
|
|
|
);
|
2020-08-03 14:18:48 +00:00
|
|
|
}
|
2022-03-25 10:43:26 +00:00
|
|
|
|
2020-09-24 16:05:18 +00:00
|
|
|
const mapStateToProps = (state: AppState) => ({
|
2020-12-17 07:03:59 +00:00
|
|
|
safeCrash: getSafeCrash(state),
|
|
|
|
|
safeCrashCode: getSafeCrashCode(state),
|
2022-04-07 17:57:32 +00:00
|
|
|
featureFlags: selectFeatureFlags(state),
|
2020-09-24 16:05:18 +00:00
|
|
|
});
|
2020-12-17 07:03:59 +00:00
|
|
|
|
2020-09-24 16:05:18 +00:00
|
|
|
const mapDispatchToProps = (dispatch: any) => ({
|
2021-08-05 06:10:19 +00:00
|
|
|
getCurrentUser: () => dispatch(getCurrentUser()),
|
2022-04-07 17:57:32 +00:00
|
|
|
getFeatureFlags: () => dispatch(fetchFeatureFlagsInit()),
|
2023-02-07 09:23:15 +00:00
|
|
|
getCurrentTenant: () => dispatch(getCurrentTenant(false)),
|
2020-09-24 16:05:18 +00:00
|
|
|
});
|
2020-08-03 14:18:48 +00:00
|
|
|
|
2020-09-24 16:05:18 +00:00
|
|
|
export default connect(mapStateToProps, mapDispatchToProps)(AppRouter);
|