Skip to content

Commit 3129911

Browse files
committed
Merge branch 'main' of github.com:dust-tt/dust into thib/secupage
2 parents a4e4227 + 0e4803a commit 3129911

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

connectors/src/lib/models/slack.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,6 @@ SlackChatBotMessage.init(
202202
updatedAt: {
203203
type: DataTypes.DATE,
204204
},
205-
// TODO(2025-01-15 BIGINT): This should be inferred from the relationship.
206-
connectorId: {
207-
type: DataTypes.INTEGER,
208-
209-
allowNull: false,
210-
},
211205
channelId: {
212206
type: DataTypes.STRING,
213207
allowNull: false,
@@ -271,7 +265,10 @@ SlackChatBotMessage.init(
271265
indexes: [{ fields: ["connectorId", "channelId", "threadTs"] }],
272266
}
273267
);
274-
ConnectorModel.hasOne(SlackChatBotMessage);
268+
ConnectorModel.hasOne(SlackChatBotMessage, {
269+
foreignKey: "connectorId",
270+
onDelete: "RESTRICT",
271+
});
275272

276273
export class SlackBotWhitelistModel extends BaseModel<SlackBotWhitelistModel> {
277274
declare createdAt: CreationOptional<Date>;

front/components/assistant/AssistantsTable.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ const getTableColumns = () => {
160160
},
161161
},
162162
{
163-
header: "Feedbacks",
164-
accessorKey: "feedbacks",
163+
header: "Feedback",
164+
accessorKey: "feedback",
165165
cell: (info: CellContext<RowData, { up: number; down: number }>) => {
166166
if (info.row.original.scope === "global") {
167167
return "-";

front/components/home/LandingLayout.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ export default function LandingLayout({
105105
variant="outline"
106106
size="sm"
107107
label="Request a demo"
108-
target="_blank"
109108
/>
110109
<Button
111110
variant="highlight"

front/components/home/content/Solutions/configs/supportConfig.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export const Stories: CustomerStory[] = [
193193
title: "Pennylane's journey to deploy Dust for Customer Care teams",
194194
content:
195195
"Dust evolved from a simple support tool into an integral part of Pennylane's operations.",
196-
href: "https://blog.dust.tt/pennylane-dust-customer-support-journey/",
196+
href: "https://blog.dust.tt/pennylane-customer-support-journey/",
197197
src: "https://blog.dust.tt/content/images/size/w2000/2024/12/pennylane_dust_customer_story.png",
198198
},
199199
{

front/next.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ const path = require("path");
22

33
const CONTENT_SECURITY_POLICIES = [
44
"default-src 'none';",
5-
`script-src 'self' 'unsafe-inline' 'unsafe-eval' *.googletagmanager.com *.google-analytics.com *.hsforms.net;`,
5+
`script-src 'self' 'unsafe-inline' 'unsafe-eval' *.googletagmanager.com *.google-analytics.com *.hsforms.net *.hs-scripts.com *.hs-analytics.net *.hubspot.com *.hs-banner.com *.hscollectedforms.net;;`,
66
`style-src 'self' 'unsafe-inline' *.typekit.net;`,
77
`img-src 'self' data: https:;`,
8-
`connect-src 'self' blob: *.google-analytics.com cdn.jsdelivr.net *.hsforms.com;`,
8+
`connect-src 'self' blob: *.google-analytics.com cdn.jsdelivr.net *.hsforms.com *.hscollectedforms.net forms-eu1.hscollectedforms.net;`,
99
`frame-src 'self' *.wistia.net viz.dust.tt *.hsforms.net;`,
1010
`font-src 'self' data: *.typekit.net;`,
1111
`object-src 'none';`,

front/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

front/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"dependencies": {
2121
"@auth0/nextjs-auth0": "^3.5.0",
2222
"@dust-tt/client": "file:../sdks/js",
23-
"@dust-tt/sparkle": "0.2.368",
23+
"@dust-tt/sparkle": "^0.2.369",
2424
"@dust-tt/types": "file:../types",
2525
"@headlessui/react": "^1.7.7",
2626
"@heroicons/react": "^2.0.11",

front/pages/api/v1/w/[wId]/spaces/[spaceId]/data_sources/[dsId]/tables/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ async function handler(
399399
},
400400
});
401401
}
402-
if (parents[0] !== maybeTableId) {
402+
if (parents[0] !== tableId) {
403403
return apiError(req, res, {
404404
status_code: 400,
405405
api_error: {

sparkle/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sparkle/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@dust-tt/sparkle",
3-
"version": "0.2.368",
3+
"version": "0.2.369",
44
"scripts": {
55
"build": "rm -rf dist && npm run tailwind && npm run build:esm && npm run build:cjs",
66
"tailwind": "tailwindcss -i ./src/styles/tailwind.css -o dist/sparkle.css",

sparkle/src/components/Citation.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,14 @@ const Citation = React.forwardRef<HTMLDivElement, CitationProps>(
3636
);
3737
}, [children]);
3838

39+
// IMPORTANT: The order of elements is crucial for event handling.
40+
// The CitationDescription must always come after other elements to ensure
41+
// proper event propagation (especially for the close button's click events).
42+
// If auto-inserting a description, it must be appended after children.
3943
const contentWithDescription = (
4044
<>
41-
{!hasDescription && <CitationDescription>&nbsp;</CitationDescription>}
4245
{children}
46+
{!hasDescription && <CitationDescription>&nbsp;</CitationDescription>}
4347
</>
4448
);
4549
const cardButton = (

0 commit comments

Comments
 (0)