Merge remote-tracking branch 'origin_shh/1.1.3-master' into 1.1.3-master

web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx

@@ -106,7 +106,7 @@ const AppDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
       ),
     ]
     return navs
-  }, [appDetail])
+  }, [isOperation, t])
 
   useEffect(() => {
     if (appDetail) {

web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx

@@ -6,10 +6,12 @@ import useSWR from 'swr'
 import { useTranslation } from 'react-i18next'
 import { useBoolean } from 'ahooks'
 import {
+  Cog8ToothIcon,
   DocumentTextIcon,
   PaperClipIcon,
 } from '@heroicons/react/24/outline'
 import {
+  Cog8ToothIcon as Cog8ToothSolidIcon,
   // CommandLineIcon as CommandLineSolidIcon,
   DocumentTextIcon as DocumentTextSolidIcon,
 } from '@heroicons/react/24/solid'
@@ -175,6 +177,12 @@ const DatasetDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
         icon: TargetIcon,
         selectedIcon: TargetSolidIcon,
       })
+      baseNavigation.push({
+        name: t('common.datasetMenus.settings'),
+        href: `/datasets/${datasetId}/settings`,
+        icon: Cog8ToothIcon,
+        selectedIcon: Cog8ToothSolidIcon,
+      })
     }
 
     if (datasetRes?.provider !== 'external') {

web/app/components/app/annotation/filter.tsx

@@ -45,7 +45,7 @@ const Filter: FC<IFilterProps> = ({
         onClear={() => setQueryParams({ ...queryParams, keyword: '' })}
       />
       {
-        isEdit && ({ children })
+        isEdit && (<>{ children }</>)
       }
     </div>
   )

web/app/components/datasets/settings/form/index.tsx

@@ -5,7 +5,6 @@ import { useContext } from 'use-context-selector'
 import { useTranslation } from 'react-i18next'
 import { useSWRConfig } from 'swr'
 import { unstable_serialize } from 'swr/infinite'
-import PermissionSelector from '../permission-selector'
 import IndexMethodRadio from '../index-method-radio'
 import RetrievalSettings from '../../external-knowledge-base/create/RetrievalSettings'
 import { IndexingType } from '../../create/step-two'
@@ -197,21 +196,21 @@ const Form = () => {
           />
         </div>
       </div>
-      <div className={rowClass}>
-        <div className={labelClass}>
-          <div className='system-sm-semibold text-text-secondary'>{t('datasetSettings.form.permissions')}</div>
-        </div>
-        <div className='grow'>
-          <PermissionSelector
-            disabled={!currentDataset?.embedding_available || isCurrentWorkspaceDatasetOperator}
-            permission={permission}
-            value={selectedMemberIDs}
-            onChange={v => setPermission(v)}
-            onMemberSelect={setSelectedMemberIDs}
-            memberList={memberList}
-          />
-        </div>
-      </div>
+      {/* <div className={rowClass}> */}
+      {/*  <div className={labelClass}> */}
+      {/*    <div className='system-sm-semibold text-text-secondary'>{t('datasetSettings.form.permissions')}</div> */}
+      {/*  </div> */}
+      {/*  <div className='grow'> */}
+      {/*    <PermissionSelector */}
+      {/*      disabled={!currentDataset?.embedding_available || isCurrentWorkspaceDatasetOperator} */}
+      {/*      permission={permission} */}
+      {/*      value={selectedMemberIDs} */}
+      {/*      onChange={v => setPermission(v)} */}
+      {/*      onMemberSelect={setSelectedMemberIDs} */}
+      {/*      memberList={memberList} */}
+      {/*    /> */}
+      {/*  </div> */}
+      {/* </div> */}
       {currentDataset && currentDataset.indexing_technique && (
         <>
           <div className='my-1 h-0 w-full border-b border-divider-subtle' />