Commit 6a1af16
committed
Merge origin/staging into improvement/platform
Resolve conflicts as unions preserving both sides:
- blocks/registry.ts: keep this branch's BlockMeta imports/registry and add
staging's new EnrichmentBlock and RB2BBlock.
- ee/access-control: take staging's ProviderRow (per-model denylist feature).
Make the merged catalog consistent with this branch's BlockMeta model:
- Add EnrichmentBlockMeta + RB2BBlockMeta (valid tags + >=7 catalog templates
each), register them, and drop the new blocks' config-level `tags`.
- Regenerate integrations.json + docs canonically: enrichment now has a catalog
entry and rb2b uses the singular integrationType (no stale plural).85 files changed
Lines changed: 22387 additions & 421 deletions
File tree
- apps
- docs
- components
- ui
- content/docs/en/tools
- sim
- app
- api
- guardrails/validate
- providers
- tools
- enrichment/run
- slack/channels
- workspace/[workspaceId]
- tables/[tableId]
- components/table-grid
- cells
- headers
- w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox
- blocks
- blocks
- components
- emcn/icons
- ee/access-control
- components
- utils
- enrichments
- hooks
- queries
- lib
- api/contracts
- tools
- auth
- copilot/chat
- core/config
- integrations
- logs/execution
- messaging/email
- oauth
- permission-groups
- table
- workflows/orchestration
- stores/table
- tools
- enrichment
- rb2b
- packages
- db
- migrations
- meta
- testing/src/mocks
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
4 | 20 | | |
5 | 21 | | |
6 | 22 | | |
| |||
1574 | 1590 | | |
1575 | 1591 | | |
1576 | 1592 | | |
| 1593 | + | |
| 1594 | + | |
| 1595 | + | |
| 1596 | + | |
| 1597 | + | |
| 1598 | + | |
| 1599 | + | |
| 1600 | + | |
| 1601 | + | |
| 1602 | + | |
| 1603 | + | |
| 1604 | + | |
| 1605 | + | |
| 1606 | + | |
| 1607 | + | |
| 1608 | + | |
| 1609 | + | |
| 1610 | + | |
| 1611 | + | |
| 1612 | + | |
| 1613 | + | |
| 1614 | + | |
| 1615 | + | |
| 1616 | + | |
| 1617 | + | |
| 1618 | + | |
| 1619 | + | |
| 1620 | + | |
| 1621 | + | |
| 1622 | + | |
| 1623 | + | |
| 1624 | + | |
| 1625 | + | |
| 1626 | + | |
| 1627 | + | |
| 1628 | + | |
| 1629 | + | |
| 1630 | + | |
| 1631 | + | |
| 1632 | + | |
| 1633 | + | |
| 1634 | + | |
1577 | 1635 | | |
1578 | 1636 | | |
1579 | 1637 | | |
| |||
4685 | 4743 | | |
4686 | 4744 | | |
4687 | 4745 | | |
4688 | | - | |
| 4746 | + | |
4689 | 4747 | | |
4690 | 4748 | | |
4691 | 4749 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| 54 | + | |
54 | 55 | | |
55 | 56 | | |
56 | 57 | | |
| |||
147 | 148 | | |
148 | 149 | | |
149 | 150 | | |
| 151 | + | |
150 | 152 | | |
151 | 153 | | |
152 | 154 | | |
| |||
252 | 254 | | |
253 | 255 | | |
254 | 256 | | |
| 257 | + | |
255 | 258 | | |
256 | 259 | | |
257 | 260 | | |
| |||
365 | 368 | | |
366 | 369 | | |
367 | 370 | | |
| 371 | + | |
368 | 372 | | |
369 | 373 | | |
370 | 374 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| 49 | + | |
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
| |||
138 | 139 | | |
139 | 140 | | |
140 | 141 | | |
| 142 | + | |
141 | 143 | | |
142 | 144 | | |
143 | 145 | | |
| |||
0 commit comments