Merge branch 'next' of https://github.com/novuhq/novu into next

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +1,16 @@
-### What change does this PR introduce?
+### What changed? Why was the change needed?
+<!-- Also include any relevant links, such as Linear tickets, Slack discussions, or design documents. -->
 
-<!-- Explain here the changes your PR introduces and text to help us understand the context of this change. -->
+### Screenshots
+<!-- If the changes are visual, include screenshots or screencasts. -->
 
-### Why was this change needed?
+<details>
+<summary><strong>Expand for optional sections</strong></summary>
 
-<!-- If your PR fixes an open issue, use `Closes #999` to link your PR with the issue. #999 stands for the issue number you are fixing, Example: Closes #31 -->
+### Related enterprise PR
+<!-- A link to a dependent pull request  -->
 
-### Other information (Screenshots)
+### Special notes for your reviewer
+<!-- Specific instructions or considerations you want to highlight for the reviewer. -->
 
-<!-- Add notes or any other information here -->
-<!-- Also add all the screenshots which support your changes -->
+</details>

apps/web/src/constants/experimentsConstants.ts

@@ -0,0 +1 @@
+export const OnboardingExperimentV2ModalKey = 'nv_onboarding_modal';

apps/web/src/pages/auth/components/QuestionnaireForm.tsx

@@ -26,6 +26,7 @@ import { useVercelIntegration, useVercelParams } from '../../../hooks';
 import { ROUTES } from '../../../constants/routes.enum';
 import { DynamicCheckBox } from './dynamic-checkbox/DynamicCheckBox';
 import styled from '@emotion/styled/macro';
+import { OnboardingExperimentV2ModalKey } from '../../../constants/experimentsConstants';
 
 export function QuestionnaireForm() {
   const [loading, setLoading] = useState<boolean>();
@@ -66,7 +67,7 @@ export function QuestionnaireForm() {
     const createDto: ICreateOrganizationDto = { ...rest, name: organizationName };
     const organization = await createOrganizationMutation(createDto);
     const organizationResponseToken = await api.post(`/v1/auth/organizations/${organization._id}/switch`, {});
-
+    localStorage.setItem(OnboardingExperimentV2ModalKey, 'true');
     setToken(organizationResponseToken);
   }
 

apps/web/src/pages/quick-start/components/OnboardingExperimentModal.tsx

@@ -0,0 +1,125 @@
+import { useState } from 'react';
+import { Modal, useMantineTheme, Grid } from '@mantine/core';
+
+import styled from '@emotion/styled';
+import { colors, shadows, Title, Button } from '@novu/design-system';
+import { useAuthContext, useSegment } from '@novu/shared-web';
+import { useCreateOnboardingExperimentWorkflow } from '../../../api/hooks/notification-templates/useCreateOnboardingExperimentWorkflow';
+import { OnboardingExperimentV2ModalKey } from '../../../constants/experimentsConstants';
+import { OnBoardingAnalyticsEnum } from '../consts';
+
+export function OnboardingExperimentModal() {
+  const [opened, setOpened] = useState(true);
+  const theme = useMantineTheme();
+  const segment = useSegment();
+  const { currentOrganization } = useAuthContext();
+  const {
+    createOnboardingExperimentWorkflow,
+    isLoading: IsCreateOnboardingExpWorkflowLoading,
+    isDisabled: isIsCreateOnboardingExpWorkflowDisabled,
+  } = useCreateOnboardingExperimentWorkflow();
+  const handleOnClose = () => {
+    setOpened(true);
+  };
+
+  return (
+    <Modal
+      opened={opened}
+      overlayColor={theme.colorScheme === 'dark' ? colors.BGDark : colors.BGLight}
+      overlayOpacity={0.7}
+      styles={{
+        modal: {
+          backgroundColor: theme.colorScheme === 'dark' ? colors.B15 : colors.white,
+          width: '700px',
+        },
+        body: {
+          paddingTop: '5px',
+          paddingInline: '8px',
+        },
+      }}
+      title={<Title size={2}>What would you like to do first?</Title>}
+      sx={{ backdropFilter: 'blur(10px)' }}
+      shadow={theme.colorScheme === 'dark' ? shadows.dark : shadows.medium}
+      radius="md"
+      size="lg"
+      onClose={handleOnClose}
+      centered
+      withCloseButton={false}
+    >
+      <Grid>
+        <Grid.Col xs={12} md={6} mb={20}>
+          <ChannelCard>
+            <TitleRow>Send test notification</TitleRow>
+            <Description>Learn how to set up a workflow and send your first email notification.</Description>
+            <StyledButton
+              loading={IsCreateOnboardingExpWorkflowLoading}
+              disabled={isIsCreateOnboardingExpWorkflowDisabled}
+              pulse={true}
+              variant="gradient"
+              onClick={async () => {
+                segment.track(OnBoardingAnalyticsEnum.ONBOARDING_EXPERIMENT_TEST_NOTIFICATION, {
+                  action: 'Modal - Send test notification',
+                  experiment_id: '2024-w15-onb',
+                  _organization: currentOrganization?._id,
+                });
+                localStorage.removeItem(OnboardingExperimentV2ModalKey);
+                createOnboardingExperimentWorkflow();
+              }}
+            >
+              Send test notification now
+            </StyledButton>
+          </ChannelCard>
+        </Grid.Col>
+        <Grid.Col xs={12} md={6} mb={20}>
+          <ChannelCard>
+            <TitleRow> Look around</TitleRow>
+            <Description>Start exploring the Novu app on your own terms</Description>
+            <StyledButton
+              variant="outline"
+              onClick={async () => {
+                segment.track(OnBoardingAnalyticsEnum.ONBOARDING_EXPERIMENT_TEST_NOTIFICATION, {
+                  action: 'Modal - Get started',
+                  experiment_id: '2024-w15-onb',
+                  _organization: currentOrganization?._id,
+                });
+                localStorage.removeItem(OnboardingExperimentV2ModalKey);
+                setOpened(false);
+              }}
+            >
+              Get started
+            </StyledButton>
+          </ChannelCard>
+        </Grid.Col>
+      </Grid>
+    </Modal>
+  );
+}
+
+const ChannelCard = styled.div`
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  max-width: 230px;
+`;
+
+const TitleRow = styled.div`
+  display: flex;
+  align-items: center;
+  font-size: 20px;
+  line-height: 32px;
+  margin-bottom: 8px;
+`;
+
+const Description = styled.div`
+  flex: auto;
+  font-size: 16px;
+  line-height: 20px;
+  margin-bottom: 20px;
+  color: ${colors.B60};
+  height: 60px;
+`;
+
+const StyledButton = styled(Button)`
+  width: fit-content;
+  outline: none;
+`;

apps/web/src/pages/quick-start/steps/GetStarted.tsx

@@ -9,6 +9,9 @@ import { ChannelsConfiguration } from '../components/ChannelsConfiguration';
 import { GetStartedLayout } from '../components/layout/GetStartedLayout';
 import { NavButton } from '../components/NavButton';
 import { getStartedSteps, OnBoardingAnalyticsEnum } from '../consts';
+import { OnboardingExperimentModal } from '../components/OnboardingExperimentModal';
+import { useAuthContext } from '@novu/shared-web';
+import { OnboardingExperimentV2ModalKey } from '../../../constants/experimentsConstants';
 
 const ChannelsConfigurationHolder = styled.div`
   display: flex;
@@ -25,16 +28,25 @@ const ChannelsConfigurationHolder = styled.div`
 
 export function GetStarted() {
   const segment = useSegment();
+  const { currentOrganization } = useAuthContext();
   const [clickedChannel, setClickedChannel] = useState<{
     open: boolean;
     channelType?: ChannelTypeEnum;
   }>({ open: false });
 
+  const isOnboardingModalEnabled = localStorage.getItem(OnboardingExperimentV2ModalKey) === 'true';
+
   const onIntegrationModalClose = () => setClickedChannel({ open: false });
 
   useEffect(() => {
     segment.track(OnBoardingAnalyticsEnum.CONFIGURE_PROVIDER_VISIT);
-  }, [segment]);
+    if (isOnboardingModalEnabled) {
+      segment.track('Welcome modal open - [Onboarding]', {
+        experiment_id: '2024-w15-onb',
+        _organization: currentOrganization?._id,
+      });
+    }
+  }, [currentOrganization?._id, isOnboardingModalEnabled, segment]);
 
   function handleOnClick() {
     segment.track(OnBoardingAnalyticsEnum.CONFIGURE_PROVIDER_NAVIGATION_NEXT_PAGE_CLICK);
@@ -60,6 +72,7 @@ export function GetStarted() {
         />
         <ChannelsConfiguration setClickedChannel={setClickedChannel} />
       </ChannelsConfigurationHolder>
+      {isOnboardingModalEnabled && <OnboardingExperimentModal />}
     </GetStartedLayout>
   );
 }

