Read more about how to add a [notification center Inbox](https://docs.novu.co/inbox/react/get-started?utm_campaign=github-readme) to your app.
+
## Providers
@@ -217,6 +219,7 @@ We are more than happy to help you. If you are getting any errors or facing prob
Novu is a commercial open source company, which means some parts of this open source repository require a commercial license. The concept is called "Open Core," where the core technology is fully open source, licensed under MIT license, and the enterprise code is covered under a commercial license ("/enterprise" Enterprise Edition). Enterprise features are built by the core engineering team of Novu which is hired in full-time.
The following modules and folders are licensed under the enterprise license:
+
- `enterprise` folder at the root of the project and all of their subfolders and modules
- `apps/web/src/ee` folder and all of their subfolders and modules
- `apps/dashboard/src/ee` folder and all of their subfolders and modules
diff --git a/SECURITY.md b/SECURITY.md
index 9b94c6ade88..4f7605572fb 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -46,7 +46,7 @@ If you come across a vulnerability, please inform us promptly so we can promptly
6. Please share enough details for us to understand and fix the issue as fast as we can. Typically, providing the IP address or the URL of the affected system along with a description of the problem should be enough, though more intricate issues might need additional clarification.
-## What *We* Promise
+## What _We_ Promise
1. We'll get back to you within 3 business days with our assessment of the report and an estimated date when we expect to resolve it.
diff --git a/apps/api/.spectral.yaml b/apps/api/.spectral.yaml
index 31d5ceb4c92..482288d25ed 100644
--- a/apps/api/.spectral.yaml
+++ b/apps/api/.spectral.yaml
@@ -14,9 +14,9 @@ extends: [[spectral:oas, all]]
# https://meta.stoplight.io/docs/spectral/293426e270fac-overrides
overrides:
- files:
- - "**#/paths/~1v1~1subscribers~1%7BsubscriberId%7D~1preferences~1%7BtemplateId%7D"
- - "**#/paths/~1v1~1subscribers~1%7BsubscriberId%7D~1preferences~1%7Blevel%7D"
- - "**#/paths/~1v1~1workflows~1%7BworkflowIdOrIdentifier%7D"
- - "**#/paths/~1v1~1notification-templates~1%7BworkflowIdOrIdentifier%7D"
+ - '**#/paths/~1v1~1subscribers~1%7BsubscriberId%7D~1preferences~1%7BtemplateId%7D'
+ - '**#/paths/~1v1~1subscribers~1%7BsubscriberId%7D~1preferences~1%7Blevel%7D'
+ - '**#/paths/~1v1~1workflows~1%7BworkflowIdOrIdentifier%7D'
+ - '**#/paths/~1v1~1notification-templates~1%7BworkflowIdOrIdentifier%7D'
rules:
- path-params: "off"
+ path-params: 'off'
diff --git a/apps/api/README.md b/apps/api/README.md
index 477c6f02fd3..bee04293f68 100644
--- a/apps/api/README.md
+++ b/apps/api/README.md
@@ -11,7 +11,6 @@
A RESTful API for accessing the Novu platform, built using [NestJS](https://nestjs.com/).
-
## Running the API
See the docs for [Run in Local Machine](https://docs.novu.co/community/run-in-local-machine?utm_campaign=github-api-readme) to get setup. Then run:
@@ -24,30 +23,37 @@ $ npm run start:api
## Test
### Unit Tests
+
```bash
# unit tests
$ npm run test
```
### E2E tests
+
See the docs for [Running on Local Machine - API Tests](https://docs.novu.co/community/run-in-local-machine#api?utm_campaign=github-api-readme).
## Adding a new Endpoint
+
### Choose the right controller / new controller.
+
- If the endpoint is related to an existing entity, add the endpoint to the existing controller.
+
### Add the correct decorators to the controller method.
+
- Use the `@Get`, `@Post`, `@Put`, `@Delete` decorators to define the HTTP method.
- Use the `@Param`, `@Query`, `@Body` decorators to define the parameters.
- Use the `@UserAuthentication()` decorator to define the guards as well as make it accessible to novu web app.
- Use the @ExternalApiAccessible decorator to define the endpoint as accessible by external API (Users with Api-Key) & The official Novu SDK.
-#### Naming conventions
- - for the controller methods should be in the format `getEntityName`, `createEntityName`, `updateEntityName`, `deleteEntityName`.
- - In Case of a getAll / List use the `list` prefix for the method name and don't forget to add pagination functionality.
- - Use the `@SdkUsePagination` decorator to alert the sdk of a paginated endpoint (will improve DX with an async iterator) the pagination parameters.
- - In case of a uniuqe usecase outside of the basic REST operations, attempt to use the regular naming conventions just for a sub-resource.
- - `@SdkGroupName` - Use this decorator to group the endpoints in the SDK, use `.` separator to create a subresource (Ex' 'Subscribers.Notifications' getSubscriberNotifications), the original resource is defined as an openApi Tag .
- - `@SdkMethodName` in case of a unique operation, use this decorator to define the method name in the SDK.
+#### Naming conventions
+
+- for the controller methods should be in the format `getEntityName`, `createEntityName`, `updateEntityName`, `deleteEntityName`.
+- In Case of a getAll / List use the `list` prefix for the method name and don't forget to add pagination functionality.
+ - Use the `@SdkUsePagination` decorator to alert the sdk of a paginated endpoint (will improve DX with an async iterator) the pagination parameters.
+- In case of a uniuqe usecase outside of the basic REST operations, attempt to use the regular naming conventions just for a sub-resource.
+ - `@SdkGroupName` - Use this decorator to group the endpoints in the SDK, use `.` separator to create a subresource (Ex' 'Subscribers.Notifications' getSubscriberNotifications), the original resource is defined as an openApi Tag .
+ - `@SdkMethodName` in case of a unique operation, use this decorator to define the method name in the SDK.
## OpenAPI (formerly Swagger)
@@ -63,8 +69,8 @@ $ npm run lint:openapi
The command will return warnings and errors that must be fixed before the Github action will pass. These fixes are created by making changes through the `@nestjs/swagger` decorators.
-
## Migrations
+
Database migrations are included for features that have a hard dependency on specific data being available on database entities. These migrations are run by both Novu Cloud and Novu Self-Hosted users to support new feature releases.
### How to Run
diff --git a/apps/api/jarvis-api-intro.md b/apps/api/jarvis-api-intro.md
index f5ef84776ef..5ec0272cb3b 100644
--- a/apps/api/jarvis-api-intro.md
+++ b/apps/api/jarvis-api-intro.md
@@ -1,6 +1,6 @@
Hi, I'm Jarvis đ¤
-I'm a bot built to help you with your contribution to Novu.
+I'm a bot built to help you with your contribution to Novu.
I will add instructions and guides on how to run the subset of the Novu platform associated to this issue and make your first contribution.
This issue was tagged as related to `@novu/api` and the related code is located at the `apps/api` folder, here is how I can help you:
@@ -8,19 +8,23 @@ This issue was tagged as related to `@novu/api` and the related code is located
First time contributing to Novu?
- If that's the first time you want to contribute to Novu here are a few simple steps to get you started: - 1. Fork the repository and clone your fork to your local machine. - 2. Install the dependencies using `npm run setup:project`. - 3. Create a new branch with the number of the issue, for example: `1454-fix-something-cool` and start contributing based on the [Contributing Guide](https://docs.novu.co/community/run-in-local-machine?utm_campaign=github-jarvis) or the short guide in the section below. - 4. Create a Pull request and follow the template of creation +If that's the first time you want to contribute to Novu here are a few simple steps to get you started: + +1. Fork the repository and clone your fork to your local machine. +2. Install the dependencies using `npm run setup:project`. +3. Create a new branch with the number of the issue, for example: `1454-fix-something-cool` and start contributing based on the [Contributing Guide](https://docs.novu.co/community/run-in-local-machine?utm_campaign=github-jarvis) or the short guide in the section below. +4. Create a Pull request and follow the template of creationRun and test `@novu/api` locally
- ### Run API in watch mode - The easiest way to start the API is to run `npm run start:api` from the root of the repository +### Run API in watch mode + +The easiest way to start the API is to run `npm run start:api` from the root of the repository + +### Run API integration tests + +To validate your changes or simply to run the e2e tests run `npm run start:e2e:api`. All the e2e tests have the `.e2e.ts` suffix and usually are located near the controller files of each module. - ### Run API integration tests - To validate your changes or simply to run the e2e tests run `npm run start:e2e:api`. All the e2e tests have the `.e2e.ts` suffix and usually are located near the controller files of each module.
-
-
-
-
-
+
+
+
+ {error ?
- {error ?
-
- );
-});
diff --git a/apps/dashboard/src/components/workflow-editor/action-picker.tsx b/apps/dashboard/src/components/workflow-editor/action-picker.tsx
deleted file mode 100644
index 6a41c7c397c..00000000000
--- a/apps/dashboard/src/components/workflow-editor/action-picker.tsx
+++ /dev/null
@@ -1,247 +0,0 @@
-import { ComponentProps } from 'react';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { RiEdit2Line, RiExpandUpDownLine, RiForbid2Line } from 'react-icons/ri';
-import { z } from 'zod';
-import { liquid } from '@codemirror/lang-liquid';
-import { EditorView } from '@uiw/react-codemirror';
-import { RedirectTargetEnum } from '@novu/shared';
-import { Button, buttonVariants } from '@/components/primitives/button';
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from '@/components/primitives/dropdown-menu';
-import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/primitives/form/form';
-import { InputField } from '@/components/primitives/input';
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/primitives/popover';
-import { Separator } from '@/components/primitives/separator';
-import { URLInput } from '@/components/primitives/url-input';
-import { cn } from '@/utils/ui';
-import { urlTargetTypes } from '@/utils/url';
-import { Editor } from '../primitives/editor';
-
-type Action = {
- label: string;
- redirect: {
- url: string;
- type: string;
- };
-};
-
-type Actions = {
- primaryAction?: Action;
- secondaryAction?: Action;
-};
-
-type ActionPickerProps = {
- className?: string;
- value: Actions | undefined;
- onChange: (value: Actions) => void;
-};
-
-export const ActionPicker = (props: ActionPickerProps) => {
- const { className, value, onChange } = props;
- const primaryAction = value?.primaryAction;
- const secondaryAction = value?.secondaryAction;
-
- return (
-
-
- {asEditor ? (
- onChange({ ...value, url: val })}
- height={size === 'md' ? '38px' : '30px'}
- extensions={[
- liquid({
- variables: [{ type: 'variable', label: 'asdf' }],
- }),
- EditorView.lineWrapping,
- ]}
- />
- ) : (
- onChange({ ...value, url: e.target.value })}
- {...rest}
- />
- )}
-
-
-
-
-
-
-
-
-
- {
- onChange({});
- }}
- >
-
- {
- onChange({
- primaryAction: value?.primaryAction || {
- label: 'Primary action',
- redirect: { type: '_self', url: '' },
- },
- secondaryAction: undefined,
- });
- }}
- >
-
- {
- onChange({
- primaryAction: value?.primaryAction || {
- label: 'Primary action',
- redirect: { type: '_self', url: '' },
- },
- secondaryAction: value?.secondaryAction || {
- label: 'Secondary action',
- redirect: { type: '_self', url: '' },
- },
- });
- }}
- >
-
-
-
-
- );
-};
-
-const formSchema = z.object({
- label: z.string(),
- redirect: z.object({
- url: z.string(),
- type: z.union([
- z.literal(RedirectTargetEnum.BLANK),
- z.literal(RedirectTargetEnum.PARENT),
- z.literal(RedirectTargetEnum.SELF),
- z.literal(RedirectTargetEnum.TOP),
- z.literal(RedirectTargetEnum.UNFENCED_TOP),
- ]),
- }),
-});
-
-const ConfigureActionPopover = (
- props: ComponentProps
- {!primaryAction && !secondaryAction && (
- {
- onChange({ primaryAction, secondaryAction });
- }}
- >
-
-
- )}
- {secondaryAction && (
- {
- onChange({ primaryAction, secondaryAction });
- }}
- >
-
-
- )}
-
-
-
- )}
- {primaryAction && (
-
-
-
- Primary action
-
-
- Primary action
-
-
- Secondary action
-
-
-
-
-
-
-
-
-
-
- {}}
- className="mt-3"
- />
-
-
-
-
-
-
-
-
-
- console.log(val)}
- placeholder="Redirect URL"
- size="md"
- asEditor
- />
-
-
+
+
+
+
+
+ {
+ setValue(primaryActionKey, undefined, { shouldDirty: true, shouldValidate: false });
+ setValue(secondaryActionKey, undefined, { shouldDirty: true, shouldValidate: false });
+ }}
+ >
+
+ {
+ setValue(
+ primaryActionKey,
+ {
+ label: 'Primary action',
+ redirect: { target: '_self', url: '' },
+ },
+ { shouldDirty: true, shouldValidate: false }
+ );
+ setValue(secondaryActionKey, undefined, { shouldDirty: true, shouldValidate: false });
+ }}
+ >
+
+ {
+ setValue(
+ primaryActionKey,
+ {
+ label: 'Primary action',
+ redirect: { target: '_self', url: '' },
+ },
+ { shouldDirty: true, shouldValidate: false }
+ );
+ setValue(
+ secondaryActionKey,
+ {
+ label: 'Secondary action',
+ redirect: { target: '_self', url: '' },
+ },
+ { shouldDirty: true, shouldValidate: false }
+ );
+ }}
+ >
+
+
+
+
+
+ {!primaryAction && !secondaryAction && (
+
+
+
+ )}
+ {secondaryAction && (
+
+
+
+ )}
+
+
+
+ )}
+ {primaryAction && (
+
+
+
+ Primary action
+
+
+ Primary action
+
+
+ Secondary action
+
+
+ (
+
+
+
+
+
+
+ )}
+ />
+
+
+
+
+ Button text
+
+
+ Redirect URL
+
+
+
+ );
+};
diff --git a/apps/dashboard/src/components/workflow-editor/steps/in-app/in-app-redirect.tsx b/apps/dashboard/src/components/workflow-editor/steps/in-app/in-app-redirect.tsx
new file mode 100644
index 00000000000..1dddbd7f4fc
--- /dev/null
+++ b/apps/dashboard/src/components/workflow-editor/steps/in-app/in-app-redirect.tsx
@@ -0,0 +1,21 @@
+import { FormLabel } from '@/components/primitives/form/form';
+import { URLInput } from '../../url-input';
+import { urlTargetTypes } from '@/utils/url';
+
+export const InAppRedirect = () => {
+ return (
+
+
+
+ {(avatar || subject) && (
+
+ {redirect &&
+ getComponentByType({
+ component: redirect.component,
+ })}
+
+ {avatar && getComponentByType({ component: avatar.component })}
+ {subject && getComponentByType({ component: subject.component })}
+
+ )}
+ {body && getComponentByType({ component: body.component })}
+ {(primaryAction || secondaryAction) &&
+ getComponentByType({
+ component: primaryAction.component || secondaryAction.component,
+ })}
+
+ Redirect URL
+
+ );
+};
diff --git a/apps/dashboard/src/components/workflow-editor/steps/in-app/in-app-subject.tsx b/apps/dashboard/src/components/workflow-editor/steps/in-app/in-app-subject.tsx
new file mode 100644
index 00000000000..0daf67acd71
--- /dev/null
+++ b/apps/dashboard/src/components/workflow-editor/steps/in-app/in-app-subject.tsx
@@ -0,0 +1,46 @@
+import { useFormContext } from 'react-hook-form';
+import { liquid } from '@codemirror/lang-liquid';
+import { EditorView } from '@uiw/react-codemirror';
+
+import { FormControl, FormField, FormItem, FormMessage } from '@/components/primitives/form/form';
+import { InputField } from '@/components/primitives/input';
+import { Editor } from '@/components/primitives/editor';
+import { capitalize } from '@/utils/string';
+
+const subjectKey = 'subject';
+
+export const InAppSubject = () => {
+ const {
+ control,
+ formState: { errors },
+ } = useFormContext();
+
+ return (
+ EMAIL Editor
,
[StepTypeEnum.CHAT]: () => CHAT Editor
,
- [StepTypeEnum.IN_APP]: ConfigureInAppStepTemplateTabs,
+ [StepTypeEnum.IN_APP]: InAppTabs,
[StepTypeEnum.SMS]: () => SMS Editor
,
[StepTypeEnum.PUSH]: () => PUSH Editor
,
[StepTypeEnum.DIGEST]: () => DIGEST Editor
,
@@ -13,7 +16,15 @@ const STEP_TYPE_TO_EDITOR: RecordCUSTOM Editor
,
};
-export const StepEditor = ({ stepType }: { stepType: StepTypeEnum }) => {
+export const StepEditor = ({
+ workflow,
+ step,
+ stepType,
+}: {
+ workflow: WorkflowResponseDto;
+ step: StepDataDto;
+ stepType: StepTypeEnum;
+}) => {
const Editor = STEP_TYPE_TO_EDITOR[stepType];
- return
+
+ {withHint && 'This support variables and relative URLs i.e /tasks/{{taskId}}'}
+
+
+ );
+};
diff --git a/apps/dashboard/src/components/workflow-editor/workflow-editor-provider.tsx b/apps/dashboard/src/components/workflow-editor/workflow-editor-provider.tsx
index 718a4353c8b..9540d1fcdb8 100644
--- a/apps/dashboard/src/components/workflow-editor/workflow-editor-provider.tsx
+++ b/apps/dashboard/src/components/workflow-editor/workflow-editor-provider.tsx
@@ -47,7 +47,7 @@ const STEP_NAME_BY_TYPE: Record
+
+
+
+ (
+
+
+ {asEditor ? (
+
+
+ )}
+ />
+ (
+
+
+
+
+
+ )}
+ />
+
+
+ Configure
-
+
Presets for popular tools
Easy setup for TypeScript, SCSS and more.
-
+
Build configuration
How to customize webpack and Babel
-
+
Styling
@@ -208,6 +196,5 @@ We recommend building UIs with a [**component-driven**](https://componentdriven.
- TipEdit the Markdown in{' '}
-
diff --git a/apps/web/src/studio/components/GetStartedPageV2/index.tsx b/apps/web/src/studio/components/GetStartedPageV2/index.tsx
index 714267accb0..e55d5d99c45 100644
--- a/apps/web/src/studio/components/GetStartedPageV2/index.tsx
+++ b/apps/web/src/studio/components/GetStartedPageV2/index.tsx
@@ -174,7 +174,7 @@ export const GetStartedPageV2 = ({ location }: { location: 'onboarding' | 'get-s
border: 'none !important',
padding: '1px',
borderRadius: '100',
- boxShadow: 'dark !important',
+ boxShadow: '!important dark',
})}
onDoubleClick={() => {
track('Command copied - [Get Started - V2]');
diff --git a/apps/widget/README.md b/apps/widget/README.md
index 9516c111986..c60613a517f 100644
--- a/apps/widget/README.md
+++ b/apps/widget/README.md
@@ -1,9 +1,9 @@
# Widget
-
## How to run e2e test in local?
Run `npm run start:test` script in the following apps on separate terminals:
+
1. apps/api
2. apps/ws
3. apps/widget
diff --git a/apps/widget/config-overrides.js b/apps/widget/config-overrides.js
index 404a228034a..1db88e6c840 100644
--- a/apps/widget/config-overrides.js
+++ b/apps/widget/config-overrides.js
@@ -2,8 +2,8 @@ const { useBabelRc, override } = require('customize-cra');
// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
function overrideConfig(config, env) {
- const plugins = [...config.plugins, /* new BundleAnalyzerPlugin() */];
-
+ const plugins = [...config.plugins /* new BundleAnalyzerPlugin() */];
+
return { ...config, plugins };
}
diff --git a/apps/widget/cypress/test-shell/example/test.html b/apps/widget/cypress/test-shell/example/test.html
index 8b92cf1b1dc..c49c361a16d 100644
--- a/apps/widget/cypress/test-shell/example/test.html
+++ b/apps/widget/cypress/test-shell/example/test.html
@@ -1,10 +1,10 @@
-
-
-
-
- src/stories/Introduction.stories.mdx
+ TipEdit the Markdown in src/stories/Introduction.stories.mdx
-