Merge remote-tracking branch 'origin/main' into feat/trigger

web/app/components/workflow/store/workflow/index.ts

@@ -35,6 +35,11 @@ import { WorkflowContext } from '@/app/components/workflow/context'
 import type { LayoutSliceShape } from './layout-slice'
 import { createLayoutSlice } from './layout-slice'
 import type { WorkflowSliceShape as WorkflowAppSliceShape } from '@/app/components/workflow-app/store/workflow/workflow-slice'
+import type { RagPipelineSliceShape } from '@/app/components/rag-pipeline/store'
+
+export type SliceFromInjection
+  = Partial<WorkflowAppSliceShape>
+  & Partial<RagPipelineSliceShape>
 
 export type Shape
   = ChatVariableSliceShape
@@ -50,10 +55,12 @@ export type Shape
   & WorkflowSliceShape
   & InspectVarsSliceShape
   & LayoutSliceShape
-  & WorkflowAppSliceShape
+  & SliceFromInjection
+
+export type InjectWorkflowStoreSliceFn = StateCreator<SliceFromInjection>
 
 type CreateWorkflowStoreParams = {
-  injectWorkflowStoreSliceFn?: StateCreator<WorkflowAppSliceShape>
+  injectWorkflowStoreSliceFn?: InjectWorkflowStoreSliceFn
 }
 
 export const createWorkflowStore = (params: CreateWorkflowStoreParams) => {
@@ -73,7 +80,7 @@ export const createWorkflowStore = (params: CreateWorkflowStoreParams) => {
     ...createWorkflowSlice(...args),
     ...createInspectVarsSlice(...args),
     ...createLayoutSlice(...args),
-    ...(injectWorkflowStoreSliceFn?.(...args) || {} as WorkflowAppSliceShape),
+    ...(injectWorkflowStoreSliceFn?.(...args) || {} as SliceFromInjection),
   }))
 }
 

web/app/components/workflow/store/workflow/panel-slice.ts

@@ -2,6 +2,8 @@ import type { StateCreator } from 'zustand'
 
 export type PanelSliceShape = {
   panelWidth: number
+  showFeaturesPanel: boolean
+  setShowFeaturesPanel: (showFeaturesPanel: boolean) => void
   showWorkflowVersionHistoryPanel: boolean
   setShowWorkflowVersionHistoryPanel: (showWorkflowVersionHistoryPanel: boolean) => void
   showInputsPanel: boolean
@@ -26,6 +28,8 @@ export type PanelSliceShape = {
 
 export const createPanelSlice: StateCreator<PanelSliceShape> = set => ({
   panelWidth: localStorage.getItem('workflow-node-panel-width') ? Number.parseFloat(localStorage.getItem('workflow-node-panel-width')!) : 420,
+  showFeaturesPanel: false,
+  setShowFeaturesPanel: showFeaturesPanel => set(() => ({ showFeaturesPanel })),
   showWorkflowVersionHistoryPanel: false,
   setShowWorkflowVersionHistoryPanel: showWorkflowVersionHistoryPanel => set(() => ({ showWorkflowVersionHistoryPanel })),
   showInputsPanel: false,

web/app/components/workflow/store/workflow/workflow-draft-slice.ts

@@ -12,7 +12,7 @@ export type WorkflowDraftSliceShape = {
     nodes: Node[]
     edges: Edge[]
     viewport: Viewport
-    features: Record<string, any>
+    features?: Record<string, any>
     environmentVariables: EnvironmentVariable[]
   }
   setBackupDraft: (backupDraft?: WorkflowDraftSliceShape['backupDraft']) => void

web/app/components/workflow/store/workflow/workflow-slice.ts

@@ -3,6 +3,7 @@ import type {
   Node,
   WorkflowRunningData,
 } from '@/app/components/workflow/types'
+import type { FileUploadConfigResponse } from '@/models/common'
 
 type PreviewRunningData = WorkflowRunningData & {
   resultTabActive?: boolean
@@ -32,6 +33,8 @@ export type WorkflowSliceShape = {
   setShowTips: (showTips: string) => void
   workflowConfig?: Record<string, any>
   setWorkflowConfig: (workflowConfig: Record<string, any>) => void
+  fileUploadConfig?: FileUploadConfigResponse
+  setFileUploadConfig: (fileUploadConfig: FileUploadConfigResponse) => void
 }
 
 export const createWorkflowSlice: StateCreator<WorkflowSliceShape> = set => ({
@@ -60,4 +63,6 @@ export const createWorkflowSlice: StateCreator<WorkflowSliceShape> = set => ({
   setShowTips: showTips => set(() => ({ showTips })),
   workflowConfig: undefined,
   setWorkflowConfig: workflowConfig => set(() => ({ workflowConfig })),
+  fileUploadConfig: undefined,
+  setFileUploadConfig: fileUploadConfig => set(() => ({ fileUploadConfig })),
 })