feat(condo): [DOMA-13311, DOMA-13308] - hide paid content and pc specific layout behind feature flags #7684
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,12 @@ import { useGetAvailableServiceSubscriptionPlansQuery } from '@app/condo/gql' | |
| import { useRouter } from 'next/router' | ||
| import React, { useCallback, useMemo, useState } from 'react' | ||
|
|
||
| import { useFeatureFlags } from '@open-condo/featureflags/FeatureFlagsContext' | ||
| import { useIntl } from '@open-condo/next/intl' | ||
| import { useOrganization } from '@open-condo/next/organization' | ||
| import { Button, Space, Tooltip, Typography } from '@open-condo/ui' | ||
|
|
||
| import { UI_HIDE_PAID_FEATURES } from '@condo/domains/common/constants/featureflags' | ||
| import { SETTINGS_TAB_SUBSCRIPTION } from '@condo/domains/common/constants/settingsTabs' | ||
| import { getRequiredFeature } from '@condo/domains/subscription/constants/routeFeatureMapping' | ||
| import { | ||
|
|
@@ -28,6 +30,8 @@ export interface NoSubscriptionTooltipProps { | |
|
|
||
| export const NoSubscriptionTooltip: React.FC<NoSubscriptionTooltipProps> = ({ children, placement = 'right', feature: featureProp, path, skipTooltip, b2bAppId, tooltipButtonId }) => { | ||
| const intl = useIntl() | ||
| const { useFlag } = useFeatureFlags() | ||
| const hidePaidFeatures = useFlag(UI_HIDE_PAID_FEATURES) | ||
| const router = useRouter() | ||
| const { organization } = useOrganization() | ||
| const { activatedSubscriptions, registerSubscriptionContext, activateLoading } = useActivateSubscriptions() | ||
|
|
@@ -177,7 +181,7 @@ export const NoSubscriptionTooltip: React.FC<NoSubscriptionTooltipProps> = ({ ch | |
| </Space> | ||
| ) | ||
|
|
||
| if (hidePaidFeatures || skipTooltip) { | ||
| return children | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -4,13 +4,15 @@ import Head from 'next/head' | |||||
| import { useRouter } from 'next/router' | ||||||
| import React, { useMemo, useCallback } from 'react' | ||||||
|
|
||||||
| import { useFeatureFlags } from '@open-condo/featureflags/FeatureFlagsContext' | ||||||
| import { useAuth } from '@open-condo/next/auth' | ||||||
| import { useIntl } from '@open-condo/next/intl' | ||||||
| import { useOrganization } from '@open-condo/next/organization' | ||||||
| import { Typography, Button, Tooltip } from '@open-condo/ui' | ||||||
|
|
||||||
| import { PageHeader, PageWrapper } from '@condo/domains/common/components/containers/BaseLayout' | ||||||
| import { Loader } from '@condo/domains/common/components/Loader' | ||||||
| import { UI_HIDE_PAID_FEATURES } from '@condo/domains/common/constants/featureflags' | ||||||
| import { SETTINGS_TAB_SUBSCRIPTION } from '@condo/domains/common/constants/settingsTabs' | ||||||
|
|
||||||
| import { SubscriptionBlockedContent } from './SubscriptionBlockedContent' | ||||||
|
|
@@ -72,6 +74,8 @@ const getPageTitle = (pathname: string, intl: any): string => { | |||||
| export const SubscriptionAccessGuard: React.FC<SubscriptionAccessGuardProps> = ({ children, skipGuard = false }) => { | ||||||
| const router = useRouter() | ||||||
| const intl = useIntl() | ||||||
| const { useFlag } = useFeatureFlags() | ||||||
| const hidePaidFeatures = useFlag(UI_HIDE_PAID_FEATURES) | ||||||
| const GuardTitle = intl.formatMessage({ id: 'subscription.accessGuard.title' }) | ||||||
| const GuardDescription = intl.formatMessage({ id: 'subscription.accessGuard.description' }) | ||||||
| const GoToPlansMessage = intl.formatMessage({ id: 'subscription.accessGuard.goToPlans' }) | ||||||
|
|
@@ -80,6 +84,8 @@ export const SubscriptionAccessGuard: React.FC<SubscriptionAccessGuardProps> = ( | |||||
| const FeaturePayButton = intl.formatMessage({ id: 'subscription.accessGuard.feature.payButton' }) | ||||||
| const AwaitingPaymentMessage = intl.formatMessage({ id: 'subscription.planCard.requestPending' }) | ||||||
| const AwaitingPaymentTooltipMessage = intl.formatMessage({ id: 'subscription.planCard.requestPending.tooltip' }) | ||||||
| const UnavailableTitle = intl.formatMessage({ id: 'subscription.accessGuard.unavailable.title' }, { defaultMessage: 'Access denied' }) | ||||||
| const UnavailableDescription = intl.formatMessage({ id: 'subscription.accessGuard.unavailable.description' }, { defaultMessage: 'You do not have access to this service' }) | ||||||
| const { isFeatureAvailable, isB2BAppEnabled, hasSubscription, loading, hasSubscriptionsFeature } = useOrganizationSubscription() | ||||||
| const { organization, isLoading: orgIsLoading } = useOrganization() | ||||||
| const { isLoading: authIsLoading } = useAuth() | ||||||
|
|
@@ -200,6 +206,24 @@ export const SubscriptionAccessGuard: React.FC<SubscriptionAccessGuardProps> = ( | |||||
| : null | ||||||
|
|
||||||
| if (isBlocked) { | ||||||
| if (hidePaidFeatures && !hasSubscription) { | ||||||
|
Contributor
There was a problem hiding this comment. Critical: Logic flaw in feature-flag condition creates non-functional buttons. The condition In that screen:
Both buttons would be visible but non-functional, breaking the UX. 🔒 Proposed fixRemove the - if (hidePaidFeatures && !hasSubscription) {
+ if (hidePaidFeatures) {
return (📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||
| return ( | ||||||
| <> | ||||||
| <Head> | ||||||
| <title>{pageTitle}</title> | ||||||
| </Head> | ||||||
| <PageWrapper> | ||||||
| <PageHeader title={<Typography.Title>{pageTitle}</Typography.Title>} /> | ||||||
| <SubscriptionBlockedContent | ||||||
| title={UnavailableTitle} | ||||||
| description={UnavailableDescription} | ||||||
| primaryButton={null} | ||||||
| /> | ||||||
| </PageWrapper> | ||||||
| </> | ||||||
| ) | ||||||
| } | ||||||
|
|
||||||
| let primaryButton: React.ReactNode | ||||||
| if (!hasFeaturePlan) { | ||||||
| primaryButton = <Button id='subscription-access-guard-go-to-plans-button' type='primary' onClick={handleGoToPlans}>{GoToPlansMessage}</Button> | ||||||
|
|
@@ -229,8 +253,8 @@ export const SubscriptionAccessGuard: React.FC<SubscriptionAccessGuardProps> = ( | |||||
|
|
||||||
| return ( | ||||||
| <> | ||||||
| {!hidePaidFeatures && PaymentModal} | ||||||
| {!hidePaidFeatures && <SubscriptionTrialEndedModal />} | ||||||
| <Head> | ||||||
| <title>{pageTitle}</title> | ||||||
| </Head> | ||||||
|
|
@@ -251,8 +275,8 @@ export const SubscriptionAccessGuard: React.FC<SubscriptionAccessGuardProps> = ( | |||||
|
|
||||||
| return ( | ||||||
| <> | ||||||
| {!hidePaidFeatures && <SubscriptionWelcomeModal />} | ||||||
| {!hidePaidFeatures && <SubscriptionTrialEndedModal />} | ||||||
| {children} | ||||||
| </> | ||||||
| ) | ||||||
|
|
||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When
UI_HIDE_LAYOUT_SIDE_MENUis enabled on desktop, theSideNavis not rendered, but this class still applies eitherstyles.subLayoutExpandedorstyles.subLayoutCollapsed; inBaseLayout.module.cssthose add a left margin equal to the side-menu width/collapsed width. As a result, embedded pages with the side menu hidden still render shifted to the right with a blank gutter, so the layout is not actually full-width.Useful? React with 👍 / 👎.