* fix style bugs * fix select styles * test: fix font size issue for cypress tests * incorporate ashit feedback * test: addresed review comments for cypress tests * add analytics events * height issue in view mode * incorporate code review feedbacks * incorporate code review feedbacks * refactor: addressed review comments; removed border radius and box shadow for text widget; Updated migrations * feat: Makes shadow and radius controls keyboard accessible (#11547) * makes shadow and radius controls keyboard accessible * removes unused imports * moves options out of render method * fix: changed the misnomer background property name to the relevant property name * fix: border radius issue for the map widget * address qa bugs * address qa bugs * fix ux of theming pane when widget is selected * fix: * added backgroundColor to the video widget * restricted pop-over border radius to 0.375rem * added box shadow for the input group for select widget * fix: added delete icon in the delete theme modal * address qa bugs * change checkbox column size in config * add js convertible to button color * remove unused imports * test: fixed jest tests * fix primary color typo * fix: migrations for the theming * fix: * Removed background color from MultiTreeSelect and TreeSelect component. * grouped button's menu button pop over border radius restricting to 0.375rem. * test: updated Dsl migration UT * address qa bugs * address qa bugs * fix: address qa comments * address qa bugs * fix: * migration issue; * unit test cases; * fix rating widget scroll issue * fix youtube video border radius bug * fix select widget * fix select widgets styles * address qa bugs * merge conflicts * makes the reset button keyboard accessible (#12134) * -resolved merge conflicts * address qa bugs * fix: labelTextSize migration fixes * refactor: * made changes to the fontSizeUtils function * fixed the issue related to unit tests * fix button group widget * remove unused imports * fix: fixed the text size migration for the table widget * refactor: addressed review comments for the table widget theming migration * fix button group widget * add init calls for view mode * json form init theme changes * fix: added migration for boxShadow, borderRadius and textSizes for table widget * fix broken fields * test: fixed unit tests * wip * inconsistancy fixes and schemaItem update in updateHook/fieldConfiguration * feat: init json form migration theming * json form primaryColor -> accentColor * update table widget * update table widget * object field label styling * fix: migration related to the JSON form * fix: fixed labelTextSize migration for JSON form nested widgets * property control nested stylesheet lookup * JSONForm label styles form array items * show label for checkbox field array item * fix button group widget * wip * refactor: addressed table widget review comments * refactor: addressed ashit review comments; * added childStylesheet for widgets * feat: Keyboard navigable Color Picker control (#11797) * Makes ColorPicker keyboard accessible * seperate out keyboard and mouse interactions * fix issue with not focusing back to input * Adds test for Color picker * chore: added comment for the boxShadow property * fix: * added unit test cases for the widget and property utils * resolved warning messages * wip * theme config update * fix merge conflicts * refactor: moved theming migration inside the migrations folder * fix qa bugs * fix jest test * fix: unit test cases * fix table column creation logic * refactor: addressed review comments for migrations * fix: Overriding margin and padding for custom render in the dropdown component (#12875) * * fix for custom render padding and margin in ADS dropdown * * fix for removing padding from normal render options * refactor: moved the boxShadow condition to the variable * fix qa bugs * fix: migration QA callouts for audio recorder widget * refactor: added updated comments for boxShadow migration for table widget * fix theme binfings for JSONForm fields under Object * fix table widget theming bug * fix: addressed code review comments * fix: unit test cases * fix: qa migration callouts * fix table widget theming bug * fix JSONForm currency input dropdown not submit form * Added new tests - AppThemingSpec * fix qa bugs * fix unit test * fix JSONForm cellBorderWidth to have default value post migration * fix unit test * fix qa bugs * remove unused imports * fix qa bugs * fix JSONForm input height issue * fix qa bugs * Updating Theming spec * * dropdown color fixes (#13249) * fix caching issue ; * Fixed Theming tests * fix tests * fix tab widget tests * fix: json form children level migration issue * fix table widget tests * Updated test * updated tests * updated test * updated tests * updated tests * updated pageload * fix cypress tests * remove cypress created files * fix color picker issues * Failure fixes * Fixed some more tests * fix: cypress test failures * fix tests * remove consoles * fix table tests * fix qa bugs * updating snapshots for AppPageLayout_spec as per new UI * fix rating widget bug * fix qa bugs * fix: * cypress failing tests * Migration QA callouts * Removed unused imports * update constract check algo * fix color contrast issue * fix: cypress failure test cases * update font sizes labels * fix regression bugs * fix: * JSON form labelTextSize issue fix * Updated comment for the fontSizeUtility function * migrations issues related to table widget borderRadius and boxShadow * fix: default labelTextSize issue for the Input and Select families * fix regression bugs * fix regression bugs * PassingParams spec - added wait time * fix: font family default value issue on JS toggle * fix js toggle issue in text widget * fix tests * fix tests * fix tests * fix cypress tests * fix regression bugs * fix regression bugs * fix: * refactored table widget migration function as per review comments, * added default value to the widget * fix: failing unit test cases * fix theming spec * fix cypress tests * test: fixed failed cypress test * incorporate ashit feedback * fix cypress tests * fix: addressed review comments * comment out table cypress test * fix merge conflicts * comment out color picker tests Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local> Co-authored-by: keyurparalkar <keyur@appsmith.com> Co-authored-by: Aswath K <aswath@appsmith.com> Co-authored-by: Nayan <nayan@appsmith.com> Co-authored-by: Ashit Rath <ashit@appsmith.com> Co-authored-by: balajisoundar <balaji@appsmith.com> Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: apple <nandan@thinkify.io> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
194 lines
6.7 KiB
TypeScript
194 lines
6.7 KiB
TypeScript
import React, { Suspense, useEffect } from "react";
|
|
import history from "utils/history";
|
|
import AppHeader from "pages/common/AppHeader";
|
|
import { Redirect, Route, Router, Switch } from "react-router-dom";
|
|
import {
|
|
APPLICATIONS_URL,
|
|
AUTH_LOGIN_URL,
|
|
BASE_LOGIN_URL,
|
|
BASE_SIGNUP_URL,
|
|
BASE_URL,
|
|
BUILDER_PATH,
|
|
ORG_URL,
|
|
SIGN_UP_URL,
|
|
SIGNUP_SUCCESS_URL,
|
|
USER_AUTH_URL,
|
|
USERS_URL,
|
|
PROFILE,
|
|
UNSUBSCRIBE_EMAIL_URL,
|
|
SETUP,
|
|
VIEWER_PATH,
|
|
ADMIN_SETTINGS_PATH,
|
|
ADMIN_SETTINGS_CATEGORY_PATH,
|
|
ADMIN_SETTINGS_CATEGORY_DEFAULT_PATH,
|
|
BUILDER_PATH_DEPRECATED,
|
|
VIEWER_PATH_DEPRECATED,
|
|
TEMPLATES_PATH,
|
|
VIEWER_PATCH_PATH,
|
|
BUILDER_PATCH_PATH,
|
|
} from "constants/routes";
|
|
import OrganizationLoader from "pages/organization/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/PageNotFound";
|
|
import PageLoadingBar from "pages/common/PageLoadingBar";
|
|
import ErrorPageHeader from "pages/common/ErrorPageHeader";
|
|
import UnsubscribeEmail from "pages/common/UnsubscribeEmail";
|
|
import { getCurrentThemeDetails, ThemeMode } from "selectors/themeSelectors";
|
|
import { AppState } from "reducers";
|
|
import { setThemeMode } from "actions/themeActions";
|
|
import { connect } from "react-redux";
|
|
|
|
import * as Sentry from "@sentry/react";
|
|
import AnalyticsUtil from "utils/AnalyticsUtil";
|
|
import { trimTrailingSlash } from "utils/helpers";
|
|
import { getSafeCrash, getSafeCrashCode } from "selectors/errorSelectors";
|
|
import UserProfile from "pages/UserProfile";
|
|
import { getCurrentUser } from "actions/authActions";
|
|
import { selectFeatureFlags } from "selectors/usersSelectors";
|
|
import Setup from "pages/setup";
|
|
import Settings from "pages/Settings";
|
|
import SignupSuccess from "pages/setup/SignupSuccess";
|
|
import { Theme } from "constants/DefaultTheme";
|
|
import { ERROR_CODES } from "@appsmith/constants/ApiConstants";
|
|
import TemplatesListLoader from "pages/Templates/loader";
|
|
import { fetchFeatureFlagsInit } from "actions/userActions";
|
|
import FeatureFlags from "entities/FeatureFlags";
|
|
import WDSPage from "components/wds/Showcase";
|
|
|
|
const SentryRoute = Sentry.withSentryRouting(Route);
|
|
|
|
const loadingIndicator = <PageLoadingBar />;
|
|
|
|
function changeAppBackground(currentTheme: any) {
|
|
if (
|
|
trimTrailingSlash(window.location.pathname) === "/applications" ||
|
|
window.location.pathname.indexOf("/settings/") !== -1 ||
|
|
trimTrailingSlash(window.location.pathname) === "/profile" ||
|
|
trimTrailingSlash(window.location.pathname) === "/signup-success"
|
|
) {
|
|
document.body.style.backgroundColor =
|
|
currentTheme.colors.homepageBackground;
|
|
} else {
|
|
document.body.style.backgroundColor = currentTheme.colors.appBackground;
|
|
}
|
|
}
|
|
|
|
function AppRouter(props: {
|
|
safeCrash: boolean;
|
|
getCurrentUser: () => void;
|
|
getFeatureFlags: () => void;
|
|
currentTheme: Theme;
|
|
safeCrashCode?: ERROR_CODES;
|
|
featureFlags: FeatureFlags;
|
|
setTheme: (theme: ThemeMode) => void;
|
|
}) {
|
|
const { getCurrentUser, getFeatureFlags } = props;
|
|
useEffect(() => {
|
|
AnalyticsUtil.logEvent("ROUTE_CHANGE", { path: window.location.pathname });
|
|
const stopListener = history.listen((location: any) => {
|
|
AnalyticsUtil.logEvent("ROUTE_CHANGE", { path: location.pathname });
|
|
changeAppBackground(props.currentTheme);
|
|
});
|
|
getCurrentUser();
|
|
getFeatureFlags();
|
|
return stopListener;
|
|
}, []);
|
|
|
|
useEffect(() => {
|
|
changeAppBackground(props.currentTheme);
|
|
}, [props.currentTheme]);
|
|
|
|
return (
|
|
<Router history={history}>
|
|
<Suspense fallback={loadingIndicator}>
|
|
{props.safeCrash && props.safeCrashCode ? (
|
|
<>
|
|
<ErrorPageHeader />
|
|
<ErrorPage code={props.safeCrashCode} />
|
|
</>
|
|
) : (
|
|
<>
|
|
<AppHeader />
|
|
<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={OrganizationLoader} path={ORG_URL} />
|
|
<SentryRoute component={Users} exact path={USERS_URL} />
|
|
<SentryRoute component={UserAuth} path={USER_AUTH_URL} />
|
|
<SentryRoute component={WDSPage} path="/wds" />
|
|
<SentryRoute
|
|
component={ApplicationListLoader}
|
|
exact
|
|
path={APPLICATIONS_URL}
|
|
/>
|
|
<SentryRoute
|
|
component={SignupSuccess}
|
|
exact
|
|
path={SIGNUP_SUCCESS_URL}
|
|
/>
|
|
<SentryRoute component={UserProfile} path={PROFILE} />
|
|
<SentryRoute
|
|
component={UnsubscribeEmail}
|
|
path={UNSUBSCRIBE_EMAIL_URL}
|
|
/>
|
|
<SentryRoute component={Setup} exact path={SETUP} />
|
|
|
|
<SentryRoute
|
|
component={TemplatesListLoader}
|
|
path={TEMPLATES_PATH}
|
|
/>
|
|
<Redirect
|
|
exact
|
|
from={ADMIN_SETTINGS_PATH}
|
|
to={ADMIN_SETTINGS_CATEGORY_DEFAULT_PATH}
|
|
/>
|
|
<SentryRoute
|
|
component={Settings}
|
|
exact
|
|
path={ADMIN_SETTINGS_CATEGORY_PATH}
|
|
/>
|
|
<SentryRoute component={EditorLoader} path={BUILDER_PATH} />
|
|
<SentryRoute
|
|
component={EditorLoader}
|
|
path={BUILDER_PATH_DEPRECATED}
|
|
/>
|
|
<SentryRoute component={AppViewerLoader} path={VIEWER_PATH} />
|
|
<SentryRoute
|
|
component={AppViewerLoader}
|
|
path={VIEWER_PATH_DEPRECATED}
|
|
/>
|
|
<Redirect from={BUILDER_PATCH_PATH} to={BUILDER_PATH} />
|
|
<Redirect from={VIEWER_PATCH_PATH} to={VIEWER_PATH} />
|
|
<SentryRoute component={PageNotFound} />
|
|
</Switch>
|
|
</>
|
|
)}
|
|
</Suspense>
|
|
</Router>
|
|
);
|
|
}
|
|
|
|
const mapStateToProps = (state: AppState) => ({
|
|
currentTheme: getCurrentThemeDetails(state),
|
|
safeCrash: getSafeCrash(state),
|
|
safeCrashCode: getSafeCrashCode(state),
|
|
featureFlags: selectFeatureFlags(state),
|
|
});
|
|
|
|
const mapDispatchToProps = (dispatch: any) => ({
|
|
setTheme: (mode: ThemeMode) => {
|
|
dispatch(setThemeMode(mode));
|
|
},
|
|
getCurrentUser: () => dispatch(getCurrentUser()),
|
|
getFeatureFlags: () => dispatch(fetchFeatureFlagsInit()),
|
|
});
|
|
|
|
export default connect(mapStateToProps, mapDispatchToProps)(AppRouter);
|