## Description ### Fixes - [x] https://github.com/appsmithorg/appsmith/issues/19383 - [x] https://github.com/appsmithorg/appsmith/issues/19384 - [x] https://github.com/appsmithorg/appsmith/issues/19385 - [x] https://github.com/appsmithorg/appsmith/issues/19386 - [x] https://github.com/appsmithorg/appsmith/issues/19387 - [x] https://github.com/appsmithorg/appsmith/issues/19388 - [x] https://github.com/appsmithorg/appsmith/issues/19389 - [x] https://github.com/appsmithorg/appsmith/issues/19390 - [x] https://github.com/appsmithorg/appsmith/issues/19391 - [x] https://github.com/appsmithorg/appsmith/issues/19392 - [x] https://github.com/appsmithorg/appsmith/issues/19393 - [x] https://github.com/appsmithorg/appsmith/issues/19394 - [x] https://github.com/appsmithorg/appsmith/issues/19395 - [x] https://github.com/appsmithorg/appsmith/issues/19396 - [x] https://github.com/appsmithorg/appsmith/issues/19397 - [x] https://github.com/appsmithorg/appsmith/issues/19398 - [x] https://github.com/appsmithorg/appsmith/issues/19399 - [x] https://github.com/appsmithorg/appsmith/issues/19400 - [x] https://github.com/appsmithorg/appsmith/issues/19401 - [x] https://github.com/appsmithorg/appsmith/issues/19402 - [x] https://github.com/appsmithorg/appsmith/issues/19403 - [x] https://github.com/appsmithorg/appsmith/issues/19404 - [x] https://github.com/appsmithorg/appsmith/issues/19405 - [x] https://github.com/appsmithorg/appsmith/issues/19406 - [x] https://github.com/appsmithorg/appsmith/issues/19407 - [x] https://github.com/appsmithorg/appsmith/issues/19408 - [x] https://github.com/appsmithorg/appsmith/issues/19409 Fixes # (issue) > if no issue exists, please create an issue and ask the maintainers about this first Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video ## Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update ## How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. > Please also list any relevant details for your test configuration. > Delete anything that is not important - Manual - Jest - Cypress ### Test Plan > Add Testsmith test cases links that relate to this PR ### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) ## Checklist: ### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --------- Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvi@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Apple <nandan@thinkify.io> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
130 lines
3.2 KiB
TypeScript
130 lines
3.2 KiB
TypeScript
import React from "react";
|
|
import { useSelector } from "react-redux";
|
|
import { Text, Link, Button } from "design-system";
|
|
import { PRICING_PAGE_URL } from "constants/ThirdPartyConstants";
|
|
import {
|
|
createMessage,
|
|
IN_APP_EMBED_SETTING,
|
|
} from "@appsmith/constants/messages";
|
|
import {
|
|
isPermitted,
|
|
PERMISSION_TYPE,
|
|
} from "@appsmith/utils/permissionHelpers";
|
|
import { getAppsmithConfigs } from "@appsmith/configs";
|
|
import { getInstanceId } from "@appsmith/selectors/tenantSelectors";
|
|
import styled from "styled-components";
|
|
|
|
const StyledLink = styled(Link)`
|
|
text-decoration: underline !important;
|
|
display: inline;
|
|
`;
|
|
|
|
function PrivateEmbeddingContent(props: {
|
|
userAppPermissions: any[];
|
|
changeTab?: () => void;
|
|
isAppSettings?: boolean;
|
|
}) {
|
|
const { changeTab, isAppSettings = false } = props;
|
|
|
|
const canMakeAppPublic = isPermitted(
|
|
props.userAppPermissions,
|
|
PERMISSION_TYPE.MAKE_PUBLIC_APPLICATION,
|
|
);
|
|
|
|
if (isAppSettings)
|
|
return <AppSettingsContent canMakeAppPublic={canMakeAppPublic} />;
|
|
|
|
return (
|
|
<SnippetTabContent
|
|
canMakeAppPublic={canMakeAppPublic}
|
|
changeTab={changeTab}
|
|
/>
|
|
);
|
|
}
|
|
|
|
export default PrivateEmbeddingContent;
|
|
|
|
function EmbeddedLink() {
|
|
const appsmithConfigs = getAppsmithConfigs();
|
|
const instanceId = useSelector(getInstanceId);
|
|
|
|
return (
|
|
<Text kind="action-m">
|
|
{createMessage(IN_APP_EMBED_SETTING.upgradeContent)}
|
|
<StyledLink
|
|
onClick={() => {
|
|
window.open(
|
|
PRICING_PAGE_URL(
|
|
appsmithConfigs.pricingUrl,
|
|
appsmithConfigs.cloudHosting ? "Cloud" : "CE",
|
|
instanceId,
|
|
),
|
|
"_blank",
|
|
);
|
|
}}
|
|
rel="noreferrer"
|
|
to="#"
|
|
>
|
|
{createMessage(IN_APP_EMBED_SETTING.appsmithBusinessEdition)}
|
|
</StyledLink>
|
|
</Text>
|
|
);
|
|
}
|
|
|
|
function AppSettingsContent({
|
|
canMakeAppPublic,
|
|
}: {
|
|
canMakeAppPublic: boolean;
|
|
}) {
|
|
return (
|
|
<div className="px-4" data-testid="t--upgrade-content">
|
|
<Text className="pt-3 pb-3" kind="heading-xs" renderAs="p">
|
|
{createMessage(IN_APP_EMBED_SETTING.embed)}
|
|
</Text>
|
|
<div className="flex flex-col gap-1">
|
|
<Text kind="action-m" renderAs="p">
|
|
{canMakeAppPublic
|
|
? createMessage(IN_APP_EMBED_SETTING.secondaryHeadingForAppSettings)
|
|
: createMessage(IN_APP_EMBED_SETTING.secondaryHeading)}
|
|
</Text>
|
|
|
|
<EmbeddedLink />
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function SnippetTabContent({
|
|
canMakeAppPublic,
|
|
changeTab,
|
|
}: {
|
|
canMakeAppPublic: boolean;
|
|
changeTab?: () => void;
|
|
}) {
|
|
return (
|
|
<div
|
|
className="flex flex-col gap-1 items-start"
|
|
data-testid="t--upgrade-content"
|
|
>
|
|
<Text color="var(--ads-v2-color-fg-emphasis)" kind="heading-s">
|
|
{canMakeAppPublic
|
|
? createMessage(IN_APP_EMBED_SETTING.upgradeHeadingForInviteModal)
|
|
: createMessage(IN_APP_EMBED_SETTING.upgradeHeading)}
|
|
</Text>
|
|
|
|
<EmbeddedLink />
|
|
|
|
{canMakeAppPublic && (
|
|
<Button
|
|
className="mt-2"
|
|
data-testid="t--share-settings-btn"
|
|
onClick={changeTab}
|
|
size="md"
|
|
>
|
|
Share settings
|
|
</Button>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|