merge main

web/app/components/app/configuration/dataset-config/index.tsx

@@ -256,6 +256,7 @@ const DatasetConfig: FC = () => {
       <div className='py-2 border-t border-t-divider-subtle'>
         <MetadataFilter
           metadataList={metadataList}
+          selectedDatasetsLoaded
           metadataFilterMode={datasetConfigs.metadata_filtering_mode}
           metadataFilteringConditions={datasetConfigs.metadata_filtering_conditions}
           handleAddCondition={handleAddCondition}

web/app/components/base/date-and-time-picker/date-picker/index.tsx

@@ -238,7 +238,7 @@ const DatePicker = ({
           </div>
         )}
       </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className='z-50'>
+      <PortalToFollowElemContent className={popupZIndexClassname}>
         <div className='w-[252px] mt-1 bg-components-panel-bg rounded-xl shadow-lg shadow-shadow-shadow-5 border-[0.5px] border-components-panel-border'>
           {/* Header */}
           {view === ViewType.date ? (

web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-trigger.tsx

@@ -2,6 +2,7 @@ import {
   useEffect,
   useState,
 } from 'react'
+import { unionBy } from 'lodash-es'
 import { useTranslation } from 'react-i18next'
 import { RiFilter3Line } from '@remixicon/react'
 import MetadataPanel from './metadata-panel'
@@ -15,21 +16,25 @@ import type { MetadataShape } from '@/app/components/workflow/nodes/knowledge-re
 
 const MetadataTrigger = ({
   metadataFilteringConditions,
-  metadataList = [],
+  metadataList: originalMetadataList = [],
   handleRemoveCondition,
+  selectedDatasetsLoaded,
   ...restProps
 }: MetadataShape) => {
   const { t } = useTranslation()
   const [open, setOpen] = useState(false)
   const conditions = metadataFilteringConditions?.conditions || []
 
+  const metadataList = unionBy(originalMetadataList, 'name').sort(a => a.id === 'built-in' ? 1 : -1)
   useEffect(() => {
+    if (selectedDatasetsLoaded) {
       conditions.forEach((condition) => {
         if (!metadataList.find(metadata => metadata.name === condition.name))
           handleRemoveCondition(condition.name)
       })
+    }
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [metadataList, handleRemoveCondition])
+  }, [metadataList, handleRemoveCondition, selectedDatasetsLoaded])
 
   return (
     <PortalToFollowElem

web/app/components/workflow/nodes/knowledge-retrieval/panel.tsx

@@ -37,6 +37,7 @@ const Panel: FC<NodePanelProps<KnowledgeRetrievalNodeType>> = ({
     handleRetrievalModeChange,
     handleMultipleRetrievalConfigChange,
     selectedDatasets,
+    selectedDatasetsLoaded,
     handleOnDatasetsChange,
     isShowSingleRun,
     hideSingleRun,
@@ -130,6 +131,7 @@ const Panel: FC<NodePanelProps<KnowledgeRetrievalNodeType>> = ({
       <div className='mb-2 py-2'>
         <MetadataFilter
           metadataList={metadataList}
+          selectedDatasetsLoaded={selectedDatasetsLoaded}
           metadataFilterMode={inputs.metadata_filtering_mode}
           metadataFilteringConditions={inputs.metadata_filtering_conditions}
           handleAddCondition={handleAddCondition}

web/app/components/workflow/nodes/knowledge-retrieval/types.ts

@@ -110,6 +110,7 @@ export type HandleToggleConditionLogicalOperator = () => void
 
 export type MetadataShape = {
   metadataList?: MetadataInDoc[]
+  selectedDatasetsLoaded?: boolean
   metadataFilteringConditions?: MetadataFilteringConditions
   handleAddCondition: HandleAddCondition
   handleRemoveCondition: HandleRemoveCondition

web/app/components/workflow/nodes/knowledge-retrieval/use-config.ts

@@ -211,6 +211,7 @@ const useConfig = (id: string, payload: KnowledgeRetrievalNodeType) => {
     setInputs(newInputs)
   }, [inputs, setInputs, selectedDatasets, currentRerankModel, currentRerankProvider])
 
+  const [selectedDatasetsLoaded, setSelectedDatasetsLoaded] = useState(false)
   // datasets
   useEffect(() => {
     (async () => {
@@ -225,6 +226,7 @@ const useConfig = (id: string, payload: KnowledgeRetrievalNodeType) => {
         draft._datasets = selectedDatasets
       })
       setInputs(newInputs)
+      setSelectedDatasetsLoaded(true)
     })()
   // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
@@ -418,6 +420,7 @@ const useConfig = (id: string, payload: KnowledgeRetrievalNodeType) => {
     handleModelChanged,
     handleCompletionParamsChange,
     selectedDatasets: selectedDatasets.filter(d => d.name),
+    selectedDatasetsLoaded,
     handleOnDatasetsChange,
     isShowSingleRun,
     hideSingleRun,