opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-12 07:37:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,349 Commits 495 Branches 170 Tags 710 MiB
pre-align-hitl-frontend
Commit Graph

95 Commits

Author SHA1 Message Date
yyh
30b9295156
Merge remote-tracking branch 'origin/build/feat/hitl' into wip/hitl-merge-web-conflicts-20260206-175434 
# Conflicts:
#	api/.env.example
#	api/core/app/apps/advanced_chat/app_generator.py
#	api/core/app/apps/advanced_chat/app_runner.py
#	api/core/app/apps/advanced_chat/generate_task_pipeline.py
#	api/core/app/apps/workflow/app_generator.py
#	api/core/app/apps/workflow/app_runner.py
#	api/core/app/entities/queue_entities.py
#	api/core/workflow/node_events/__init__.py
#	api/core/workflow/runtime/graph_runtime_state.py
#	api/fields/message_fields.py
#	api/services/workflow_service.py
#	web/app/components/app/app-publisher/index.tsx
#	web/app/components/base/chat/chat/answer/index.tsx
#	web/app/components/base/chat/chat/hooks.ts
#	web/app/components/base/chat/chat/type.ts
#	web/app/components/base/prompt-editor/index.tsx
#	web/app/components/rag-pipeline/hooks/use-available-nodes-meta-data.ts
#	web/app/components/share/text-generation/result/header.tsx
#	web/app/components/workflow-app/components/workflow-header/features-trigger.tsx
#	web/app/components/workflow-app/hooks/use-workflow-run.ts
#	web/app/components/workflow/hooks/use-checklist.ts
#	web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
#	web/app/components/workflow/hooks/use-workflow.ts
#	web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
#	web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
#	web/app/components/workflow/nodes/_base/node.tsx
#	web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/components/placeholder.tsx
#	web/app/components/workflow/panel/debug-and-preview/hooks.ts
#	web/app/components/workflow/panel/workflow-preview.tsx
#	web/app/components/workflow/store/workflow/workflow-slice.ts
#	web/eslint-suppressions.json
#	web/i18n/en-US/common.json
#	web/i18n/zh-Hans/common.json
#	web/i18n/zh-Hant/common.json
#	web/service/workflow.ts
 2026-02-06 19:13:51 +08:00
yyh
871ec3b0ca
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox 
# Conflicts:
#	api/controllers/console/app/app.py
#	web/eslint-suppressions.json
#	web/eslint.config.mjs
 2026-02-06 14:40:44 +08:00
yyh
f1c15e0a17
Revert "refactor!: migrate commonLayout to SSR prefetch with TanStack Query hydration" 
This reverts commit 2833965815.
 2026-02-01 19:06:45 +08:00
yyh
2833965815
refactor!: migrate commonLayout to SSR prefetch with TanStack Query hydration 
BREAKING CHANGE: commonLayout is now an async Server Component that
prefetches user-profile and current-workspace on the server via
TanStack Query's prefetchQuery + HydrationBoundary pattern. This
replaces the previous purely client-side data fetching approach.

Key changes:

- **SSR data prefetch (root layout)**: prefetch systemFeatures and
  setupStatus in the root layout server component, wrap children with
  HydrationBoundary to hydrate TanStack Query cache on the client.

- **SSR data prefetch (commonLayout)**: convert commonLayout from a
  client component to an async server component that prefetches
  user-profile (with x-version/x-env response headers) and
  current-workspace. Client-side providers/UI extracted to a new
  layout-client.tsx component.

- **Add loading.tsx (Next.js convention)**: add a Next.js loading.tsx
  file in commonLayout that shows a centered spinner. This replaces the
  deleted Splash component but works via Next.js built-in Suspense
  boundary for route segments, not a client-side overlay.

- **Extract shared SSR fetch utilities (utils/ssr-fetch.ts)**: create
  serverFetch (unauthenticated) and serverFetchWithAuth (with cookie
  forwarding + CSRF token). getAuthHeaders is wrapped with React.cache()
  for per-request deduplication across multiple SSR fetches.

