From f29356a578d600fceeada98610670e3d4e4ef95c Mon Sep 17 00:00:00 2001
From: George Desipris <73396808+desiprisg@users.noreply.github.com>
Date: Wed, 20 Nov 2024 20:23:56 +0200
Subject: [PATCH 1/2] fix(dashboard): Portal tooltip content by default (#7095)

---
 .../src/components/primitives/tooltip.tsx          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/dashboard/src/components/primitives/tooltip.tsx b/apps/dashboard/src/components/primitives/tooltip.tsx
index be64020fe84..377a4987774 100644
--- a/apps/dashboard/src/components/primitives/tooltip.tsx
+++ b/apps/dashboard/src/components/primitives/tooltip.tsx
@@ -39,12 +39,14 @@ type TooltipContentProps = React.ComponentPropsWithoutRef<typeof TooltipPrimitiv
 
 const TooltipContent = React.forwardRef<React.ElementRef<typeof TooltipPrimitive.Content>, TooltipContentProps>(
   ({ className, sideOffset = 4, variant, size, ...props }, ref) => (
-    <TooltipPrimitive.Content
-      ref={ref}
-      sideOffset={sideOffset}
-      className={cn(tooltipContentVariants({ variant, size }), className)}
-      {...props}
-    />
+    <TooltipPortal>
+      <TooltipPrimitive.Content
+        ref={ref}
+        sideOffset={sideOffset}
+        className={cn(tooltipContentVariants({ variant, size }), className)}
+        {...props}
+      />
+    </TooltipPortal>
   )
 );
 

From f074695adaf74f9ddc60f24b2274b1bf88a53e78 Mon Sep 17 00:00:00 2001
From: Himanshu Garg <garg_himanshu@outlook.com>
Date: Thu, 21 Nov 2024 11:04:54 +0530
Subject: [PATCH 2/2] =?UTF-8?q?fix(dal):=20Add=20index=20on=20createdAt=20?=
 =?UTF-8?q?for=20Online=20Archive=20in=20execution,=20job=E2=80=A6=20(#708?=
 =?UTF-8?q?3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../execution-details/execution-details.schema.ts         | 8 ++++++--
 libs/dal/src/repositories/job/job.schema.ts               | 6 +++++-
 libs/dal/src/repositories/message/message.schema.ts       | 8 ++++++--
 .../src/repositories/notification/notification.schema.ts  | 6 +++++-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/libs/dal/src/repositories/execution-details/execution-details.schema.ts b/libs/dal/src/repositories/execution-details/execution-details.schema.ts
index 65eb5bc9d6c..b6c76e58de1 100644
--- a/libs/dal/src/repositories/execution-details/execution-details.schema.ts
+++ b/libs/dal/src/repositories/execution-details/execution-details.schema.ts
@@ -1,10 +1,9 @@
-import mongoose, { Schema } from 'mongoose';
 import { ExecutionDetailsSourceEnum, ExecutionDetailsStatusEnum } from '@novu/shared';
+import mongoose, { Schema } from 'mongoose';
 
 import { ExecutionDetailsDBModel } from './execution-details.entity';
 
 import { schemaOptions } from '../schema-default.options';
-import { getTTLOptions } from '../../shared';
 
 const executionDetailsSchema = new Schema<ExecutionDetailsDBModel>(
   {
@@ -111,6 +110,11 @@ executionDetailsSchema.index({
   _environmentId: 1,
 });
 
+/*
+ * This index was created to push entries to Online Archive
+ */
+executionDetailsSchema.index({ createdAt: 1 });
+
 export const ExecutionDetails =
   (mongoose.models.ExecutionDetails as mongoose.Model<ExecutionDetailsDBModel>) ||
   mongoose.model<ExecutionDetailsDBModel>('ExecutionDetails', executionDetailsSchema);
diff --git a/libs/dal/src/repositories/job/job.schema.ts b/libs/dal/src/repositories/job/job.schema.ts
index 02ca2c54865..b05c2ae996c 100644
--- a/libs/dal/src/repositories/job/job.schema.ts
+++ b/libs/dal/src/repositories/job/job.schema.ts
@@ -2,7 +2,6 @@ import mongoose, { Schema } from 'mongoose';
 
 import { schemaOptions } from '../schema-default.options';
 import { JobDBModel, JobStatusEnum } from './job.entity';
-import { getTTLOptions } from '../../shared';
 
 const jobSchema = new Schema<JobDBModel>(
   {
@@ -397,4 +396,9 @@ jobSchema.index(
   }
 );
 
+/*
+ * This index was created to push entries to Online Archive
+ */
+jobSchema.index({ createdAt: 1 });
+
 export const Job = (mongoose.models.Job as mongoose.Model<JobDBModel>) || mongoose.model<JobDBModel>('Job', jobSchema);
diff --git a/libs/dal/src/repositories/message/message.schema.ts b/libs/dal/src/repositories/message/message.schema.ts
index 4ae255f415d..88a8a50ea77 100644
--- a/libs/dal/src/repositories/message/message.schema.ts
+++ b/libs/dal/src/repositories/message/message.schema.ts
@@ -1,9 +1,8 @@
-import mongoose, { Schema } from 'mongoose';
 import { ActorTypeEnum } from '@novu/shared';
+import mongoose, { Schema } from 'mongoose';
 
 import { schemaOptions } from '../schema-default.options';
 import { MessageDBModel } from './message.entity';
-import { getTTLOptions } from '../../shared';
 
 const mongooseDelete = require('mongoose-delete');
 
@@ -288,6 +287,11 @@ messageSchema.index({
   createdAt: 1,
 });
 
+/*
+ * This index was created to push entries to Online Archive
+ */
+messageSchema.index({ createdAt: 1 });
+
 export const Message =
   (mongoose.models.Message as mongoose.Model<MessageDBModel>) ||
   mongoose.model<MessageDBModel>('Message', messageSchema);
diff --git a/libs/dal/src/repositories/notification/notification.schema.ts b/libs/dal/src/repositories/notification/notification.schema.ts
index 41f65bf0e16..6a58cf83fc6 100644
--- a/libs/dal/src/repositories/notification/notification.schema.ts
+++ b/libs/dal/src/repositories/notification/notification.schema.ts
@@ -2,7 +2,6 @@ import mongoose, { Schema } from 'mongoose';
 
 import { schemaOptions } from '../schema-default.options';
 import { NotificationDBModel } from './notification.entity';
-import { getTTLOptions } from '../../shared';
 
 const notificationSchema = new Schema<NotificationDBModel>(
   {
@@ -155,6 +154,11 @@ notificationSchema.index({
   createdAt: -1,
 });
 
+/*
+ * This index was created to push entries to Online Archive
+ */
+notificationSchema.index({ createdAt: 1 });
+
 export const Notification =
   (mongoose.models.Notification as mongoose.Model<NotificationDBModel>) ||
   mongoose.model<NotificationDBModel>('Notification', notificationSchema);