chore: Update the content for Provisioning upgrade page (#25474)

## Description

Update the content for Provisioning upgrade page

#### PR fixes following issue(s)
Fixes [#25270](https://github.com/appsmithorg/appsmith/issues/25270)

#### Type of change
- Chore (housekeeping or task changes that don't impact user perception)

## Testing

#### How Has This Been Tested?
- [x] Manual
- [ ] Jest
- [ ] Cypress

## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
This commit is contained in:
Ankita Kinger 2023-07-20 10:55:47 +05:30 committed by GitHub
parent c7b551e328
commit c6afa03372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 31 deletions

View File

@ -93,7 +93,7 @@
"cypress-log-to-output": "^1.1.2", "cypress-log-to-output": "^1.1.2",
"dayjs": "^1.10.6", "dayjs": "^1.10.6",
"deep-diff": "^1.0.2", "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", "design-system-old": "npm:@appsmithorg/design-system-old@1.1.11",
"downloadjs": "^1.4.7", "downloadjs": "^1.4.7",
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",

View File

@ -1304,16 +1304,18 @@ export const ACCESS_CONTROL_UPGRADE_PAGE_FOOTER = () =>
// Provisioning upgrade page begin // Provisioning upgrade page begin
export const USER_PROVISIONING_FOR_ENTERPRISES = () => export const USER_PROVISIONING_FOR_ENTERPRISES = () =>
"user provisioning for enterprises"; "Manage Appsmith users via your identity provider";
export const PROVISIONING_UPGRADE_PAGE_SUB_HEADING = () => 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 = () => 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 = () => 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).`; `Control user authorization and access to Appsmith workspaces and apps via your IdP using the SCIM protocol.<div>&nbsp;</div><div><span style="font-style: italic;font-weight: normal;">More protocols coming soon</span></div>`;
export const AUTO_GROUP_SYNC = () => "Automatic group sync from your IdP"; export const AUTO_GROUP_SYNC = () => "Automatic group sync";
export const AUTO_GROUP_SYNC_DETAIL1 = () => 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 // Provisioning upgrade page end
// //

View File

@ -23,7 +23,7 @@ const CarouselContainer = styled.div`
& .carousel-trigger { & .carousel-trigger {
padding: 16px; padding: 16px;
width: 100%; width: 100%;
height: 56px; height: max-content;
cursor: pointer; cursor: pointer;
.icon-container { .icon-container {
@ -65,7 +65,6 @@ const CarouselContainer = styled.div`
&.active { &.active {
height: max-content; height: max-content;
min-height: 156px;
box-shadow: 0 2px 4px -2px rgba(0, 0, 0, 0.06), box-shadow: 0 2px 4px -2px rgba(0, 0, 0, 0.06),
0 4px 8px -2px rgba(0, 0, 0, 0.1); 0 4px 8px -2px rgba(0, 0, 0, 0.1);

View File

@ -4,13 +4,12 @@ import UpgradePage from "./UpgradePage";
import ProvisionDeprovisionUsersImage from "assets/images/upgrade/provisioning/provision-deprovision-users.svg"; import ProvisionDeprovisionUsersImage from "assets/images/upgrade/provisioning/provision-deprovision-users.svg";
import AutoGroupSyncImage from "assets/images/upgrade/provisioning/auto-group-sync.svg"; import AutoGroupSyncImage from "assets/images/upgrade/provisioning/auto-group-sync.svg";
import { import {
ACCESS_CONTROL_UPGRADE_PAGE_FOOTER,
AUTO_GROUP_SYNC, AUTO_GROUP_SYNC,
AUTO_GROUP_SYNC_DETAIL1, AUTO_GROUP_SYNC_DETAIL1,
createMessage, createMessage,
INTRODUCING,
PROVISION_DEPROVISION_USERS, PROVISION_DEPROVISION_USERS,
PROVISION_DEPROVISION_USERS_DETAIL1, PROVISION_DEPROVISION_USERS_DETAIL1,
PROVISIONING_UPGRADE_PAGE_FOOTER,
PROVISIONING_UPGRADE_PAGE_SUB_HEADING, PROVISIONING_UPGRADE_PAGE_SUB_HEADING,
USER_PROVISIONING_FOR_ENTERPRISES, USER_PROVISIONING_FOR_ENTERPRISES,
} from "@appsmith/constants/messages"; } from "@appsmith/constants/messages";
@ -23,10 +22,7 @@ export function ProvisioningUpgradePage() {
}); });
const header: Header = { const header: Header = {
heading: createMessage( heading: createMessage(USER_PROVISIONING_FOR_ENTERPRISES),
INTRODUCING,
createMessage(USER_PROVISIONING_FOR_ENTERPRISES),
),
subHeadings: [createMessage(PROVISIONING_UPGRADE_PAGE_SUB_HEADING)], subHeadings: [createMessage(PROVISIONING_UPGRADE_PAGE_SUB_HEADING)],
}; };
const carousel: Carousel = { const carousel: Carousel = {
@ -60,7 +56,7 @@ export function ProvisioningUpgradePage() {
onClick: () => { onClick: () => {
onUpgrade(); onUpgrade();
}, },
message: createMessage(ACCESS_CONTROL_UPGRADE_PAGE_FOOTER), message: createMessage(PROVISIONING_UPGRADE_PAGE_FOOTER),
isEnterprise: true, isEnterprise: true,
}; };
const props = { header, carousel, footer }; const props = { header, carousel, footer };

View File

@ -28,9 +28,20 @@ function CopyUrlForm(props: {
helpText?: string; helpText?: string;
tooltip?: string; tooltip?: string;
fieldName?: string; fieldName?: string;
startIcon?: string;
append?: boolean;
}) { }) {
const {
append = true,
fieldName,
helpText,
startIcon,
title,
tooltip,
} = props;
const fieldValue = useMemo( const fieldValue = useMemo(
() => `${window.location.origin}${props.value}`, () => `${append ? window.location.origin : ""}${props.value}`,
[props.value], [props.value],
); );
@ -45,7 +56,7 @@ function CopyUrlForm(props: {
return ( return (
<BodyContainer> <BodyContainer>
<Input <Input
description={`* ${props.helpText}`} {...(helpText ? { description: `* ${helpText}` } : {})}
endIcon="duplicate" endIcon="duplicate"
endIconProps={{ endIconProps={{
className: "copy-icon", className: "copy-icon",
@ -60,14 +71,10 @@ function CopyUrlForm(props: {
kind="body-m" kind="body-m"
renderAs="label" renderAs="label"
> >
{props.title} {title}
</Text> </Text>
{props.tooltip && ( {tooltip && (
<Tooltip <Tooltip content={tooltip} placement="right" trigger="hover">
content={props.tooltip}
placement="right"
trigger="hover"
>
<Icon <Icon
className={"help-icon"} className={"help-icon"}
color="var(--ads-v2-color-fg)" color="var(--ads-v2-color-fg)"
@ -78,8 +85,9 @@ function CopyUrlForm(props: {
)} )}
</HeaderWrapper> </HeaderWrapper>
} }
name={props.fieldName} name={fieldName}
size="md" size="md"
{...(startIcon ? { startIcon } : {})}
value={fieldValue} value={fieldValue}
/> />
</BodyContainer> </BodyContainer>

View File

@ -9660,7 +9660,7 @@ __metadata:
cypress-xpath: ^1.6.0 cypress-xpath: ^1.6.0
dayjs: ^1.10.6 dayjs: ^1.10.6
deep-diff: ^1.0.2 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" design-system-old: "npm:@appsmithorg/design-system-old@1.1.11"
diff: ^5.0.0 diff: ^5.0.0
dotenv: ^8.1.0 dotenv: ^8.1.0
@ -13735,9 +13735,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"design-system@npm:@appsmithorg/design-system@2.1.15": "design-system@npm:@appsmithorg/design-system@2.1.16":
version: 2.1.15 version: 2.1.16
resolution: "@appsmithorg/design-system@npm:2.1.15" resolution: "@appsmithorg/design-system@npm:2.1.16"
dependencies: dependencies:
"@radix-ui/react-dialog": ^1.0.2 "@radix-ui/react-dialog": ^1.0.2
"@radix-ui/react-dropdown-menu": ^2.0.4 "@radix-ui/react-dropdown-menu": ^2.0.4
@ -13762,7 +13762,7 @@ __metadata:
react-dom: ^17.0.2 react-dom: ^17.0.2
react-router-dom: ^5.0.0 react-router-dom: ^5.0.0
styled-components: ^5.3.6 styled-components: ^5.3.6
checksum: 35641238fdf0bd7072beacc06b53aeefc6fbad499d5a8ad90955821387eed7c55c1396c01930177d4ef4c787f5b29768e5f410345eb06f3fde2e0c85217a1c73 checksum: 240eef526e8021a0f146430e89f1983e2e125d2a74835326240afcf72e1f4ee41d941f2fd2499345dff3cc9c603c2180971c079b78aeddc3c2a04cdcda96c433
languageName: node languageName: node
linkType: hard linkType: hard