## 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>
261 lines
7.4 KiB
TypeScript
261 lines
7.4 KiB
TypeScript
import React from "react";
|
|
import styled from "styled-components";
|
|
import AdminConfig from "ee/pages/AdminSettings/config";
|
|
import {
|
|
CategoryType,
|
|
type Category,
|
|
} from "ee/pages/AdminSettings/config/types";
|
|
import { adminSettingsCategoryUrl } from "ee/RouteBuilder";
|
|
import { useParams } from "react-router";
|
|
import AnalyticsUtil from "ee/utils/AnalyticsUtil";
|
|
import { Link, Text } from "@appsmith/ads";
|
|
import { useDispatch, useSelector } from "react-redux";
|
|
import { ReduxActionTypes } from "ee/constants/ReduxActionConstants";
|
|
import { getCurrentUser } from "selectors/usersSelectors";
|
|
import BusinessTag from "components/BusinessTag";
|
|
import EnterpriseTag from "components/EnterpriseTag";
|
|
import { getTenantPermissions } from "ee/selectors/tenantSelectors";
|
|
import {
|
|
getFilteredAclCategories,
|
|
getFilteredGeneralCategories,
|
|
getFilteredOtherCategories,
|
|
} from "ee/utils/adminSettingsHelpers";
|
|
import { useFeatureFlag } from "utils/hooks/useFeatureFlag";
|
|
import { FEATURE_FLAG } from "ee/entities/FeatureFlag";
|
|
import { getHasAuditLogsReadPermission } from "ee/utils/BusinessFeatures/permissionPageHelpers";
|
|
|
|
export const Wrapper = styled.div`
|
|
flex-basis: ${(props) => props.theme.sidebarWidth};
|
|
overflow-y: auto;
|
|
border-right: 1px solid var(--ads-v2-color-border);
|
|
flex-shrink: 0;
|
|
padding: 12px 0;
|
|
|
|
&::-webkit-scrollbar {
|
|
display: none;
|
|
}
|
|
|
|
> div:not(:first-child) {
|
|
border-top: 1px solid var(--ads-v2-color-border);
|
|
}
|
|
`;
|
|
|
|
export const HeaderContainer = styled.div`
|
|
margin: 12px;
|
|
`;
|
|
|
|
export const StyledHeader = styled(Text)`
|
|
height: 20px;
|
|
margin: 16px;
|
|
color: var(--ads-v2-color-fg-emphasis);
|
|
`;
|
|
|
|
export const CategoryList = styled.ul`
|
|
margin: 0;
|
|
list-style-type: none;
|
|
`;
|
|
|
|
export const CategoryItem = styled.li`
|
|
/* width: 90%; */
|
|
`;
|
|
|
|
export const StyledLink = styled(Link)<{ $active: boolean }>`
|
|
padding: 8px 16px;
|
|
border-radius: var(--ads-v2-border-radius);
|
|
background-color: ${(props) =>
|
|
props.$active ? `var(--ads-v2-color-bg-muted)` : ""};
|
|
text-decoration: none !important;
|
|
|
|
.ads-v2-text {
|
|
display: flex;
|
|
gap: var(--ads-v2-spaces-3);
|
|
align-items: center;
|
|
}
|
|
|
|
&& {
|
|
color: var(--ads-v2-color-fg);
|
|
}
|
|
|
|
&:hover {
|
|
text-decoration: none;
|
|
}
|
|
|
|
&:hover:not(.active) {
|
|
background-color: var(--ads-v2-color-bg-subtle);
|
|
}
|
|
`;
|
|
|
|
export const SettingName = styled(Text)<{ active?: boolean }>`
|
|
color: ${(props) =>
|
|
props.active
|
|
? "var(--ads-v2-color-fg-emphasis-plus)"
|
|
: "var(--ads-v2-color-fg)"};
|
|
font-weight: 400;
|
|
`;
|
|
|
|
export function getSettingsCategory(type: string): Category[] {
|
|
return Array.from(
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
AdminConfig.categories.filter((cat: any) => cat.categoryType === type),
|
|
);
|
|
}
|
|
|
|
export function Categories({
|
|
categories,
|
|
currentCategory,
|
|
currentSubCategory,
|
|
parentCategory,
|
|
showSubCategory,
|
|
}: {
|
|
categories?: Category[];
|
|
parentCategory?: Category;
|
|
currentCategory: string;
|
|
currentSubCategory?: string;
|
|
showSubCategory?: boolean;
|
|
}) {
|
|
const dispatch = useDispatch();
|
|
|
|
const triggerAnalytics = (page: string) => {
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const source: any = {
|
|
"audit-logs": "AuditLogs",
|
|
"access-control": "AccessControl",
|
|
provisioning: "Provisioning",
|
|
};
|
|
|
|
AnalyticsUtil.logEvent("ADMIN_SETTINGS_CLICK", {
|
|
source: source[page],
|
|
});
|
|
};
|
|
|
|
const onClickHandler = (category: string, showUpgradeTag: boolean) => {
|
|
if (category === "general") {
|
|
dispatch({
|
|
type: ReduxActionTypes.FETCH_ADMIN_SETTINGS,
|
|
});
|
|
}
|
|
|
|
if (showUpgradeTag) {
|
|
triggerAnalytics(category);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<CategoryList className="t--settings-category-list">
|
|
{categories?.map((config) => {
|
|
const active =
|
|
!!currentSubCategory && showSubCategory
|
|
? currentSubCategory == config.slug
|
|
: currentCategory == config.slug;
|
|
const showUpgradeTag = config?.isFeatureEnabled === false;
|
|
|
|
return (
|
|
<CategoryItem key={config.slug}>
|
|
<StyledLink
|
|
$active={active}
|
|
className={`t--settings-category-${config.slug} ${
|
|
active ? "active" : ""
|
|
}`}
|
|
onClick={() =>
|
|
onClickHandler(config.slug, showUpgradeTag || false)
|
|
}
|
|
startIcon={showUpgradeTag ? "lock-2-line" : `${config.icon}`}
|
|
target="_self"
|
|
to={
|
|
!parentCategory
|
|
? adminSettingsCategoryUrl({ category: config.slug })
|
|
: adminSettingsCategoryUrl({
|
|
category: parentCategory.slug,
|
|
selected: config.slug,
|
|
})
|
|
}
|
|
>
|
|
<SettingName active={active}>{config.title}</SettingName>
|
|
{showUpgradeTag &&
|
|
(config?.isEnterprise ? <EnterpriseTag /> : <BusinessTag />)}
|
|
</StyledLink>
|
|
{showSubCategory && (
|
|
<Categories
|
|
categories={config.children}
|
|
currentCategory={currentCategory}
|
|
currentSubCategory={currentSubCategory}
|
|
parentCategory={config}
|
|
/>
|
|
)}
|
|
</CategoryItem>
|
|
);
|
|
})}
|
|
</CategoryList>
|
|
);
|
|
}
|
|
|
|
export default function LeftPane() {
|
|
const categories = getSettingsCategory(CategoryType.GENERAL);
|
|
const aclCategories = getSettingsCategory(CategoryType.ACL);
|
|
const othersCategories = getSettingsCategory(CategoryType.OTHER);
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const { category, selected: subCategory } = useParams() as any;
|
|
const user = useSelector(getCurrentUser);
|
|
const isSuperUser = user?.isSuperUser;
|
|
const tenantPermissions = useSelector(getTenantPermissions);
|
|
const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
|
|
const isAuditLogsEnabled = getHasAuditLogsReadPermission(
|
|
isFeatureEnabled,
|
|
tenantPermissions,
|
|
);
|
|
|
|
const filteredGeneralCategories = getFilteredGeneralCategories(categories);
|
|
|
|
const filteredAclCategories = getFilteredAclCategories(
|
|
aclCategories,
|
|
isSuperUser,
|
|
);
|
|
|
|
const filteredOthersCategories = getFilteredOtherCategories(
|
|
othersCategories,
|
|
isSuperUser,
|
|
);
|
|
|
|
return (
|
|
<Wrapper>
|
|
{isSuperUser && (
|
|
<HeaderContainer>
|
|
<StyledHeader kind="heading-s" renderAs="p">
|
|
Admin settings
|
|
</StyledHeader>
|
|
<Categories
|
|
categories={filteredGeneralCategories}
|
|
currentCategory={category}
|
|
currentSubCategory={subCategory}
|
|
/>
|
|
</HeaderContainer>
|
|
)}
|
|
<HeaderContainer>
|
|
<StyledHeader kind="heading-s" renderAs="p">
|
|
Access control
|
|
</StyledHeader>
|
|
<Categories
|
|
categories={filteredAclCategories}
|
|
currentCategory={category}
|
|
currentSubCategory={subCategory}
|
|
/>
|
|
</HeaderContainer>
|
|
{isAuditLogsEnabled && (
|
|
<HeaderContainer>
|
|
<StyledHeader kind="heading-s" renderAs="p">
|
|
Others
|
|
</StyledHeader>
|
|
<Categories
|
|
categories={filteredOthersCategories}
|
|
currentCategory={category}
|
|
currentSubCategory={subCategory}
|
|
/>
|
|
</HeaderContainer>
|
|
)}
|
|
</Wrapper>
|
|
);
|
|
}
|