diff --git a/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/AuditLogs/Audit_logs_spec.js b/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/AuditLogs/Audit_logs_spec.js index b13f673e60..1d3dd5273c 100644 --- a/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/AuditLogs/Audit_logs_spec.js +++ b/app/client/cypress/integration/Smoke_TestSuite_Fat/ClientSideTests/AuditLogs/Audit_logs_spec.js @@ -10,8 +10,8 @@ const Header = { }; const Carousel = { - Left: "[data-testid='t--carousel-left']", - Right: "[data-testid='t--carousel-right']", + Left: "[data-testid='t--carousel-triggers']", + Right: "[data-testid='t--carousel-targets']", }; const UpgradePage = { diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index 354c5444b9..0b79a3dbcc 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -1281,7 +1281,34 @@ export const INVALID_URL = () => // Alert options and labels for showMessage types export const ALERT_STYLE_OPTIONS = [ { label: "Info", value: "'info'", id: "info" }, - { label: "Success", value: "'success'", id: "success" }, + { + label: "Success", + value: "'success'", + id: "success", + }, { label: "Error", value: "'error'", id: "error" }, { label: "Warning", value: "'warning'", id: "warning" }, ]; + +export const USAGE_AND_BILLING = { + usage: () => "Usage", + billing: () => "Billing", + usageAndBilling: () => "Usage & Billing", + usageOverNDays: (days: number) => `Usage over the past ${days} days!`, + usageDetails: () => + "This is how much you have used Appsmith to build and run apps.", + unit: () => "minutes/day", + averaged: () => "*averaged", + approximated: () => "*approximated", + sell: () => "Figure out your usage before purchasing Appsmith", + upgradeToBusiness: () => "UPGRADE TO BUSINESS EDITION", + rbacHeading: () => "Role Based Access Control", + rbacDetails: () => + "RBAC is here to allow you to control access to appsmith as easy as you maintain your organization.", + ssoHeading: () => "SSO and Custom Authentication", + ssoDetails: () => "SSO and custom auth allow you to onboard users faster.", + gitHeading: () => "Unlimited private git repositories", + gitDetails: () => "Expand your single source of truth capability to infinite", + exclusive: () => + "These features are exclusively available on business edition.", +}; diff --git a/app/client/src/ce/pages/AdminSettings/LeftPane.tsx b/app/client/src/ce/pages/AdminSettings/LeftPane.tsx index 72d2754227..bf87e38ce3 100644 --- a/app/client/src/ce/pages/AdminSettings/LeftPane.tsx +++ b/app/client/src/ce/pages/AdminSettings/LeftPane.tsx @@ -6,6 +6,10 @@ import { Category } from "@appsmith/pages/AdminSettings/config/types"; import { adminSettingsCategoryUrl } from "RouteBuilder"; import { useParams } from "react-router"; import { Icon, IconSize } from "design-system"; +import { createMessage } from "design-system/build/constants/messages"; +import { USAGE_AND_BILLING } from "@appsmith/constants/messages"; +import { useSelector } from "react-redux"; +import { selectFeatureFlags } from "selectors/usersSelectors"; export const Wrapper = styled.div` flex-basis: ${(props) => @@ -121,6 +125,7 @@ export function Categories({ } export default function LeftPane() { + const features = useSelector(selectFeatureFlags); const categories = getSettingsCategory(); const { category, selected: subCategory } = useParams() as any; return ( @@ -150,6 +155,20 @@ export default function LeftPane() {