diff --git a/app/client/package.json b/app/client/package.json index c1def1dc2f..7fe053b007 100644 --- a/app/client/package.json +++ b/app/client/package.json @@ -93,7 +93,7 @@ "cypress-log-to-output": "^1.1.2", "dayjs": "^1.10.6", "deep-diff": "^1.0.2", - "design-system": "npm:@appsmithorg/design-system@2.1.15", + "design-system": "npm:@appsmithorg/design-system@2.1.16", "design-system-old": "npm:@appsmithorg/design-system-old@1.1.11", "downloadjs": "^1.4.7", "fast-deep-equal": "^3.1.3", diff --git a/app/client/src/ce/constants/messages.ts b/app/client/src/ce/constants/messages.ts index e64b179af5..8d72e535db 100644 --- a/app/client/src/ce/constants/messages.ts +++ b/app/client/src/ce/constants/messages.ts @@ -1304,16 +1304,18 @@ export const ACCESS_CONTROL_UPGRADE_PAGE_FOOTER = () => // Provisioning upgrade page begin export const USER_PROVISIONING_FOR_ENTERPRISES = () => - "user provisioning for enterprises"; + "Manage Appsmith users via your identity provider"; export const PROVISIONING_UPGRADE_PAGE_SUB_HEADING = () => - "Provision and de-provision users on Appsmith. Automatic group sync from your IdP."; + `Add and remove Appsmith users centrally. Sync existing groups to Appsmith.`; export const PROVISION_DEPROVISION_USERS = () => - "Provision and de-provision users on Appsmith"; + "Provision and deprovision users from your IdP"; export const PROVISION_DEPROVISION_USERS_DETAIL1 = () => - `Automatically assign accounts to new employees and revoke access when they leave. Error-free, right from your Identity Provider (IdP).`; -export const AUTO_GROUP_SYNC = () => "Automatic group sync from your IdP"; + `Control user authorization and access to Appsmith workspaces and apps via your IdP using the SCIM protocol.
 
More protocols coming soon
`; +export const AUTO_GROUP_SYNC = () => "Automatic group sync"; export const AUTO_GROUP_SYNC_DETAIL1 = () => - `Sync user groups from your IdP into Appsmith to manage access across your teams easily.`; + `Easily manage access for groups when you sync them to Appsmith from your IdP.`; +export const PROVISIONING_UPGRADE_PAGE_FOOTER = () => + "Secure your Appsmith apps with Granular Access Controls, Audit Logs, Custom SSO, and more on Appsmith Enterprise."; // Provisioning upgrade page end // diff --git a/app/client/src/ce/pages/Upgrade/Carousel.tsx b/app/client/src/ce/pages/Upgrade/Carousel.tsx index 4a9772d444..3a57a41f59 100644 --- a/app/client/src/ce/pages/Upgrade/Carousel.tsx +++ b/app/client/src/ce/pages/Upgrade/Carousel.tsx @@ -23,7 +23,7 @@ const CarouselContainer = styled.div` & .carousel-trigger { padding: 16px; width: 100%; - height: 56px; + height: max-content; cursor: pointer; .icon-container { @@ -65,7 +65,6 @@ const CarouselContainer = styled.div` &.active { height: max-content; - min-height: 156px; box-shadow: 0 2px 4px -2px rgba(0, 0, 0, 0.06), 0 4px 8px -2px rgba(0, 0, 0, 0.1); diff --git a/app/client/src/ce/pages/Upgrade/ProvisioningUpgradePage.tsx b/app/client/src/ce/pages/Upgrade/ProvisioningUpgradePage.tsx index 6ec7792965..8384890048 100644 --- a/app/client/src/ce/pages/Upgrade/ProvisioningUpgradePage.tsx +++ b/app/client/src/ce/pages/Upgrade/ProvisioningUpgradePage.tsx @@ -4,13 +4,12 @@ import UpgradePage from "./UpgradePage"; import ProvisionDeprovisionUsersImage from "assets/images/upgrade/provisioning/provision-deprovision-users.svg"; import AutoGroupSyncImage from "assets/images/upgrade/provisioning/auto-group-sync.svg"; import { - ACCESS_CONTROL_UPGRADE_PAGE_FOOTER, AUTO_GROUP_SYNC, AUTO_GROUP_SYNC_DETAIL1, createMessage, - INTRODUCING, PROVISION_DEPROVISION_USERS, PROVISION_DEPROVISION_USERS_DETAIL1, + PROVISIONING_UPGRADE_PAGE_FOOTER, PROVISIONING_UPGRADE_PAGE_SUB_HEADING, USER_PROVISIONING_FOR_ENTERPRISES, } from "@appsmith/constants/messages"; @@ -23,10 +22,7 @@ export function ProvisioningUpgradePage() { }); const header: Header = { - heading: createMessage( - INTRODUCING, - createMessage(USER_PROVISIONING_FOR_ENTERPRISES), - ), + heading: createMessage(USER_PROVISIONING_FOR_ENTERPRISES), subHeadings: [createMessage(PROVISIONING_UPGRADE_PAGE_SUB_HEADING)], }; const carousel: Carousel = { @@ -60,7 +56,7 @@ export function ProvisioningUpgradePage() { onClick: () => { onUpgrade(); }, - message: createMessage(ACCESS_CONTROL_UPGRADE_PAGE_FOOTER), + message: createMessage(PROVISIONING_UPGRADE_PAGE_FOOTER), isEnterprise: true, }; const props = { header, carousel, footer }; diff --git a/app/client/src/pages/Settings/FormGroup/CopyUrlForm.tsx b/app/client/src/pages/Settings/FormGroup/CopyUrlForm.tsx index 97b3f7b7e7..db17a7d4b9 100644 --- a/app/client/src/pages/Settings/FormGroup/CopyUrlForm.tsx +++ b/app/client/src/pages/Settings/FormGroup/CopyUrlForm.tsx @@ -28,9 +28,20 @@ function CopyUrlForm(props: { helpText?: string; tooltip?: string; fieldName?: string; + startIcon?: string; + append?: boolean; }) { + const { + append = true, + fieldName, + helpText, + startIcon, + title, + tooltip, + } = props; + const fieldValue = useMemo( - () => `${window.location.origin}${props.value}`, + () => `${append ? window.location.origin : ""}${props.value}`, [props.value], ); @@ -45,7 +56,7 @@ function CopyUrlForm(props: { return ( - {props.title} + {title} - {props.tooltip && ( - + {tooltip && ( + } - name={props.fieldName} + name={fieldName} size="md" + {...(startIcon ? { startIcon } : {})} value={fieldValue} /> diff --git a/app/client/yarn.lock b/app/client/yarn.lock index 4bcfe64e10..e3b4eae8ff 100644 --- a/app/client/yarn.lock +++ b/app/client/yarn.lock @@ -9660,7 +9660,7 @@ __metadata: cypress-xpath: ^1.6.0 dayjs: ^1.10.6 deep-diff: ^1.0.2 - design-system: "npm:@appsmithorg/design-system@2.1.15" + design-system: "npm:@appsmithorg/design-system@2.1.16" design-system-old: "npm:@appsmithorg/design-system-old@1.1.11" diff: ^5.0.0 dotenv: ^8.1.0 @@ -13735,9 +13735,9 @@ __metadata: languageName: node linkType: hard -"design-system@npm:@appsmithorg/design-system@2.1.15": - version: 2.1.15 - resolution: "@appsmithorg/design-system@npm:2.1.15" +"design-system@npm:@appsmithorg/design-system@2.1.16": + version: 2.1.16 + resolution: "@appsmithorg/design-system@npm:2.1.16" dependencies: "@radix-ui/react-dialog": ^1.0.2 "@radix-ui/react-dropdown-menu": ^2.0.4 @@ -13762,7 +13762,7 @@ __metadata: react-dom: ^17.0.2 react-router-dom: ^5.0.0 styled-components: ^5.3.6 - checksum: 35641238fdf0bd7072beacc06b53aeefc6fbad499d5a8ad90955821387eed7c55c1396c01930177d4ef4c787f5b29768e5f410345eb06f3fde2e0c85217a1c73 + checksum: 240eef526e8021a0f146430e89f1983e2e125d2a74835326240afcf72e1f4ee41d941f2fd2499345dff3cc9c603c2180971c079b78aeddc3c2a04cdcda96c433 languageName: node linkType: hard