@@ -146,9 +193,46 @@ const CloudPlanItem: FC = ({
isPlanDisabled={isPlanDisabled}
btnText={btnText}
handleGetPayUrl={handleGetPayUrl}
+ warningText={educationDiscountWarningText}
/>
+
+ {showEducationPricingConfirm && }
+
+
+
+ {t('educationPricingConfirm.title', { ns: 'education' })}
+
+
+ {t('educationPricingConfirm.description', {
+ ns: 'education',
+ planName: selectedPlanName,
+ billingPeriod: selectedBillingPeriod,
+ })}
+
+
)
}
diff --git a/web/app/components/header/account-dropdown/workplace-selector/index.tsx b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
index ae6f6729fd..a86da65797 100644
--- a/web/app/components/header/account-dropdown/workplace-selector/index.tsx
+++ b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
@@ -1,4 +1,5 @@
import type { Plan } from '@/app/components/billing/type'
+import type { IWorkspace } from '@/models/common'
import {
Select,
SelectContent,
@@ -9,12 +10,58 @@ import {
SelectTrigger,
} from '@langgenius/dify-ui/select'
import { toast } from '@langgenius/dify-ui/toast'
+import { memo } from 'react'
import { useTranslation } from 'react-i18next'
import PlanBadge from '@/app/components/header/plan-badge'
import { useWorkspacesContext } from '@/context/workspace-context'
import { switchWorkspace } from '@/service/common'
import { basePath } from '@/utils/var'
+type WorkplaceSelectorContentProps = {
+ workspaces: IWorkspace[]
+ popupClassName?: string
+}
+
+type WorkplaceSelectorItemProps = {
+ workspace: IWorkspace
+}
+
+const WorkplaceSelectorItem = memo(({
+ workspace,
+}: WorkplaceSelectorItemProps) => (
+ void }>(undefined)
- const { onPlanInfoChanged } = useProviderContext()
+ const { onPlanInfoChanged, isEducationAccount, plan } = useProviderContext()
+ const { currentWorkspace, isCurrentWorkspaceManager } = useAppContext()
const updateEducationStatus = useInvalidateEducationStatus()
- const router = useRouter()
const docLink = useDocLink()
-
- const handleModalConfirm = () => {
- setShowModal(undefined)
- onPlanInfoChanged()
- updateEducationStatus()
- localStorage.removeItem(EDUCATION_VERIFYING_LOCALSTORAGE_ITEM)
- router.replace('/')
- }
+ const { handleEducationDiscount } = useEducationDiscount()
+ const router = useRouter()
+ const openAsyncWindow = useAsyncWindowOpen()
+ const queryClient = useQueryClient()
const searchParams = useSearchParams()
const token = searchParams.get('token')
+ const appliedEducationCase = (() => {
+ if (!isCurrentWorkspaceManager)
+ return AppliedEducationCase.noPaymentPermission
+
+ if (plan.type === Plan.sandbox)
+ return AppliedEducationCase.eligible
+
+ return AppliedEducationCase.activeSubscription
+ })()
const handleSubmit = () => {
educationAdd({
token: token || '',
@@ -59,17 +81,113 @@ const EducationApplyAge = () => {
institution: schoolName,
}).then((res) => {
if (res.message === 'success') {
- setShowModal({
- title: t('successTitle', { ns: 'education' }),
- desc: t('successContent', { ns: 'education' }),
- onConfirm: handleModalConfirm,
- })
+ onPlanInfoChanged()
+ updateEducationStatus()
+ localStorage.removeItem(EDUCATION_VERIFYING_LOCALSTORAGE_ITEM)
+ setHasSubmittedEducation(true)
}
else {
toast.error(t('submitError', { ns: 'education' }))
}
})
}
+ const handleOpenBillingPortal = async () => {
+ if (isOpeningBillingPortal)
+ return
+
+ setIsOpeningBillingPortal(true)
+ try {
+ await openAsyncWindow(async () => {
+ const res = await consoleClient.billing.invoices()
+ if (res.url)
+ return res.url
+
+ throw new Error('Failed to open billing page')
+ }, {
+ onError: (err) => {
+ toast.error(err.message || String(err))
+ },
+ })
+ }
+ finally {
+ setIsOpeningBillingPortal(false)
+ }
+ }
+ const handleReturnHome = () => {
+ router.push('/')
+ }
+ const renderBackToDifyButton = () => (
+
+ )
+ const handleSwitchWorkspace = async (tenantId: string) => {
+ if (tenantId === currentWorkspace?.id)
+ return
+
+ try {
+ await switchWorkspace({ url: '/workspaces/switch', body: { tenant_id: tenantId } })
+ await Promise.all([
+ queryClient.invalidateQueries({ queryKey: commonQueryKeys.currentWorkspace }),
+ queryClient.invalidateQueries({ queryKey: commonQueryKeys.workspaces }),
+ ])
+ onPlanInfoChanged()
+ updateEducationStatus()
+ }
+ catch {
+ toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }))
+ }
+ }
+
+ const renderAppliedEducationAction = () => {
+ if (appliedEducationCase === AppliedEducationCase.eligible) {
+ return (
+
+ )
+ }
+
+ if (appliedEducationCase === AppliedEducationCase.activeSubscription) {
+ return (
+
+
+ {renderBackToDifyButton()}
+
+
+
+
+ {t('applied.noPaymentPermission.description', { ns: 'education' })}
+
+
+ {renderBackToDifyButton()}
+
@@ -89,94 +207,141 @@ const EducationApplyAge = () => {
{t('toVerified', { ns: 'education' })}
{t('toVerifiedTip.front', { ns: 'education' })}
-
+
{t('toVerifiedTip.coupon', { ns: 'education' })}
-
+
{t('toVerifiedTip.end', { ns: 'education' })}
-
-
- {t('form.schoolName.title', { ns: 'education' })}
-
-
-
-
- {t('form.schoolRole.title', { ns: 'education' })}
-
-
-
-
- {t('form.terms.title', { ns: 'education' })}
-
-
-
-
- setAgeChecked(!ageChecked)}
- />
- {t('form.terms.option.age', { ns: 'education' })}
-
-
- setInSchoolChecked(!inSchoolChecked)}
- />
- {t('form.terms.option.inSchool', { ns: 'education' })}
-
-
-
+
{
+ void handleSwitchWorkspace(value)
+ }}
+ />
+
+
+ {t('form.schoolName.title', { ns: 'education' })}
+
+
+
+
+ {t('form.schoolRole.title', { ns: 'education' })}
+
+
+
+
+ {t('form.terms.title', { ns: 'education' })}
+
+
+
+
+ setAgeChecked(!ageChecked)}
+ />
+ {t('form.terms.option.age', { ns: 'education' })}
+
+
+ setInSchoolChecked(!inSchoolChecked)}
+ />
+ {t('form.terms.option.inSchool', { ns: 'education' })}
+
+
+