Merge branch 'uat' of github.com:makeplane/plane-ee into preview

This commit is contained in:
sriram veeraghanta
2024-09-23 17:16:37 +05:30
4 changed files with 12 additions and 9 deletions

View File

@@ -1,6 +1,6 @@
"use client";
import { FC, useState } from "react";
import { FC } from "react";
import { observer } from "mobx-react";
import { Crown, Phone } from "lucide-react";
import { Button, getButtonStyling } from "@plane/ui";
@@ -8,8 +8,6 @@ import { Button, getButtonStyling } from "@plane/ui";
import { cn } from "@/helpers/common.helper";
// hooks
import { useInstance, useUserPermissions, useWorkspace } from "@/hooks/store";
// plane web components
import { CloudUpgradeModal } from "@/plane-web/components/license";
// plane web constants
import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants/user-permissions";
// plane web hooks

View File

@@ -1,6 +1,7 @@
"use client";
import { FC, useState } from "react";
import { observer } from "mobx-react";
import orderBy from "lodash/orderBy";
import { useParams } from "next/navigation";
import useSWR from "swr";
@@ -37,7 +38,7 @@ export const calculateYearlyDiscount = (monthlyPrice: number, yearlyPricePerMont
return Math.floor(discountPercentage);
};
export const CloudUpgradeModal: FC<CloudUpgradeModalProps> = (props) => {
export const CloudUpgradeModal: FC<CloudUpgradeModalProps> = observer((props) => {
const { isOpen, handleClose, handleSuccessModal, canFetchProducts = true } = props;
// params
const { workspaceSlug } = useParams();
@@ -48,6 +49,8 @@ export const CloudUpgradeModal: FC<CloudUpgradeModalProps> = (props) => {
const { captureEvent } = useEventTracker();
const { workspaceInfoBySlug } = useUserPermissions();
if (!workspaceSlug) return <></>;
const { currentWorkspaceSubscribedPlanDetail: subscriptionDetail, freeTrialSubscription } =
useWorkspaceSubscription();
// derived values
@@ -212,4 +215,4 @@ export const CloudUpgradeModal: FC<CloudUpgradeModalProps> = (props) => {
</div>
</ModalCore>
);
};
});

View File

@@ -1,6 +1,7 @@
"use client";
import { FC } from "react";
import { observer } from "mobx-react";
import orderBy from "lodash/orderBy";
import { CheckCircle, Loader } from "lucide-react";
import { Tab } from "@headlessui/react";
@@ -23,7 +24,7 @@ export type ProPlanUpgradeProps = {
showTrialButton?: boolean;
};
export const ProPlanUpgrade: FC<ProPlanUpgradeProps> = (props) => {
export const ProPlanUpgrade: FC<ProPlanUpgradeProps> = observer((props) => {
const {
proProduct,
basePlan,
@@ -142,4 +143,4 @@ export const ProPlanUpgrade: FC<ProPlanUpgradeProps> = (props) => {
</Tab.Group>
</div>
);
};
});

View File

@@ -1,6 +1,7 @@
"use client";
import { FC } from "react";
import { observer } from "mobx-react";
import { useParams } from "next/navigation";
import { Dialog } from "@headlessui/react";
// types
@@ -20,7 +21,7 @@ export type SelfHostUpgradeModalProps = {
handleClose: () => void;
};
export const SelfHostUpgradeModal: FC<SelfHostUpgradeModalProps> = (props) => {
export const SelfHostUpgradeModal: FC<SelfHostUpgradeModalProps> = observer((props) => {
const { isOpen, handleClose } = props;
// params
const { workspaceSlug } = useParams();
@@ -105,4 +106,4 @@ export const SelfHostUpgradeModal: FC<SelfHostUpgradeModalProps> = (props) => {
</div>
</ModalCore>
);
};
});