- **Refactor AppInitializer**: split single monolithic async IIFE effect
  into three independent useEffects (oauth tracking, education verify,
  setup status check). Use useReducer for init flag, useRef to prevent
  duplicate tracking in StrictMode. Now reads setupStatus from TanStack
  Query cache (useSetupStatusQuery) instead of fetching independently.

- **Refactor global-public-context**: move Zustand store sync from
  queryFn side-effect to a dedicated useEffect, keeping queryFn pure.
  fetchSystemFeatures now simply returns the API response.

- **Fix usePSInfo SSR crash**: defer globalThis.location access from
  hook top-level to callback execution time via getDomain() helper,
  preventing "Cannot read properties of undefined" during server render.

- **Remove Splash component**: delete the client-side loading overlay
  that relied on useIsLogin polling, replaced by Next.js loading.tsx.

- **Remove staleTime/gcTime overrides in useUserProfile**: allow the
  SSR-prefetched data to be reused via default cache policy instead of
  forcing refetch on every mount.

- **Revert middleware auth guard**: remove the cookie-based session
  check in proxy.ts that caused false redirects to /signin for
  authenticated users (Dify's auth uses token refresh, not simple
  cookie presence).
 2026-02-01 18:29:41 +08:00
QuantumGhost
8ca020e179 Revert "revert: revert human input relevant code (#31766)" 
This reverts commit 90fe9abab7.
 2026-02-01 16:21:14 +08:00
