From d71765848cd2adfb910f9618618807e6651d40b4 Mon Sep 17 00:00:00 2001
From: Hariom Balhara <hariombalhara@gmail.com>
Date: Sat, 17 Sep 2022 03:19:04 +0530
Subject: [PATCH] Fix workflows (#4518)

Co-authored-by: Leo Giovanetti <hello@leog.me>
---
 .../features/ee/workflows/pages/v2/index.tsx  | 11 +----
 .../ee/workflows/pages/v2/workflow.tsx        | 41 +++++++------------
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/packages/features/ee/workflows/pages/v2/index.tsx b/packages/features/ee/workflows/pages/v2/index.tsx
index 0ccfd530db..015665a38a 100644
--- a/packages/features/ee/workflows/pages/v2/index.tsx
+++ b/packages/features/ee/workflows/pages/v2/index.tsx
@@ -19,9 +19,6 @@ function WorkflowsPage() {
   const session = useSession();
   const router = useRouter();
 
-  const me = useMeQuery();
-  const isFreeUser = me.data?.plan === "FREE";
-
   const { data, isLoading } = trpc.useQuery(["viewer.workflows.list"]);
 
   const createMutation = trpc.useMutation("viewer.workflows.createV2", {
@@ -47,7 +44,7 @@ function WorkflowsPage() {
       title={t("workflows")}
       subtitle={data?.workflows.length ? t("workflows_to_automate_notifications") : ""}
       CTA={
-        session.data?.hasValidLicense && !isFreeUser && data?.workflows && data?.workflows.length > 0 ? (
+        session.data?.hasValidLicense && data?.workflows && data?.workflows.length > 0 ? (
           <Button
             StartIcon={Icon.FiPlus}
             onClick={() => createMutation.mutate()}
@@ -63,11 +60,7 @@ function WorkflowsPage() {
           <SkeletonLoader />
         ) : (
           <>
-            {isFreeUser ? (
-              <Alert className="border " severity="warning" title={t("pro_feature_workflows")} />
-            ) : (
-              <WorkflowList workflows={data?.workflows} />
-            )}
+            <WorkflowList workflows={data?.workflows} />
           </>
         )}
       </LicenseRequired>
diff --git a/packages/features/ee/workflows/pages/v2/workflow.tsx b/packages/features/ee/workflows/pages/v2/workflow.tsx
index a53a1cc68e..8d666a90c8 100644
--- a/packages/features/ee/workflows/pages/v2/workflow.tsx
+++ b/packages/features/ee/workflows/pages/v2/workflow.tsx
@@ -69,8 +69,6 @@ function WorkflowPage() {
   const { t, i18n } = useLocale();
   const session = useSession();
   const router = useRouter();
-  const me = useMeQuery();
-  const isFreeUser = me.data?.plan === "FREE";
 
   const [selectedEventTypes, setSelectedEventTypes] = useState<Option[]>([]);
   const [isAllDataLoaded, setIsAllDataLoaded] = useState(false);
@@ -189,45 +187,36 @@ function WorkflowPage() {
       <Shell
         title={workflow && workflow.name ? workflow.name : "Untitled"}
         CTA={
-          !isFreeUser && (
-            <div>
-              <Button type="submit">{t("save")}</Button>
-            </div>
-          )
+          <div>
+            <Button type="submit">{t("save")}</Button>
+          </div>
         }
         heading={
           session.data?.hasValidLicense &&
-          isAllDataLoaded &&
-          !isFreeUser && (
+          isAllDataLoaded && (
             <div className={classNames(workflow && !workflow.name ? "text-gray-400" : "")}>
               {workflow && workflow.name ? workflow.name : "untitled"}
             </div>
           )
         }>
         <LicenseRequired>
-          {isFreeUser ? (
-            <Alert className="border " severity="warning" title={t("pro_feature_workflows")} />
-          ) : (
+          {!isError ? (
             <>
-              {!isError ? (
+              {isAllDataLoaded ? (
                 <>
-                  {isAllDataLoaded ? (
-                    <>
-                      <WorkflowDetailsPage
-                        form={form}
-                        workflowId={+workflowId}
-                        selectedEventTypes={selectedEventTypes}
-                        setSelectedEventTypes={setSelectedEventTypes}
-                      />
-                    </>
-                  ) : (
-                    <SkeletonLoader />
-                  )}
+                  <WorkflowDetailsPage
+                    form={form}
+                    workflowId={+workflowId}
+                    selectedEventTypes={selectedEventTypes}
+                    setSelectedEventTypes={setSelectedEventTypes}
+                  />
                 </>
               ) : (
-                <Alert severity="error" title="Something went wrong" message={error.message} />
+                <SkeletonLoader />
               )}
             </>
+          ) : (
+            <Alert severity="error" title="Something went wrong" message={error.message} />
           )}
         </LicenseRequired>
       </Shell>