Merge branch 'next' into self-hosted-auth

Author: djabarovgeorge

apps/api/src/app/inbox/usecases/notifications-count/notifications-count.spec.ts

@@ -15,7 +15,6 @@ describe('NotificationsCount', () => {
   let notificationsCount: NotificationsCount;
   let messageRepository: sinon.SinonStubbedInstance<MessageRepository>;
   let subscriberRepository: sinon.SinonStubbedInstance<SubscriberRepository>;
-  let organizationRepository: sinon.SinonStubbedInstance<OrganizationRepository>;
 
   beforeEach(() => {
     messageRepository = sinon.createStubInstance(MessageRepository);
@@ -177,6 +176,40 @@ describe('NotificationsCount', () => {
         )
       ).to.be.true;
 
+      await notificationsCount.execute({
+        organizationId: 'organizationId',
+        environmentId,
+        subscriberId: 'subscriber-id',
+        filters: [{ snoozed: true }],
+      });
+
+      expect(
+        messageRepository.getCount.calledWith(
+          environmentId,
+          subscriber._id,
+          ChannelTypeEnum.IN_APP,
+          { snoozed: true },
+          { limit: 99 }
+        )
+      ).to.be.true;
+
+      await notificationsCount.execute({
+        organizationId: 'organizationId',
+        environmentId,
+        subscriberId: 'subscriber-id',
+        filters: [{ snoozed: false }],
+      });
+
+      expect(
+        messageRepository.getCount.calledWith(
+          environmentId,
+          subscriber._id,
+          ChannelTypeEnum.IN_APP,
+          { snoozed: false },
+          { limit: 99 }
+        )
+      ).to.be.true;
+
       await notificationsCount.execute({
         organizationId: 'organizationId',
         environmentId,

apps/dashboard/src/components/integrations/components/integration-card.tsx

@@ -158,7 +158,7 @@ function InAppPremiumFeaturesIcon() {
       <TooltipContent>
         <div className="flex flex-col gap-2">
           <div>
-            Upgrade to remove the 'Inbox by Novu' badge and enable notification reminders in your{' '}
+            Upgrade to remove the 'Inbox by Novu' badge and extend notification snooze beyond 24 hours in your{' '}
             <span className="font-mono">{`<Inbox />`}</span> component.
           </div>
           <button onClick={handleUpgradeClick} className="flex items-center gap-1 text-xs font-medium hover:underline">

apps/dashboard/src/components/integrations/components/integration-general-settings.tsx

@@ -4,11 +4,9 @@ import { Input } from '@/components/primitives/input';
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/primitives/popover';
 import { Separator } from '@/components/primitives/separator';
 import { Switch } from '@/components/primitives/switch';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/primitives/tooltip';
-import { useFeatureFlag } from '@/hooks/use-feature-flag';
 import { useFetchSubscription } from '@/hooks/use-fetch-subscription';
 import { ROUTES } from '@/utils/routes';
-import { ApiServiceLevelEnum, FeatureFlagsKeysEnum } from '@novu/shared';
+import { ApiServiceLevelEnum } from '@novu/shared';
 import { Control } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 import { IS_SELF_HOSTED, SELF_HOSTED_UPGRADE_REDIRECT_URL } from '../../../config';
@@ -23,7 +21,6 @@ type IntegrationFormData = {
   primary: boolean;
   environmentId: string;
   removeNovuBranding?: boolean;
-  enableSnooze?: boolean;
 };
 
 type GeneralSettingsProps = {
@@ -34,62 +31,6 @@ type GeneralSettingsProps = {
   isForInAppStep?: boolean;
 };
 
-/**
- * This switch doesn't actually set any value, it serves as an indicator
- * informing if the feature is enabled or not.
- */
-function EnableSnoozeSwitch({ id }: { id: string }) {
-  const { subscription, isLoading } = useFetchSubscription();
-  const navigate = useNavigate();
-  const isFreePlan = subscription?.apiServiceLevel === ApiServiceLevelEnum.FREE;
-  const disabled = isFreePlan || IS_SELF_HOSTED || isLoading;
-  const checked = disabled ? false : true; // Always checked for paid plans
-
-  const popoverContent = IS_SELF_HOSTED
-    ? 'Enable "Remind me later" functionality by upgrading to Cloud plans'
-    : 'Enable "Remind me later" functionality by upgrading to our paid plans';
-
-  const handleLinkClick = () => {
-    if (IS_SELF_HOSTED) {
-      openInNewTab(SELF_HOSTED_UPGRADE_REDIRECT_URL + '?utm_campaign=enable_snooze_prompt');
-    } else {
-      navigate(ROUTES.SETTINGS_BILLING + '?utm_source=enable_snooze_prompt');
-    }
-  };
-
-  return (
-    <div className="flex items-center">
-      {isFreePlan || IS_SELF_HOSTED ? (
-        <Popover modal>
-          <PopoverTrigger asChild>
-            <Switch id={id} checked={checked} />
-          </PopoverTrigger>
-          <PopoverContent className="w-72" align="end" sideOffset={4}>
-            <div className="flex flex-col gap-2 p-1">
-              <div className="flex flex-col gap-1">
-                <h4 className="text-xs font-semibold">Premium Feature</h4>
-                <p className="text-muted-foreground text-xs">{popoverContent}</p>
-              </div>
-              <div className="flex justify-end">
-                <LinkButton size="sm" variant="primary" onClick={handleLinkClick}>
-                  Upgrade Plan
-                </LinkButton>
-              </div>
-            </div>
-          </PopoverContent>
-        </Popover>
-      ) : (
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Switch id={id} checked={true} disabled={true} />
-          </TooltipTrigger>
-          <TooltipContent>This feature is automatically enabled with your plan and stays active.</TooltipContent>
-        </Tooltip>
-      )}
-    </div>
-  );
-}
-
 function NovuBrandingSwitch({
   id,
   value,
@@ -153,8 +94,6 @@ export function GeneralSettings({
   disabledPrimary,
   isForInAppStep,
 }: GeneralSettingsProps) {
-  const isSnoozeEnabled = useFeatureFlag(FeatureFlagsKeysEnum.IS_SNOOZE_ENABLED);
-
   return (
     <div className="border-neutral-alpha-200 bg-background text-foreground-600 mx-0 mt-0 flex flex-col gap-2 rounded-lg border p-3">
       <FormField
@@ -197,28 +136,6 @@ export function GeneralSettings({
               );
             }}
           />
-          {isSnoozeEnabled && (
-            <FormField
-              control={control}
-              name="enableSnooze"
-              render={() => {
-                return (
-                  <FormItem className="flex items-center justify-between gap-2">
-                    <FormLabel
-                      className="text-xs"
-                      htmlFor="enableSnooze"
-                      tooltip="Enables users to postpone notifications and get reminded at a later time"
-                    >
-                      Enable "Remind me later" functionality
-                    </FormLabel>
-                    <FormControl>
-                      <EnableSnoozeSwitch id="enableSnooze" />
-                    </FormControl>
-                  </FormItem>
-                );
-              }}
-            />
-          )}
         </>
       )}
 

libs/dal/src/repositories/message/message.repository.ts

@@ -96,9 +96,11 @@ export class MessageRepository extends BaseRepository<MessageDBModel, MessageEnt
     }
 
     if (query.snoozed != null) {
-      requestQuery.snoozedUntil = { $exists: true, $ne: null };
-    } else {
-      requestQuery.snoozedUntil = { $exists: false };
+      if (query.snoozed) {
+        requestQuery.snoozedUntil = { $ne: null };
+      } else {
+        requestQuery.$or = [{ snoozedUntil: { $exists: false } }, { snoozedUntil: null }];
+      }
     }
 
     if (createdAt != null) {

packages/js/package.json

@@ -72,7 +72,7 @@
     "build": "pnpm run clean && NODE_ENV=production tsup",
     "postbuild": "rm ./src/ui/index.directcss && ./scripts/copy-package-json.sh && node scripts/size-limit.mjs && pnpm run check-exports",
     "build:umd": "webpack --config webpack.config.cjs",
-    "build:watch": "concurrently \"NODE_ENV=development pnpm run tsup:watch\" \"pnpm run start:server\"",
+    "build:watch": "concurrently \"pnpm run prebuild\" \"NODE_ENV=development pnpm run tsup:watch\" \"pnpm run start:server\"",
     "tsup:watch": "tsup --watch",
     "check-exports": "attw --pack .",
     "lint": "eslint src",
@@ -132,7 +132,7 @@
     "mitt": "^3.0.1",
     "socket.io-client": "4.7.2",
     "solid-floating-ui": "^0.3.1",
-    "solid-js": "^1.8.11",
+    "solid-js": "^1.9.4",
     "solid-motionone": "^1.0.3",
     "tailwind-merge": "^2.4.0"
   },

packages/js/src/ui/components/Inbox.tsx

@@ -4,11 +4,11 @@ import { useInboxContext } from '../context';
 import { useStyle } from '../helpers';
 import type {
   BellRenderer,
+  BodyRenderer,
   NotificationActionClickHandler,
   NotificationClickHandler,
   NotificationRenderer,
   SubjectRenderer,
-  BodyRenderer,
 } from '../types';
 import { Bell, Footer, Header, Preferences } from './elements';
 import { PreferencesHeader } from './elements/Preferences/PreferencesHeader';

packages/js/src/ui/components/InboxTabs/InboxTabs.tsx

@@ -6,12 +6,12 @@ import { useTabsDropdown } from '../../helpers/useTabsDropdown';
 import { Check } from '../../icons';
 import { ArrowDown } from '../../icons/ArrowDown';
 import {
+  BodyRenderer,
   NotificationActionClickHandler,
   NotificationClickHandler,
   NotificationRenderer,
   NotificationStatus,
   SubjectRenderer,
-  BodyRenderer,
   Tab,
 } from '../../types';
 import { NotificationList } from '../Notification';