merge main

web/app/components/header/account-setting/data-source-page/data-source-notion/index.tsx

@@ -9,6 +9,8 @@ import { useAppContext } from '@/context/app-context'
 import { fetchNotionConnection } from '@/service/common'
 import NotionIcon from '@/app/components/base/notion-icon'
 import { noop } from 'lodash-es'
+import { useTranslation } from 'react-i18next'
+import Toast from '@/app/components/base/toast'
 
 const Icon: FC<{
   src: string
@@ -33,6 +35,7 @@ const DataSourceNotion: FC<Props> = ({
   const { isCurrentWorkspaceManager } = useAppContext()
   const [canConnectNotion, setCanConnectNotion] = useState(false)
   const { data } = useSWR(canConnectNotion ? '/oauth/data-source/notion' : null, fetchNotionConnection)
+  const { t } = useTranslation()
 
   const connected = !!workspaces.length
 
@@ -51,9 +54,19 @@ const DataSourceNotion: FC<Props> = ({
   }
 
   useEffect(() => {
-    if (data?.data)
-      window.location.href = data.data
-  }, [data])
+    if (data && 'data' in data) {
+      if (data.data && typeof data.data === 'string' && data.data.startsWith('http')) {
+        window.location.href = data.data
+      }
+      else if (data.data === 'internal') {
+        Toast.notify({
+          type: 'info',
+          message: t('common.dataSource.notion.integratedAlert'),
+        })
+      }
+    }
+  }, [data, t])
+
   return (
     <Panel
       type={DataSourceType.notion}

web/app/components/header/account-setting/model-provider-page/declarations.ts

@@ -19,12 +19,14 @@ export enum FormTypeEnum {
   toolSelector = 'tool-selector',
   multiToolSelector = 'array[tools]',
   appSelector = 'app-selector',
+  dynamicSelect = 'dynamic-select',
 }
 
 export type FormOption = {
   label: TypeWithI18N
   value: string
   show_on: FormShowOnObject[]
+  icon?: string
 }
 
 export enum ModelTypeEnum {

web/app/components/header/header-wrapper.tsx

@@ -14,7 +14,7 @@ const HeaderWrapper = ({
 }: HeaderWrapperProps) => {
   const pathname = usePathname()
   const isBordered = ['/apps', '/datasets', '/datasets/create', '/tools'].includes(pathname)
-  // // Check if the current path is a workflow canvas & fullscreen
+  // Check if the current path is a workflow canvas & fullscreen
   const inWorkflowCanvas = pathname.endsWith('/workflow')
   const workflowCanvasMaximize = localStorage.getItem('workflow-canvas-maximize') === 'true'
   const [hideHeader, setHideHeader] = useState(workflowCanvasMaximize)
@@ -25,14 +25,12 @@ const HeaderWrapper = ({
       setHideHeader(v.payload)
   })
 
-  if (hideHeader && inWorkflowCanvas)
-    return null
-
   return (
     <div className={classNames(
-      'sticky left-0 right-0 top-0 z-30 flex min-h-[56px] shrink-0 grow-0 basis-auto flex-col',
+      'sticky left-0 right-0 top-0 z-[15] flex min-h-[56px] shrink-0 grow-0 basis-auto flex-col',
       s.header,
       isBordered ? 'border-b border-divider-regular' : '',
+      hideHeader && inWorkflowCanvas && 'hidden',
     )}
     >
       {children}