apps/web/src/pages/templates/components/TriggerSnippetTabs.tsx

@@ -66,8 +66,7 @@ novu.trigger('${identifier}', ${JSON.stringify(
     2
   )
     .replace(/"([^"]+)":/g, '$1:')
-    .replace(/"/g, "'")
-    .replaceAll('\n', '\n  ')});
+    .replace(/"/g, "'")});
 `;
 
   return (
@@ -85,19 +84,19 @@ export const getCurlTriggerSnippet = (
   snippet?: Record<string, unknown>
 ) => {
   const curlSnippet = `curl --location --request POST '${API_ROOT}/v1/events/trigger' \\
-     --header 'Authorization: ApiKey <REPLACE_WITH_API_KEY>' \\
-     --header 'Content-Type: application/json' \\
-     --data-raw '${JSON.stringify(
-       {
-         name: identifier,
-         to,
-         payload,
-         overrides,
-         ...snippet,
-       },
-       null,
-       2
-     ).replaceAll('\n', '\n       ')}'
+--header 'Authorization: ApiKey <REPLACE_WITH_API_KEY>' \\
+--header 'Content-Type: application/json' \\
+--data-raw '${JSON.stringify(
+    {
+      name: identifier,
+      to,
+      payload,
+      overrides,
+      ...snippet,
+    },
+    null,
+    2
+  )}'
   `;
 
   return (

apps/web/src/pages/templates/workflow/WorkflowEditor.tsx

@@ -293,7 +293,7 @@ const WorkflowEditor = () => {
                       }}
                       data-test-id="get-snippet-btn"
                     >
-                      {tagsIncludesOnboarding ? 'Test Notification Now' : 'Get Snippet'}
+                      Trigger Notification
                     </Button>
                     <Link data-test-id="settings-page" to="settings">
                       <Settings />

package.json

@@ -16,7 +16,7 @@
     "generate:provider": "npx hygen provider new --version 0.24.1",
     "lint": "nx run-many --target=lint --all",
     "test": "cross-env CI=true lerna run test:watch --parallel",
-    "start:dev": "cross-env TZ=UTC lerna run start:dev --parallel --concurrency=20 --scope=@novu/{api,worker,web,widget,ws,notification-center}",
+    "start:dev": "cross-env TZ=UTC lerna run start:dev --stream --parallel --concurrency=20 --scope=@novu/{api,worker,web,widget,ws,notification-center}",
     "start:web": "cross-env nx run @novu/web:start",
     "start:ws": "cross-env nx run @novu/ws:start",
     "start:webhook": "cross-env nx run @novu/webhook:start",