Merge branch 'e-0154' into deploy/enterprise

web/app/components/app/overview/settings/index.tsx

@@ -30,7 +30,6 @@ import I18n from '@/context/i18n'
 import cn from '@/utils/classnames'
 import { useGlobalPublicStore } from '@/context/global-public-context'
 import { IS_CE_EDITION } from '@/config'
-import { LicenseStatus } from '@/types/feature'
 
 export type ISettingsModalProps = {
   isChat: boolean
@@ -113,7 +112,7 @@ const SettingsModal: FC<ISettingsModalProps> = ({
       : { type: 'emoji', icon, background: icon_background! },
   )
 
-  const { enableBilling, plan } = useProviderContext()
+  const { enableBilling, plan, webappCopyrightEnabled } = useProviderContext()
   const { setShowPricingModal, setShowAccountSettingModal } = useModalContext()
   const isFreePlan = plan.type === 'sandbox'
   const handlePlanClick = useCallback(() => {
@@ -383,14 +382,14 @@ const SettingsModal: FC<ISettingsModalProps> = ({
                     )}
                   </div>
                   <Tooltip
-                    disabled={systemFeatures.license.status !== LicenseStatus.NONE}
+                    disabled={webappCopyrightEnabled}
                     popupContent={
-                      <div className='w-[260px]'>{t(`${prefixSettings}.more.copyrightTooltip`)}</div>
+                      <div className='w-[180px]'>{t(`${prefixSettings}.more.copyrightTooltip`)}</div>
                     }
                     asChild={false}
                   >
                     <Switch
-                      disabled={IS_CE_EDITION}
+                      disabled={!webappCopyrightEnabled}
                       defaultValue={inputInfo.copyrightSwitchValue}
                       onChange={v => setInputInfo({ ...inputInfo, copyrightSwitchValue: v })}
                     />
@@ -442,7 +441,8 @@ const SettingsModal: FC<ISettingsModalProps> = ({
           <Button variant='primary' onClick={onClickSave} loading={saveLoading}>{t('common.operation.save')}</Button>
         </div>
       </Modal >
-      {showAppIconPicker && (
+      {
+        showAppIconPicker && (
           <AppIconPicker
             onSelect={(payload) => {
               setAppIcon(payload)
@@ -455,7 +455,8 @@ const SettingsModal: FC<ISettingsModalProps> = ({
               setShowAppIconPicker(false)
             }}
           />
-      )}
+        )
+      }
     </>
 
   )

web/app/components/billing/type.ts

@@ -67,6 +67,7 @@ export type CurrentPlanInfoBackend = {
   can_replace_logo: boolean
   model_load_balancing_enabled: boolean
   dataset_operator_enabled: boolean
+  webapp_copyright_enabled: boolean
 }
 
 export type SubscriptionItem = {

web/context/provider-context.tsx

@@ -35,6 +35,7 @@ type ProviderContextState = {
   enableReplaceWebAppLogo: boolean
   modelLoadBalancingEnabled: boolean
   datasetOperatorEnabled: boolean
+  webappCopyrightEnabled: boolean
 }
 const ProviderContext = createContext<ProviderContextState>({
   modelProviders: [],
@@ -64,6 +65,7 @@ const ProviderContext = createContext<ProviderContextState>({
   enableReplaceWebAppLogo: false,
   modelLoadBalancingEnabled: false,
   datasetOperatorEnabled: false,
+  webappCopyrightEnabled: false,
 })
 
 export const useProviderContext = () => useContext(ProviderContext)
@@ -91,6 +93,7 @@ export const ProviderContextProvider = ({
   const [enableReplaceWebAppLogo, setEnableReplaceWebAppLogo] = useState(false)
   const [modelLoadBalancingEnabled, setModelLoadBalancingEnabled] = useState(false)
   const [datasetOperatorEnabled, setDatasetOperatorEnabled] = useState(false)
+  const [webappCopyrightEnabled, setWebappCopyrightEnabled] = useState(false)
 
   const fetchPlan = async () => {
     const data = await fetchCurrentPlanInfo()
@@ -105,6 +108,8 @@ export const ProviderContextProvider = ({
       setModelLoadBalancingEnabled(true)
     if (data.dataset_operator_enabled)
       setDatasetOperatorEnabled(true)
+    if (data.webapp_copyright_enabled)
+      setWebappCopyrightEnabled(true)
   }
   useEffect(() => {
     fetchPlan()
@@ -123,6 +128,7 @@ export const ProviderContextProvider = ({
       enableReplaceWebAppLogo,
       modelLoadBalancingEnabled,
       datasetOperatorEnabled,
+      webappCopyrightEnabled,
     }}>
       {children}
     </ProviderContext.Provider>