QuantumGhost
90fe9abab7
revert: revert human input relevant code (#31766) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-01-30 19:18:49 +08:00
Wu Tianwei
fedd097f63
feat: Human Input node (Frontend Part) (#31631) 
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: yessenia <yessenia.contact@gmail.com>
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
 2026-01-30 10:16:46 +08:00
Joel
2973968cc6 feat: handle upgrade confirm and icon 2026-01-29 15:00:04 +08:00
Coding On Star
8f414af34e
test: add comprehensive tests (#31649) 
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
 2026-01-29 11:16:26 +08:00
Coding On Star
76a0249eaf
feat: enhance ProgressBar and UsageInfo for storage mode (#31273) 
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
 2026-01-21 14:04:33 +08:00
yyh
3bee2ee067
refactor(contract): restructure console contracts with nested billing module (#30999) 2026-01-15 10:41:18 +08:00
Stephen Zhou
91da784f84
refactor: init orpc contract (#30885) 
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
 2026-01-13 23:38:28 +09:00
Coding On Star
cd1af04dee
feat: model total credits (#30727) 
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
 2026-01-08 14:11:44 +08:00
Coding On Star
c29cfd18f3
feat: revert model total credits (#30518) 2026-01-04 18:29:19 +08:00
Coding On Star
84cbf0526d
feat: model total credits (#26942) 
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
 2026-01-04 15:26:37 +08:00
Stephen Zhou
2bb1e24fb4
test: unify i18next mocks into centralized helpers (#30376) 
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
 2025-12-31 16:53:33 +09:00
Stephen Zhou
1873b5a766
chore: remove useless __esModule (#30366) 2025-12-30 15:37:16 +08:00
Stephen Zhou
6d0e36479b
refactor(i18n): use JSON with flattened key and namespace (#30114) 
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-12-29 14:52:32 +08:00
Joel
5549ab66ff
chore: some test (#30144) 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-12-25 15:34:24 +08:00
Stephen Zhou
1e3823e605
chore: fix type check for i18n (#30058) 
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
 2025-12-24 16:31:16 +08:00
Joel
0f41924db4
chore: some tests (#30084) 
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
 2025-12-24 16:17:59 +08:00
Joel
dcde854c5e
chore: some tests (#30078) 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-12-24 14:45:33 +08:00
Stephen Zhou
403adefc07
chore: lint require and how to import react (#30041) 2025-12-23 18:02:10 +08:00
Stephen Zhou
f2842da397
chore(web): new lint setup (#30020) 
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
 2025-12-23 16:58:55 +08:00
Stephen Zhou
eabdc5f0eb
refactor(web): migrate to Vitest and esm (#29974) 
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
 2025-12-22 16:35:22 +08:00
Stephen Zhou
a26881cb24
refactor: unified cn utils (#29916) 
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
 2025-12-19 12:08:34 +08:00
yyh
c12f0d16bb
chore(web): enhance frontend tests (#29869) 
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
 2025-12-18 17:47:13 +08:00
yyh
4ea2d31a79
chore(web): add some tests (#29772) 2025-12-18 10:06:02 +08:00
yyh
9812dc2cb2
chore: add some jest tests (#29800) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-12-18 10:00:11 +08:00
Angel98518
c2f2be6b08
fix: oxlint no unused expressions (#29675) 
Co-authored-by: daniel <daniel@example.com>
 2025-12-16 18:00:04 +08:00
Joel
47cd94ec3e
chore: tests for billings (#29720) 2025-12-16 15:06:53 +08:00
yyh
eeb5129a17
refactor: create shared react-i18next mock to reduce duplication (#29711) 2025-12-16 12:45:17 +08:00
yyh
7fc501915e
test: add comprehensive frontend tests for billing plan assets (#29615) 
Signed-off-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-12-15 21:21:34 +08:00
Joel
2b3c55d95a
chore: some billing test (#29648) 
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Coding On Star <447357187@qq.com>
 2025-12-15 16:13:14 +08:00
Joel
91e5db3e83
chore: Advance the timing of the dataset payment prompt (#29497) 
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-12-11 15:49:42 +08:00
yyh
e477e6c928
fix: harden async window open placeholder logic (#29393) 2025-12-10 16:46:48 +08:00
yyh
f722fdfa6d
fix: prevent popup blocker from blocking async window.open (#29391) 2025-12-10 12:46:01 +08:00
yyh
c1c1fd0509
feat: make billing management entry prominent and enable current plan portal (#29321) 2025-12-09 15:43:51 +08:00
Joel
c1fe394c0e
fix: check education verify api slow may cause page redirects when modal closes (#29078) 2025-12-03 17:11:57 +08:00
lyzno1
b4e7239ac7
fix: correct trigger events limit modal wording (#28463) 2025-11-21 03:23:08 +09:00
lyzno1
4b6f4081d6
fix: treat -1 as unlimited for API rate limit and trigger events (#28460) 2025-11-21 03:22:00 +09:00
Maries
d1c9183d3b
fix: correct monitor and fix trigger billing rate limit (#28465) 2025-11-20 20:37:10 +08:00
hj24
2431ddfde6
Feat integrate partner stack (#28353) 
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-11-20 15:58:05 +08:00
Maries
a1b735a4c0
feat: trigger billing (#28335) 
Signed-off-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-11-20 10:15:23 +08:00
Yeuoly
b76e17b25d
feat: introduce trigger functionality (#27644) 
Signed-off-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: Stream <Stream_2@qq.com>
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zhsama <torvalds@linux.do>
Co-authored-by: Harry <xh001x@hotmail.com>
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: yessenia <yessenia.contact@gmail.com>
Co-authored-by: hjlarry <hjlarry@163.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WTW0313 <twwu@dify.ai>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-11-12 17:59:37 +08:00
GuanMu
43bcf40f80
refactor: update installed app component to handle missing params and improve type safety (#27331) 2025-10-27 14:38:58 +08:00
GuanMu
bebb4ffbaa
Fix type error (#27217) 2025-10-22 11:43:37 +08:00
GuanMu
6217c96576
Fix type error (#27152) 
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
 2025-10-20 19:35:46 +08:00
Coding On Star
3a5aa4587c
feat(billing): add tax information tooltips in pricing footer (#26705) 
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
 2025-10-10 15:34:56 +08:00
Copilot
beb1448441
[Chore/Refactor] Add missing 'type' attribute on 'button' components (#26249) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: asukaminato0721 <30024051+asukaminato0721@users.noreply.github.com>
 2025-09-28 13:43:43 +08:00