Merge branch 'main' into fix/org-avatar-not-showing-shell

zomars · web-flow · commit 339364073866 · 2023-08-11T17:09:57.000-07:00
diff --git a/packages/app-store/paypal/lib/PaymentService.ts b/packages/app-store/paypal/lib/PaymentService.ts
@@ -117,9 +117,24 @@ export class PaymentService implements IAbstractPaymentService {
         throw new Error();
       }
 
+      const uid = uuidv4();
+
+      const paypalClient = new Paypal({
+        clientId: this.credentials.client_id,
+        secretKey: this.credentials.secret_key,
+      });
+      const preference = await paypalClient.createOrder({
+        referenceId: uid,
+        amount: payment.amount,
+        currency: payment.currency,
+        returnUrl: `${WEBAPP_URL}/booking/${booking.uid}`,
+        cancelUrl: `${WEBAPP_URL}/payment/${uid}`,
+        intent: "AUTHORIZE",
+      });
+
       const paymentData = await prisma.payment.create({
         data: {
-          uid: uuidv4(),
+          uid,
           app: {
             connect: {
               slug: "paypal",
@@ -132,34 +147,12 @@ export class PaymentService implements IAbstractPaymentService {
           },
           amount: payment.amount,
           currency: payment.currency,
-          data: {},
+          data: Object.assign({}, preference) as unknown as Prisma.InputJsonValue,
           fee: 0,
           refunded: false,
           success: false,
           paymentOption: paymentOption || "ON_BOOKING",
-        },
-      });
-
-      const paypalClient = new Paypal({
-        clientId: this.credentials.client_id,
-        secretKey: this.credentials.secret_key,
-      });
-      const preference = await paypalClient.createOrder({
-        referenceId: paymentData.uid,
-        amount: paymentData.amount,
-        currency: paymentData.currency,
-        returnUrl: `${WEBAPP_URL}/booking/${booking.uid}`,
-        cancelUrl: `${WEBAPP_URL}/payment/${paymentData.uid}`,
-        intent: "AUTHORIZE",
-      });
-
-      await prisma.payment.update({
-        where: {
-          id: paymentData.id,
-        },
-        data: {
           externalId: preference?.id,
-          data: Object.assign({}, preference) as unknown as Prisma.InputJsonValue,
         },
       });
 
diff --git a/packages/features/ee/organizations/pages/settings/profile.tsx b/packages/features/ee/organizations/pages/settings/profile.tsx
@@ -8,7 +8,6 @@ import { z } from "zod";
 
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { subdomainSuffix } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { WEBAPP_URL } from "@calcom/lib/constants";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { md } from "@calcom/lib/markdownIt";
@@ -69,7 +68,7 @@ const OrgProfileView = () => {
     onSuccess: (org) => {
       if (org) {
         form.setValue("name", org.name || "");
-        form.setValue("slug", org.slug || "");
+        form.setValue("slug", org.slug || org.metadata?.requestedSlug || "");
         form.setValue("logo", org.logo || "");
         form.setValue("bio", org.bio || "");
         if (org.slug === null && (org?.metadata as Prisma.JsonObject)?.requestedSlug) {
@@ -89,20 +88,8 @@ const OrgProfileView = () => {
     !currentOrganisation.bio ||
     !currentOrganisation.bio.replace("<p><br></p>", "").length;
 
-  const deleteTeamMutation = trpc.viewer.teams.delete.useMutation({
-    async onSuccess() {
-      await utils.viewer.teams.list.invalidate();
-      showToast(t("your_org_disbanded_successfully"), "success");
-      router.push(`${WEBAPP_URL}/teams`);
-    },
-  });
-
   if (!orgBranding) return null;
 
-  function deleteTeam() {
-    if (currentOrganisation?.id) deleteTeamMutation.mutate({ teamId: currentOrganisation.id });
-  }
-
   return (
     <LicenseRequired>
       <Meta title={t("profile")} description={t("profile_org_description")} />
@@ -168,15 +155,21 @@ const OrgProfileView = () => {
                   </div>
                 )}
               />
-              <div className="mt-8">
-                <TextField
-                  name="slug"
-                  label={t("org_url")}
-                  value={currentOrganisation.slug ?? ""}
-                  disabled
-                  addOnSuffix={`.${subdomainSuffix()}`}
-                />
-              </div>
+              <Controller
+                control={form.control}
+                name="slug"
+                render={({ field: { value } }) => (
+                  <div className="mt-8">
+                    <TextField
+                      name="slug"
+                      label={t("org_url")}
+                      value={value}
+                      disabled
+                      addOnSuffix={`.${subdomainSuffix()}`}
+                    />
+                  </div>
+                )}
+              />
               <div className="mt-8">
                 <Label>{t("about")}</Label>
                 <Editor
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
@@ -509,7 +509,7 @@ model Payment {
   success       Boolean
   refunded      Boolean
   data          Json
-  externalId    String?        @unique
+  externalId    String         @unique
   paymentOption PaymentOption? @default(ON_BOOKING)
 
   @@index([bookingId])
diff --git a/packages/trpc/server/routers/viewer/organizations/list.handler.ts b/packages/trpc/server/routers/viewer/organizations/list.handler.ts
@@ -1,4 +1,5 @@
 import type { PrismaClient } from "@calcom/prisma/client";
+import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
 import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";
 
 import { TRPCError } from "@trpc/server";
@@ -28,11 +29,14 @@ export const listHandler = async ({ ctx }: ListHandlerInput) => {
     },
   });
 
+  const metadata = teamMetadataSchema.parse(membership?.team.metadata);
+
   return {
     user: {
       role: membership?.role,
       accepted: membership?.accepted,
     },
     ...membership?.team,
+    metadata,
   };
 };
