fix: refine subscription site count display logic and enhance active tab management in OrganizationSettings component
This commit is contained in:
@@ -305,7 +305,7 @@ export default function HomePage() {
|
|||||||
{(typeof subscription.sites_count === 'number' || (subscription.pageview_limit > 0 && typeof subscription.pageview_usage === 'number')) && (
|
{(typeof subscription.sites_count === 'number' || (subscription.pageview_limit > 0 && typeof subscription.pageview_usage === 'number')) && (
|
||||||
<p className="text-sm text-neutral-600 dark:text-neutral-400 mt-1">
|
<p className="text-sm text-neutral-600 dark:text-neutral-400 mt-1">
|
||||||
{typeof subscription.sites_count === 'number' && (
|
{typeof subscription.sites_count === 'number' && (
|
||||||
<span>Sites: {subscription.plan_id === 'solo' ? `${subscription.sites_count}/1` : subscription.sites_count}</span>
|
<span>Sites: {subscription.plan_id === 'solo' && subscription.sites_count > 0 ? `${subscription.sites_count}/1` : subscription.sites_count}</span>
|
||||||
)}
|
)}
|
||||||
{typeof subscription.sites_count === 'number' && subscription.pageview_limit > 0 && typeof subscription.pageview_usage === 'number' && ' · '}
|
{typeof subscription.sites_count === 'number' && subscription.pageview_limit > 0 && typeof subscription.pageview_usage === 'number' && ' · '}
|
||||||
{subscription.pageview_limit > 0 && typeof subscription.pageview_usage === 'number' && (
|
{subscription.pageview_limit > 0 && typeof subscription.pageview_usage === 'number' && (
|
||||||
|
|||||||
@@ -141,10 +141,10 @@ export default function OrganizationSettings() {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const tab = searchParams.get('tab')
|
const tab = searchParams.get('tab')
|
||||||
if (tab === 'billing' || tab === 'members') {
|
if ((tab === 'billing' || tab === 'members') && tab !== activeTab) {
|
||||||
setActiveTab(tab)
|
setActiveTab(tab)
|
||||||
}
|
}
|
||||||
}, [searchParams])
|
}, [searchParams, activeTab])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (activeTab === 'billing' && currentOrgId) {
|
if (activeTab === 'billing' && currentOrgId) {
|
||||||
|
|||||||
Reference in New Issue
Block a user