Skip to content

Commit a939a86

Browse files
Merge branch 'main' into snapshot-docs-update
2 parents 408bec7 + 2911d05 commit a939a86

26 files changed

Lines changed: 1190 additions & 185 deletions

File tree

CHANGELOG.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,58 @@
1+
#### 2.29.0: Release
2+
3+
- docs: refactor the Quick Start page (#6982)
4+
- Bump cypress-io/github-action from 7.1.5 to 7.1.8 (#6940)
5+
- Bump actions/upload-artifact from 6.0.0 to 7.0.0 (#6939)
6+
- Bump actions/create-github-app-token from 2.2.1 to 3.0.0 (#6937)
7+
- Bump actions/cache from 5.0.3 to 5.0.4 (#6941)
8+
- Fix `hljs` code highlighting to preserve line breaks in Markdown rendering (#7058) @cstns
9+
- Enable/disable Expert Insights mode with feature flag and integrate conditional rendering in expert components (#7046) @cstns
10+
- Add timeout value to FE chat API request (#7057) @Steve-Mcl
11+
- feat: visual flow diff viewer for snapshot comparison (#7033) @andypalmi
12+
- Fix gitIntegration feature flag check to include all-feature override (#7050) @knolleary
13+
- [7047] FF Expert code blocks are not formatting correctly (#7049) @n-lark
14+
- ci: Disable shared cache on pre-staging environments (#7048) @ppawlowski
15+
- [7032] Immersive editor: open snapshot detail as modal rather than right drawer (#7037) @n-lark
16+
- Add Housekeeping task to check SSO certificate expiry (#7016) @hardillb
17+
- [7031] Immersive editor drawer: restore Developer Mode tab (#7035) @n-lark
18+
- Bump hono from 4.12.9 to 4.12.12 (#7040) @app/dependabot
19+
- docs: add descriptions to standard environment variables (#7041) @sumitshinde-84
20+
- Bump @hono/node-server from 1.19.11 to 1.19.13 (#7039) @app/dependabot
21+
- Include instance url env var (#7034) @hardillb
22+
- Bump vite from 6.4.1 to 6.4.2 (#7020) @app/dependabot
23+
- Guard against undefined template owner (#7028) @knolleary
24+
- Bump lodash from 4.17.23 to 4.18.1 (#7023) @app/dependabot
25+
- Add FF_INSTANCE_URL to hosted instance env vars (#7024) @hardillb
26+
- [6942] Pinia Task 13 - account-team (#6952) @n-lark
27+
- Bump defu from 6.1.4 to 6.1.6 (#7015) @app/dependabot
28+
- Show error if user roles are managed by SSO (#6994) @hardillb
29+
- [7001] Update embedded editor wrappers to reflect Node-RED tab title (#7007) @n-lark
30+
- Show device counts on user overview (#7013) @hardillb
31+
- Add default expert URLs (#6949) @hardillb
32+
- Render Blueprint descriptions as markdown (#6991) @hardillb
33+
- Bump @xmldom/xmldom from 0.8.10 to 0.8.12 (#7010) @app/dependabot
34+
- Bump dottie from 2.0.6 to 2.0.7 (#7006) @app/dependabot
35+
- Upgrade bcrypt to remove a tar dependency (#7005) @hardillb
36+
- [6829] Pinia Task 12 - account-auth (#6945) @n-lark
37+
- Bump sqlite3 to 6.0.1 to pick up tar fixes (#7003) @hardillb
38+
- Bump node-forge from 1.3.2 to 1.4.0 (#6990) @app/dependabot
39+
- Bump nodemailer from 7.0.12 to 8.0.4 (#6981) @app/dependabot
40+
- [6824] Pinia Task 7 - product-brokers (#6932) @n-lark
41+
- Bump path-to-regexp (#6989) @app/dependabot
42+
- Bump brace-expansion (#6988) @app/dependabot
43+
- Bump handlebars from 4.7.8 to 4.7.9 (#6980) @app/dependabot
44+
- [6823] Pinia Task 6 - product-tables (#6931) @n-lark
45+
- Force npm username lowercase (#6977) @hardillb
46+
- [6828] Pinia Task 11 - product-expert (#6886) @n-lark
47+
- Bump yaml (#6956) @app/dependabot
48+
- Bump picomatch (#6955) @app/dependabot
49+
- Bump fastify from 5.8.1 to 5.8.4 (#6954) @app/dependabot
50+
- Bump fast-xml-parser and @aws-sdk/xml-builder (#6933) @app/dependabot
51+
- [6947] User menu shows behind pinned expert drawer (#6948) @n-lark
52+
- [6827] Pinia Task 10 - product-expert-operator-agent (#6885) @n-lark
53+
- [6826] Pinia Task 9 - product-expert-ff-agent (#6882) @n-lark
54+
- [6825] Pinia Task 8 - product-assistant (#6881) @n-lark
55+
156
#### 2.28.1: Release
257

358
- Bump aws-actions/amazon-ecr-login from 2.0.1 to 2.0.2 (#6877)

ci/ci-values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,24 @@ forge:
22
domain: flowfuse.dev
33
https: true
44
localPostgresql: true
5+
localValkey: false
56
projectIngressClassName: traefik
67
broker:
78
enabled: true
89
teamBroker:
910
uiOnly: true
1011
cloudProvider: aws
12+
cache:
13+
type: memory
1114
email:
1215
ses:
1316
region: eu-west-1
1417
assistant:
1518
enabled: true
1619
expert:
1720
enabled: true
21+
insights:
22+
enabled: true
1823
resources:
1924
limits:
2025
cpu: 1000m

forge/ee/lib/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,8 @@ module.exports = fp(async function (app, opts) {
6262

6363
// Set the expert assistant Feature Flag
6464
app.config.features.register('expertAssistant', app.config?.expert?.enabled ?? false, true)
65+
66+
// temporary until FF Expert Insights can be enabled on Self Hosted EE instance
67+
const isInsightsEnabled = app.config?.expert?.enabled && app.config?.expert?.insights?.enabled
68+
app.config.features.register('expertInsights', isInsightsEnabled ?? false, false)
6569
}, { name: 'app.ee.lib' })

frontend/src/api/expert.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ const chat = async ({
2020
headers: {
2121
'X-Chat-Session-ID': sessionId,
2222
'X-Chat-Transaction-ID': transactionId
23-
}
23+
},
24+
timeout: 60000 // TODO: get from config expert.service.requestTimeout
2425
}).then(res => {
2526
// Validate transaction ID to prevent race conditions
2627
if (res.data.transactionId !== transactionId) {

0 commit comments

Comments
 (0)