From 0e065dfa8983b7558b8c6f6dd6bd5f1040bb4be3 Mon Sep 17 00:00:00 2001
From: Dima Grossman <dima@grossman.io>
Date: Mon, 23 Dec 2024 12:28:03 +0200
Subject: [PATCH 1/5] fix(dashboard): clicking outside dropdown closes the
 whole edit sidebar (#7352)

---
 apps/dashboard/src/components/in-app-action-dropdown.tsx      | 4 ++--
 .../src/components/primitives/form/avatar-picker.tsx          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dashboard/src/components/in-app-action-dropdown.tsx b/apps/dashboard/src/components/in-app-action-dropdown.tsx
index 787adf40edc..a61525783cb 100644
--- a/apps/dashboard/src/components/in-app-action-dropdown.tsx
+++ b/apps/dashboard/src/components/in-app-action-dropdown.tsx
@@ -51,7 +51,7 @@ export const InAppActionDropdown = ({ onMenuItemClick }: { onMenuItemClick?: ()
 
   return (
     <>
-      <DropdownMenu>
+      <DropdownMenu modal={false}>
         <div className={cn('mt-3 flex items-center gap-1')}>
           <div className="border-neutral-alpha-200 relative flex min-h-10 w-full flex-wrap items-center justify-end gap-1 rounded-md border p-1 shadow-sm">
             {!primaryAction && !secondaryAction && (
@@ -168,7 +168,7 @@ const ConfigureActionPopover = (props: ComponentProps<typeof PopoverTrigger> & {
   );
 
   return (
-    <Popover modal={true}>
+    <Popover>
       <PopoverTrigger {...rest} />
       <PopoverContent className="max-w-72" side="bottom" align="end">
         <div className="flex flex-col gap-3">
diff --git a/apps/dashboard/src/components/primitives/form/avatar-picker.tsx b/apps/dashboard/src/components/primitives/form/avatar-picker.tsx
index d0780010bad..d4f9a16ffaa 100644
--- a/apps/dashboard/src/components/primitives/form/avatar-picker.tsx
+++ b/apps/dashboard/src/components/primitives/form/avatar-picker.tsx
@@ -53,7 +53,7 @@ export const AvatarPicker = forwardRef<HTMLInputElement, AvatarPickerProps>(
 
     return (
       <div className="size-9 space-y-2">
-        <Popover modal={true} open={isOpen} onOpenChange={setIsOpen}>
+        <Popover open={isOpen} onOpenChange={setIsOpen}>
           <PopoverTrigger asChild>
             <Button variant="outline" size="icon" className="text-foreground-600 relative size-full overflow-hidden">
               {value ? (

From 6f3df0ddc6c59b74d2a992c601fd1fcb3652de2c Mon Sep 17 00:00:00 2001
From: Sokratis Vidros <sokratis.vidros@gmail.com>
Date: Mon, 23 Dec 2024 12:23:02 +0200
Subject: [PATCH 2/5] chore(root): Respect NX release change from parameter

NX should automatically detect the previous release and generate changelogs but in our Monorepo it doesn't work yet. To mitigate that, we need to manually supply the --from git reference so that NX uses it as an anchor for the changelog generation.
---
 scripts/release.mjs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/release.mjs b/scripts/release.mjs
index 2f0f8286758..ce30683ae2e 100644
--- a/scripts/release.mjs
+++ b/scripts/release.mjs
@@ -1,8 +1,8 @@
 /**
  * Release all packages in the monorepo.
- * 
+ *
  * Usage: pnpm release <version>
- * 
+ *
  * Known issues:
  * - nx release with independent versioning and updateDependents: "auto" increases patch by the amount of dependencies updated (https://github.com/nrwl/nx/issues/27823)
  */
@@ -13,8 +13,10 @@ import inquirer from 'inquirer';
 import yargs from 'yargs/yargs';
 import { execa } from 'execa';
 
+const projects = ['tag:type:package'];
+
 (async () => {
-  const { dryRun, verbose, ...rest } = yargs(hideBin(process.argv))
+  const { dryRun, verbose, from, ...rest } = yargs(hideBin(process.argv))
     .version(false)
     .option('dryRun', {
       alias: 'd',
@@ -27,6 +29,11 @@ import { execa } from 'execa';
       type: 'boolean',
       default: false,
     })
+    .option('from', {
+      description:
+        'The git reference to use as the start of the changelog. If not set it will attempt to resolve the latest tag and use that.',
+      type: 'string',
+    })
     .help()
     .parse();
 
@@ -38,7 +45,7 @@ import { execa } from 'execa';
   }
 
   const { workspaceVersion, projectsVersionData } = await releaseVersion({
-    projects: ['tag:type:package'],
+    projects,
     specifier,
     dryRun,
     verbose,
@@ -46,12 +53,13 @@ import { execa } from 'execa';
   });
 
   await releaseChangelog({
-    projects: ['tag:type:package'],
+    projects,
     specifier,
     versionData: projectsVersionData,
     version: workspaceVersion,
     dryRun,
     verbose,
+    from,
   });
 
   await execa({
@@ -68,7 +76,7 @@ import { execa } from 'execa';
   ]);
 
   await releasePublish({
-    projects: ['tag:type:package'],
+    projects,
     specifier: 'patch',
     dryRun,
     verbose,

From 2d7fd8eb0f16c5e83faeacdebf4fff28209b6fb0 Mon Sep 17 00:00:00 2001
From: George Desipris <73396808+desiprisg@users.noreply.github.com>
Date: Mon, 23 Dec 2024 13:47:00 +0200
Subject: [PATCH 3/5] chore(dashboard): Add for block and show behind a ff
 (#7312)

Co-authored-by: Sokratis Vidros <sokratis.vidros@gmail.com>
---
 .../workflow-editor/steps/email/maily.tsx         | 15 ++++++++++++++-
 apps/dashboard/src/index.css                      |  2 +-
 packages/shared/src/types/feature-flags.ts        |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/apps/dashboard/src/components/workflow-editor/steps/email/maily.tsx b/apps/dashboard/src/components/workflow-editor/steps/email/maily.tsx
index 499e7ae7d75..89b41465f12 100644
--- a/apps/dashboard/src/components/workflow-editor/steps/email/maily.tsx
+++ b/apps/dashboard/src/components/workflow-editor/steps/email/maily.tsx
@@ -1,6 +1,7 @@
 import { FormControl, FormField, FormMessage } from '@/components/primitives/form/form';
 import { useWorkflow } from '@/components/workflow-editor/workflow-provider';
 import { parseStepVariables } from '@/utils/parseStepVariablesToLiquidVariables';
+import { useFeatureFlag } from '@/hooks/use-feature-flag';
 import { cn } from '@/utils/ui';
 import { Editor } from '@maily-to/core';
 import {
@@ -20,6 +21,7 @@ import {
   spacer,
   text,
 } from '@maily-to/core/blocks';
+import { FeatureFlagsKeysEnum } from '@novu/shared';
 import type { Editor as TiptapEditor } from '@tiptap/core';
 import { HTMLAttributes, useMemo, useState } from 'react';
 import { useFormContext } from 'react-hook-form';
@@ -48,6 +50,9 @@ export const Maily = (props: MailyProps) => {
   const [_, setEditor] = useState<TiptapEditor>();
   const { control } = useFormContext();
 
+  const isForBlockEnabled = useFeatureFlag(FeatureFlagsKeysEnum.IS_ND_EMAIL_FOR_BLOCK_ENABLED);
+  const isShowEnabled = useFeatureFlag(FeatureFlagsKeysEnum.IS_ND_EMAIL_SHOW_ENABLED);
+
   return (
     <FormField
       control={control}
@@ -55,9 +60,17 @@ export const Maily = (props: MailyProps) => {
       render={({ field }) => {
         return (
           <>
+            {!isShowEnabled && (
+              <style>{`
+                  button:has(.lucide-eye) {
+                    display: none;
+                  }
+                `}</style>
+            )}
             <div className={cn('mx-auto flex h-full flex-col items-start', className)} {...rest}>
               <FormControl>
                 <Editor
+                  key={isForBlockEnabled ? 'for-block-enabled' : 'for-block-disabled'}
                   config={{
                     hasMenuBar: false,
                     wrapClassName: 'min-h-0 max-h-full flex flex-col w-full h-full overflow-y-auto',
@@ -74,7 +87,7 @@ export const Maily = (props: MailyProps) => {
                     image,
                     section,
                     columns,
-                    forLoop,
+                    ...(isForBlockEnabled ? [forLoop] : []),
                     divider,
                     spacer,
                     button,
diff --git a/apps/dashboard/src/index.css b/apps/dashboard/src/index.css
index a19dc9a225e..e4b76b388bd 100644
--- a/apps/dashboard/src/index.css
+++ b/apps/dashboard/src/index.css
@@ -353,4 +353,4 @@
     height: 100%;
     scroll-behavior: smooth;
   }
-}
+}
\ No newline at end of file
diff --git a/packages/shared/src/types/feature-flags.ts b/packages/shared/src/types/feature-flags.ts
index 0e3d4781cdb..f2fd069dae2 100644
--- a/packages/shared/src/types/feature-flags.ts
+++ b/packages/shared/src/types/feature-flags.ts
@@ -49,4 +49,6 @@ export enum FeatureFlagsKeysEnum {
   IS_NEW_DASHBOARD_ACTIVITY_FEED_ENABLED = 'IS_NEW_DASHBOARD_ACTIVITY_FEED_ENABLED',
   IS_ND_INTEGRATION_STORE_ENABLED = 'IS_ND_INTEGRATION_STORE_ENABLED',
   IS_ND_SMS_CHAT_PUSH_ENABLED = 'IS_ND_SMS_CHAT_PUSH_ENABLED',
+  IS_ND_EMAIL_FOR_BLOCK_ENABLED = 'IS_ND_EMAIL_FOR_BLOCK_ENABLED',
+  IS_ND_EMAIL_SHOW_ENABLED = 'IS_ND_EMAIL_SHOW_ENABLED',
 }

From 65388132a0e34ba71169e8df70454ef0f14f70cd Mon Sep 17 00:00:00 2001
From: Sokratis Vidros <sokratis.vidros@gmail.com>
Date: Mon, 23 Dec 2024 14:11:54 +0200
Subject: [PATCH 4/5] fix(dashboard): Improve copywriting

---
 .../workflow-editor/steps/controls/custom-step-controls.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dashboard/src/components/workflow-editor/steps/controls/custom-step-controls.tsx b/apps/dashboard/src/components/workflow-editor/steps/controls/custom-step-controls.tsx
index b3430817112..1d7b83f70f5 100644
--- a/apps/dashboard/src/components/workflow-editor/steps/controls/custom-step-controls.tsx
+++ b/apps/dashboard/src/components/workflow-editor/steps/controls/custom-step-controls.tsx
@@ -112,7 +112,7 @@ export const CustomStepControls = (props: CustomStepControlsProps) => {
         <div className="flex flex-col justify-center gap-1">
           <span className="block text-sm">Override code defined defaults</span>
           <span className="text-xs text-neutral-400">
-            Code-defined defaults are read-only by default, you can override them using this toggle.
+            Code-defined defaults are read-only by default, you can allow overrides using this toggle.
           </span>
         </div>
         <Switch

From a9b7a68c356b03738a0a310c72ef3bb79c21259c Mon Sep 17 00:00:00 2001
From: Dima Grossman <dima@grossman.io>
Date: Mon, 23 Dec 2024 14:13:40 +0200
Subject: [PATCH 5/5] style(dashboard): activity feed statuses NV-5084

---
 .../components/activity/components/step-indicators.tsx    | 2 +-
 apps/dashboard/src/components/activity/constants.ts       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/dashboard/src/components/activity/components/step-indicators.tsx b/apps/dashboard/src/components/activity/components/step-indicators.tsx
index a616b018137..05f70d9a1e3 100644
--- a/apps/dashboard/src/components/activity/components/step-indicators.tsx
+++ b/apps/dashboard/src/components/activity/components/step-indicators.tsx
@@ -19,7 +19,7 @@ export function StepIndicators({ jobs }: StepIndicatorsProps) {
         <div
           key={job._id}
           className={cn(
-            '-ml-2 flex h-7 w-7 items-center justify-center rounded-full first:ml-0',
+            '-ml-2 flex h-7 w-7 items-center justify-center rounded-full border first:ml-0',
             STATUS_STYLES[job.status as keyof typeof STATUS_STYLES] ?? STATUS_STYLES.default
           )}
         >
diff --git a/apps/dashboard/src/components/activity/constants.ts b/apps/dashboard/src/components/activity/constants.ts
index c68cfa1efa5..90498053a6d 100644
--- a/apps/dashboard/src/components/activity/constants.ts
+++ b/apps/dashboard/src/components/activity/constants.ts
@@ -5,10 +5,10 @@ import { RiLoader3Line, RiLoader4Fill } from 'react-icons/ri';
 import { IconType } from 'react-icons/lib';
 
 export const STATUS_STYLES = {
-  completed: 'border-[1px] border-success/40 bg-success/10 text-success/40',
-  failed: 'border-[1px] border-destructive/40 bg-destructive/10 text-destructive/40',
-  delayed: 'border-[1px] border-warning/40 bg-warning/10 text-warning/40',
-  default: 'border-[1px] border-neutral-200 bg-neutral-50 text-neutral-200',
+  completed: 'border-[#99e3bb] bg-[#e9faf0] text-[#99e3bb]',
+  failed: 'border-[#ec98a0] bg-[#ffebed] text-[#ec98a0]',
+  delayed: 'border-[#F5A524] bg-[#FEF4E6] text-[#F8C16E]',
+  default: 'border-[#e0e4ea] bg-[#fbfbfb] text-[#e0e4ea]',
 } as const;
 
 export const JOB_STATUS_CONFIG: Record<