Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(dashboard): integrations update and create flow #7281

Merged
merged 124 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from 110 commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
3c289cd
feat: wip
scopsy Dec 3, 2024
b016b5d
feat: wip
scopsy Dec 3, 2024
313cdad
Merge branch 'next' into feat-integrations-page
scopsy Dec 10, 2024
d36b41c
Update .source
scopsy Dec 10, 2024
3dbeaae
fix: styles
scopsy Dec 10, 2024
23b6e4a
Merge branch 'next' into feat-integrations-page
scopsy Dec 10, 2024
ce40aca
fix: refactor cards
scopsy Dec 10, 2024
75fffc6
fix: paths
scopsy Dec 10, 2024
1503299
fix: add items
scopsy Dec 10, 2024
07ce663
feat: refactored cards
scopsy Dec 10, 2024
824f36d
fix: buttons
scopsy Dec 10, 2024
362578f
fix: added fields
scopsy Dec 10, 2024
e78b513
fix: integration styling
scopsy Dec 10, 2024
9f61bbc
fix: scrolling
scopsy Dec 11, 2024
1aa3886
Merge branch 'next' into feat-integrations-page
scopsy Dec 11, 2024
fb5fcbc
fix: reusabe update sidebar
scopsy Dec 11, 2024
48f3173
fix: error
scopsy Dec 11, 2024
481822d
fix: remove unused
scopsy Dec 11, 2024
99b7eb8
fix: headears
scopsy Dec 11, 2024
5f69c65
fix: provider config
scopsy Dec 11, 2024
5dea17a
fix: order
scopsy Dec 11, 2024
606660b
fix: minor adjustments
scopsy Dec 11, 2024
f9c9989
fix: minor period
scopsy Dec 11, 2024
eb606bc
Merge branch 'next' into feat-integrations-page
scopsy Dec 11, 2024
7640653
Update integrations-list-page.tsx
scopsy Dec 11, 2024
6ccb7d2
fix: inbox connected state
scopsy Dec 11, 2024
b00f235
demo provider
scopsy Dec 11, 2024
a11a03a
Merge branch 'next' into feat-integrations-page
scopsy Dec 11, 2024
bd9f69e
Merge branch 'next' into feat-integrations-page
scopsy Dec 11, 2024
1e02633
fix: align wokrlfows list
scopsy Dec 11, 2024
241cfd7
fix: minor fixes
scopsy Dec 11, 2024
9b662be
fix: minor changes
scopsy Dec 11, 2024
ae1f6ed
fix: changes
scopsy Dec 11, 2024
704c32f
fix: renaming
scopsy Dec 11, 2024
844a547
fix: refactors
scopsy Dec 11, 2024
a76d20a
fix: items
scopsy Dec 11, 2024
d68a59b
fix: add base
scopsy Dec 11, 2024
3d2591c
fix: locaitons
scopsy Dec 11, 2024
95ecd6a
remove logos
scopsy Dec 11, 2024
31f7e58
Delete
scopsy Dec 11, 2024
bf4bf94
fix: revert
scopsy Dec 11, 2024
c49519f
Merge branch 'feat-integrations-page' of https://github.com/novuhq/no…
scopsy Dec 11, 2024
46dd4ac
Merge branch 'next' into feat-integrations-page
scopsy Dec 12, 2024
acc38fd
fix: minor fixes
scopsy Dec 12, 2024
0328579
fix: items
scopsy Dec 12, 2024
926915a
Merge branch 'next' into feat-integrations-page
scopsy Dec 15, 2024
086d8d5
Merge branch 'next' into feat-integrations-page
scopsy Dec 16, 2024
9a27ea1
feat: add segmented control
scopsy Dec 16, 2024
a109bfc
fix: env selection
scopsy Dec 16, 2024
ddb921c
fix: connect button
scopsy Dec 16, 2024
7951524
fix: navigation
scopsy Dec 16, 2024
025cc81
fix: primary check
scopsy Dec 16, 2024
a620d39
fix: feature flag
scopsy Dec 16, 2024
36d9bf8
fix: novu providers fetch
scopsy Dec 16, 2024
2175dba
fix: pr review
scopsy Dec 16, 2024
dccf725
fix: reload doc
scopsy Dec 16, 2024
3e60fe8
fix: integration step import
scopsy Dec 16, 2024
85f1d56
fix: integrations list page
scopsy Dec 16, 2024
425a095
refactor: remove pr
scopsy Dec 16, 2024
66c4cdf
Revert "fix: integrations list page"
scopsy Dec 16, 2024
1e445c7
Revert "refactor: remove pr"
scopsy Dec 16, 2024
9b7e1c2
fix: update src
scopsy Dec 16, 2024
6030684
fix: types
scopsy Dec 16, 2024
a026fd6
fix: types
scopsy Dec 16, 2024
4e41c9c
Merge branch 'feat-new-integrations-page-table' into feat-integration…
scopsy Dec 16, 2024
b842f4f
Revert "fix: types"
scopsy Dec 16, 2024
3b5f586
fix: imports
scopsy Dec 16, 2024
89d2ec4
fix: import
scopsy Dec 16, 2024
ee8bb1e
Merge branch 'next' into feat-new-integrations-page-table
scopsy Dec 16, 2024
b072e00
fix: revert file
scopsy Dec 16, 2024
788dba3
Merge branch 'feat-new-integrations-page-table' of https://github.com…
scopsy Dec 16, 2024
ad7b420
Merge branch 'feat-new-integrations-page-table' into feat-integration…
scopsy Dec 16, 2024
1a0eff0
fix: query keys
scopsy Dec 16, 2024
c7ca662
fix: types
scopsy Dec 16, 2024
c7315ca
fix: types
scopsy Dec 16, 2024
7fe2f01
fix: refactor
scopsy Dec 16, 2024
8843fce
fix: review
scopsy Dec 16, 2024
cfc4b78
fix: bug
scopsy Dec 16, 2024
b17543a
Merge branch 'next' into feat-new-integrations-page-table
scopsy Dec 16, 2024
97f9f29
Merge branch 'feat-new-integrations-page-table' into feat-integration…
scopsy Dec 16, 2024
baa0df3
Merge branch 'next' into feat-new-integrations-page-table
scopsy Dec 18, 2024
316efad
fix: pr comments
scopsy Dec 18, 2024
ca70188
Merge branch 'next' into feat-new-integrations-page-table
scopsy Dec 18, 2024
8fece59
Merge branch 'feat-new-integrations-page-table' into feat-integration…
scopsy Dec 18, 2024
1d0a181
fix: pr comments
scopsy Dec 18, 2024
01a9189
fix: pr comments
scopsy Dec 18, 2024
aede118
fix: primary modal
scopsy Dec 18, 2024
871a00e
fix: interim
scopsy Dec 18, 2024
a808a62
fix: refactor
scopsy Dec 18, 2024
1d862f8
fix: items
scopsy Dec 18, 2024
a94b5ee
fix: flow
scopsy Dec 18, 2024
4ecc577
fix: pr comments
scopsy Dec 18, 2024
2e272cb
fix: pr comments
scopsy Dec 18, 2024
4be39c4
fix: items
scopsy Dec 18, 2024
0c4079b
fix: secret
scopsy Dec 18, 2024
4465165
fix: pr comments
scopsy Dec 18, 2024
6bb7678
fix: header title
scopsy Dec 18, 2024
06ce8c4
fix: clicking on the inline toast
scopsy Dec 18, 2024
189d0b2
fix: show error
scopsy Dec 18, 2024
61cdacc
fix: connected passing
scopsy Dec 18, 2024
7349523
Merge branch 'feat-new-integrations-page-table' into feat-integration…
scopsy Dec 18, 2024
b67bd97
Merge branch 'next' into feat-new-integrations-page-table
scopsy Dec 18, 2024
79b68fb
fix: autocomplete
scopsy Dec 18, 2024
1b9281e
fix: imports
scopsy Dec 18, 2024
3300ec3
fix: paths
scopsy Dec 18, 2024
dedea45
fix: export
scopsy Dec 18, 2024
7030627
fix: current env
scopsy Dec 18, 2024
491d6c2
Merge branch 'feat-new-integrations-page-table' into feat-integration…
scopsy Dec 18, 2024
aae62cc
fix: rename
scopsy Dec 18, 2024
6e1980d
Merge branch 'feat-integrations-page' of https://github.com/novuhq/no…
scopsy Dec 18, 2024
8b4e997
Merge branch 'next' into feat-new-integrations-page-table
scopsy Dec 18, 2024
2604b05
Merge branch 'next' into feat-new-integrations-page-table
scopsy Dec 18, 2024
596ca8a
Merge branch 'next' into feat-new-integrations-page-table
scopsy Dec 20, 2024
7adc69b
fix: lock file
scopsy Dec 20, 2024
0f15abb
Delete pnpm-lock.yaml
scopsy Dec 20, 2024
b5c056e
fix: pnpm file
scopsy Dec 20, 2024
413ae89
bull mq pro
scopsy Dec 20, 2024
1f3c693
fix: pnpm
scopsy Dec 20, 2024
f59147c
fix:
scopsy Dec 20, 2024
fb494b4
Merge branch 'feat-new-integrations-page-table' into feat-integration…
scopsy Dec 20, 2024
91aa132
Merge branch 'next' into feat-integrations-page
scopsy Dec 20, 2024
cbbf0fb
fix:
scopsy Dec 20, 2024
31094fc
fix: add space validation
scopsy Dec 20, 2024
b97f518
fix: primaryselecion
scopsy Dec 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .source
2 changes: 0 additions & 2 deletions apps/api/src/app/integrations/integrations.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@ import {
Param,
Post,
Put,
UseGuards,
UseInterceptors,
} from '@nestjs/common';
import { ChannelTypeEnum, UserSessionData } from '@novu/shared';
import {
CalculateLimitNovuIntegration,
CalculateLimitNovuIntegrationCommand,
OtelSpan,
Roles,
} from '@novu/application-generic';
import { ApiExcludeEndpoint, ApiOperation, ApiTags } from '@nestjs/swagger';
import { UserSession } from '../shared/framework/user.decorator';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
import { BadRequestException, Injectable } from '@nestjs/common';
import { ChannelTypeEnum } from '@novu/shared';
import { CheckIntegrationEMail } from './check-integration-email.usecase';
import { CheckIntegrationCommand } from './check-integration.command';
Expand All @@ -21,7 +21,7 @@ export class CheckIntegration {
);
}

throw e;
throw new BadRequestException(e.message);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export class CreateIntegration {
if (command.identifier) {
const existingIntegrationWithIdentifier = await this.integrationRepository.findOne({
_organizationId: command.organizationId,
_environmentId: command.environmentId,
identifier: command.identifier,
});

Expand Down
1 change: 1 addition & 0 deletions apps/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"lodash.isequal": "^4.5.0",
"lodash.merge": "^4.6.2",
"lucide-react": "^0.439.0",
"merge-refs": "^1.3.0",
"mixpanel-browser": "^2.52.0",
"motion": "^11.12.0",
"next-themes": "^0.3.0",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions apps/dashboard/public/images/providers/light/square/apns.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions apps/dashboard/public/images/providers/light/square/azure-sms.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions apps/dashboard/public/images/providers/light/square/braze.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions apps/dashboard/public/images/providers/light/square/brevo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions apps/dashboard/public/images/providers/light/square/burst-sms.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading