WIP

alchemy-fr · Dec 11, 2024 · 070914e · 070914e
1 parent 2f04ef2
commit 070914e
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 42 deletions.
diff --git a/novu/bridge/app/api/trigger/route.ts b/novu/bridge/app/api/trigger/route.ts
diff --git a/novu/bridge/app/novu/emails/CTAEmail.tsx b/novu/bridge/app/novu/emails/CTAEmail.tsx
@@ -53,8 +53,11 @@ export function createCTAEmailControlSchema({
 }: CreateCTAEEmailControlSchemaProps) {
     return createEmailControlSchema({
         ...rest,
-        introText: createOptionalOrNotString(defaultIntroText),
-        outroText: createOptionalOrNotString(defaultOutroText),
+        shape: {
+            ...(rest.shape ?? {}),
+            introText: createOptionalOrNotString(defaultIntroText),
+            outroText: createOptionalOrNotString(defaultOutroText),
+        }
     });
 }
 

diff --git a/novu/bridge/app/novu/emails/DefaultEmail.tsx b/novu/bridge/app/novu/emails/DefaultEmail.tsx
@@ -1,7 +1,6 @@
 import {Body, Container, Head, Html, Preview} from "@react-email/components";
 import React, {CSSProperties, PropsWithChildren} from "react";
-import {z} from "zod";
-import {ZodRawShape} from "zod/lib/types";
+import {z, ZodRawShape} from "zod";
 
 type Props = PropsWithChildren<{}>;
 
@@ -67,14 +66,15 @@ export const styles: Record<string, CSSProperties> = {
 
 export type CreateEmailControlSchemaProps = {
     defaultEmailSubject: string;
-} & ZodRawShape;
+    shape?: ZodRawShape;
+};
 
 export function createEmailControlSchema({
     defaultEmailSubject,
-    ...rest
+    shape,
 }: CreateEmailControlSchemaProps) {
     return z.object({
         emailSubject: z.string().default(defaultEmailSubject),
-        ...rest,
+        ...(shape ?? {}),
     });
 }
diff --git a/novu/bridge/app/novu/workflows/index.ts b/novu/bridge/app/novu/workflows/index.ts
@@ -1,2 +1,2 @@
-export * from "./uploader/commit-acknowledged";
+export * from "./uploader";
 export * from "./expose";
diff --git a/novu/bridge/app/novu/workflows/uploader/index.ts b/novu/bridge/app/novu/workflows/uploader/index.ts
@@ -0,0 +1 @@
+export * from "./commit-acknowledged";
diff --git a/uploader/api/src/Consumer/Handler/AssetConsumerNotifyHandler.php b/uploader/api/src/Consumer/Handler/AssetConsumerNotifyHandler.php
@@ -5,7 +5,6 @@
 namespace App\Consumer\Handler;
 
 use Alchemy\CoreBundle\Util\DoctrineUtil;
-use Alchemy\NotifyBundle\Notification\NotifierInterface;
 use App\Entity\Asset;
 use App\Entity\Commit;
 use Doctrine\ORM\EntityManagerInterface;
@@ -18,7 +17,6 @@
     public function __construct(
         private HttpClientInterface $client,
         private EntityManagerInterface $em,
-        private NotifierInterface $notifier,
         private string $uploaderUrl,
     ) {
     }
@@ -30,14 +28,6 @@ public function __invoke(AssetConsumerNotify $message): void
         $target = $commit->getTarget();
         $accessToken = $target->getTargetAccessToken();
 
-        $this->notifier->notifyUser(
-            $commit->getUserId(),
-            'uploader-commit-acknowledged',
-            [
-                'assetCount' => $commit->getAssets()->count(),
-            ]
-        );
-
         if (empty($target->getTargetUrl()) || 'avoid' === $accessToken) {
             return;
         }