## 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>
52 lines
1.8 KiB
TypeScript
52 lines
1.8 KiB
TypeScript
import React from "react";
|
|
import AdminConfig from "ee/pages/AdminSettings/config";
|
|
import { Redirect, useParams } from "react-router";
|
|
import { SettingCategories } from "ee/pages/AdminSettings/config/types";
|
|
import SettingsForm from "pages/AdminSettings/SettingsForm";
|
|
import { getWrapperCategory } from "ee/utils/adminSettingsHelpers";
|
|
import { useSelector } from "react-redux";
|
|
import { getCurrentUser } from "selectors/usersSelectors";
|
|
import { getTenantPermissions } from "ee/selectors/tenantSelectors";
|
|
import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
|
|
import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
|
|
import { getAdminSettingsPath } from "ee/utils/BusinessFeatures/adminSettingsHelpers";
|
|
|
|
const Main = () => {
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const params = useParams() as any;
|
|
const { category, selected: subCategory } = params;
|
|
const user = useSelector(getCurrentUser);
|
|
const tenantPermissions = useSelector(getTenantPermissions);
|
|
const isSuperUser = user?.isSuperUser || false;
|
|
const wrapperCategory = getWrapperCategory(
|
|
AdminConfig.wrapperCategories,
|
|
subCategory,
|
|
category,
|
|
);
|
|
const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
|
|
|
|
if (!!wrapperCategory?.component) {
|
|
const { component: WrapperCategoryComponent } = wrapperCategory;
|
|
|
|
return <WrapperCategoryComponent category={wrapperCategory} />;
|
|
} else if (
|
|
!Object.values(SettingCategories).includes(category) ||
|
|
(subCategory && !Object.values(SettingCategories).includes(subCategory))
|
|
) {
|
|
return (
|
|
<Redirect
|
|
to={getAdminSettingsPath(
|
|
isFeatureEnabled,
|
|
isSuperUser,
|
|
tenantPermissions,
|
|
)}
|
|
/>
|
|
);
|
|
} else {
|
|
return <SettingsForm />;
|
|
}
|
|
};
|
|
|
|
export default Main;
|