From e3a7fd006b5cd646736f8d459b2f2512cd2e1ea9 Mon Sep 17 00:00:00 2001 From: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Date: Wed, 23 Nov 2022 23:42:42 +0100 Subject: [PATCH] make SMS available for all users again (#5656) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: CarinaWolli Co-authored-by: Omar López --- .../ee/workflows/components/AddActionDialog.tsx | 12 ++---------- .../ee/workflows/components/WorkflowDetailsPage.tsx | 13 ++++++------- .../workflows/components/WorkflowStepContainer.tsx | 13 ++----------- packages/trpc/server/routers/viewer/workflows.tsx | 12 ------------ 4 files changed, 10 insertions(+), 40 deletions(-) diff --git a/packages/features/ee/workflows/components/AddActionDialog.tsx b/packages/features/ee/workflows/components/AddActionDialog.tsx index 8186d6b4dd..f2ab45a5cf 100644 --- a/packages/features/ee/workflows/components/AddActionDialog.tsx +++ b/packages/features/ee/workflows/components/AddActionDialog.tsx @@ -29,7 +29,6 @@ interface IAddActionDialog { isOpenDialog: boolean; setIsOpenDialog: Dispatch>; addAction: (action: WorkflowActions, sendTo?: string, numberRequired?: boolean, sender?: string) => void; - isFreeUser: boolean; } interface ISelectActionOption { @@ -44,20 +43,13 @@ type AddActionFormValues = { sender?: string; }; -const cleanUpActionsForFreeUser = (actions: ISelectActionOption[]) => { - return actions.filter( - (item) => item.value !== WorkflowActions.SMS_ATTENDEE && item.value !== WorkflowActions.SMS_NUMBER - ); -}; - export const AddActionDialog = (props: IAddActionDialog) => { const { t } = useLocale(); - const { isOpenDialog, setIsOpenDialog, addAction, isFreeUser } = props; + const { isOpenDialog, setIsOpenDialog, addAction } = props; const [isPhoneNumberNeeded, setIsPhoneNumberNeeded] = useState(false); const [isSenderIdNeeded, setIsSenderIdNeeded] = useState(false); const [isEmailAddressNeeded, setIsEmailAddressNeeded] = useState(false); - const workflowActions = getWorkflowActionOptions(t); - const actionOptions = isFreeUser ? cleanUpActionsForFreeUser(workflowActions) : workflowActions; + const actionOptions = getWorkflowActionOptions(t); const formSchema = z.object({ action: z.enum(WORKFLOW_ACTIONS), diff --git a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx index 9ee9c9d8c0..b2d220f11d 100644 --- a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx +++ b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx @@ -28,9 +28,6 @@ export default function WorkflowDetailsPage(props: Props) { const { t } = useLocale(); const router = useRouter(); - const me = useMeQuery(); - const isFreeUser = me.data?.plan === "FREE"; - const [isAddActionDialogOpen, setIsAddActionDialogOpen] = useState(false); const [reload, setReload] = useState(false); const [deleteDialogOpen, setDeleteDialogOpen] = useState(false); @@ -124,7 +121,7 @@ export default function WorkflowDetailsPage(props: Props) {
{form.getValues("trigger") && (
- +
)} {form.getValues("steps") && ( @@ -137,7 +134,6 @@ export default function WorkflowDetailsPage(props: Props) { step={step} reload={reload} setReload={setReload} - isFreeUser={isFreeUser} /> ); })} @@ -147,7 +143,11 @@ export default function WorkflowDetailsPage(props: Props) {
-
@@ -157,7 +157,6 @@ export default function WorkflowDetailsPage(props: Props) { isOpenDialog={isAddActionDialogOpen} setIsOpenDialog={setIsAddActionDialogOpen} addAction={addAction} - isFreeUser={isFreeUser} /> ; reload?: boolean; setReload?: Dispatch>; - isFreeUser: boolean; }; export default function WorkflowStepContainer(props: WorkflowStepProps) { const { t, i18n } = useLocale(); - const { step, form, reload, setReload, isFreeUser } = props; + const { step, form, reload, setReload } = props; const [isAdditionalInputsDialogOpen, setIsAdditionalInputsDialogOpen] = useState(false); const [confirmationDialogOpen, setConfirmationDialogOpen] = useState(false); @@ -324,15 +323,7 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) { } }} defaultValue={selectedAction} - options={ - isFreeUser - ? actionOptions.filter( - (actionOption) => - actionOption.value !== WorkflowActions.SMS_ATTENDEE && - actionOption.value !== WorkflowActions.SMS_NUMBER - ) - : actionOptions - } + options={actionOptions} /> ); }} diff --git a/packages/trpc/server/routers/viewer/workflows.tsx b/packages/trpc/server/routers/viewer/workflows.tsx index ac6a0d5726..b4cd0aadfd 100644 --- a/packages/trpc/server/routers/viewer/workflows.tsx +++ b/packages/trpc/server/routers/viewer/workflows.tsx @@ -32,12 +32,6 @@ import { TRPCError } from "@trpc/server"; import { router, authedProcedure } from "../../trpc"; -function isSMSAction(action: WorkflowActions) { - if (action === WorkflowActions.SMS_ATTENDEE || action === WorkflowActions.SMS_NUMBER) { - return true; - } -} - export const workflowsRouter = router({ list: authedProcedure.query(async ({ ctx }) => { const workflows = await ctx.prisma.workflow.findMany({ @@ -524,9 +518,6 @@ export const workflowsRouter = router({ }); //step was edited } else if (JSON.stringify(oldStep) !== JSON.stringify(newStep)) { - if (user.plan === "FREE" && !isSMSAction(oldStep.action) && isSMSAction(newStep.action)) { - throw new TRPCError({ code: "UNAUTHORIZED" }); - } await ctx.prisma.workflowStep.update({ where: { id: oldStep.id, @@ -666,9 +657,6 @@ export const workflowsRouter = router({ //added steps const addedSteps = steps.map((s) => { if (s.id <= 0) { - if (user.plan === "FREE" && isSMSAction(s.action)) { - throw new TRPCError({ code: "UNAUTHORIZED" }); - } const { id: stepId, ...stepToAdd } = s; return stepToAdd; }