Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix / remove profiles from the web app #563

Closed
wants to merge 14 commits into from
Closed

Fix / remove profiles from the web app #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f458cd6
feat(project): commented code
borkopetrovicc Jun 27, 2024
d0acb5c
feat(project): canExportdata and canDeleteAccount false
borkopetrovicc Jun 27, 2024
79d29aa
feat(project): switch plans disabled
borkopetrovicc Jun 28, 2024
271dd09
feat(project): revert
borkopetrovicc Jun 28, 2024
365f137
feat(project): switch plans disabled
borkopetrovicc Jun 28, 2024
68263cb
feat(project): revert
borkopetrovicc Jul 1, 2024
0f79dae
feat(project): revert
borkopetrovicc Jul 1, 2024
5d1a044
Merge branch 'develop' into fix/remove-features-from-Web-App-new-branch
borkopetrovicc Jul 1, 2024
98872d1
feat(project): added logic for switch plans
borkopetrovicc Jul 2, 2024
cffa8cd
feat(project): added tests
borkopetrovicc Jul 2, 2024
b74a910
feat(project): added tests
borkopetrovicc Jul 3, 2024
516b167
feat(project): revert tests
borkopetrovicc Jul 3, 2024
bcfe912
Merge branch 'develop' into fix/remove-features-from-Web-App-new-branch
borkopetrovicc Jul 5, 2024
84e2f7c
Merge branch 'develop' into fix/remove-features-from-Web-App-new-branch
borkopetrovicc Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/common/src/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export const DEFAULT_FEATURES = {
hasSocialURLs: false,
hasNotifications: false,
watchListSizeLimit: MAX_WATCHLIST_ITEMS_COUNT,
canSwitchSubscription: false,
};

export const EPG_TYPE = {
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/services/integrations/AccountService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export type AccountServiceFeatures = {
readonly hasSocialURLs: boolean;
readonly hasNotifications: boolean;
readonly watchListSizeLimit: number;
readonly canSwitchSubscription: boolean;
};

export default abstract class AccountService {
Expand Down
1 change: 1 addition & 0 deletions packages/common/src/services/integrations/cleeng/CleengAccountService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export default class CleengAccountService extends AccountService {
canShowReceipts: false,
hasSocialURLs: false,
hasNotifications: false,
canSwitchSubscription: true,
// The 'externalData' attribute of Cleeng can contain max 4000 characters
watchListSizeLimit: 48,
});
Expand Down
5 changes: 3 additions & 2 deletions packages/common/src/services/integrations/jwp/JWPAccountService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,12 @@ export default class JWPAccountService extends AccountService {
canSupportEmptyFullName: false,
canChangePasswordWithOldPassword: true,
canRenewSubscription: false,
canExportAccountData: true,
canExportAccountData: false,
canUpdatePaymentMethod: false,
canShowReceipts: true,
canDeleteAccount: true,
canDeleteAccount: false,
hasNotifications: true,
canSwitchSubscription: false,
hasSocialURLs: true,
// Limit of media_ids length passed to the /apps/watchlists endpoint
watchListSizeLimit: 48,
Expand Down
1 change: 1 addition & 0 deletions packages/ui-react/src/components/Payment/Payment.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ describe('<Payment>', () => {
canUpdatePaymentMethod={false}
showAllTransactions={false}
isLoading={false}
canSwitchSubscription={false}
offerSwitchesAvailable={false}
onShowReceiptClick={vi.fn()}
onUpgradeSubscriptionClick={vi.fn()}
Expand Down
47 changes: 30 additions & 17 deletions packages/ui-react/src/components/Payment/Payment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ type Props = {
isExternalPaymentProvider: boolean;
paymentProvider?: string;
paymentProviderLink?: string;
canSwitchSubscription: boolean;
};

const Payment = ({
Expand Down Expand Up @@ -92,6 +93,7 @@ const Payment = ({
isExternalPaymentProvider,
paymentProvider,
paymentProviderLink,
canSwitchSubscription,
}: Props): JSX.Element => {
const subscriptionDetailsId = useOpaqueId('subscription-details');
const paymentMethodId = useOpaqueId('payment-method');
Expand Down Expand Up @@ -219,23 +221,34 @@ const Payment = ({
</Link>
</p>
) : (
showChangeSubscriptionButton && (
<Button
className={styles.upgradeSubscription}
label={t('user:payment.change_subscription')}
disabled={!canRenewSubscription && activeSubscription.status === 'cancelled'}
onClick={() => {
if (offers.length > 1 && !canRenewSubscription) {
setIsChangingOffer(true);
} else {
onUpgradeSubscriptionClick?.();
borkopetrovicc marked this conversation as resolved.
Show resolved Hide resolved
}
}}
fullWidth={isMobile}
color="primary"
data-testid="change-subscription-button"
/>
)
<>
{canSwitchSubscription && showChangeSubscriptionButton && (
Copy link
Collaborator

@AntonLantukh AntonLantukh Jul 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am hesitant to add additional complexity here introducing a new condition + new "cancel" button (third one?). I like the solution Christiaan purposed. Do you think we could focus on that one?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes i will close this pr.

<Button
className={styles.upgradeSubscription}
label={t('user:payment.change_subscription')}
disabled={!canRenewSubscription && activeSubscription.status === 'cancelled'}
onClick={() => {
if (offers.length > 1 && !canRenewSubscription) {
setIsChangingOffer(true);
} else {
onUpgradeSubscriptionClick?.();
}
}}
fullWidth={isMobile}
color="primary"
data-testid="change-subscription-button"
/>
)}
{!canSwitchSubscription && activeSubscription?.status !== 'cancelled' && (
<Button
className={styles.changePlanCancelButton}
label={t('user:payment.cancel_subscription')}
onClick={onCancelSubscriptionClick}
variant="danger"
data-testid="cancel-subscription-button"
/>
)}
</>
)}
{(activeSubscription.status === 'active' || activeSubscription.status === 'active_trial') &&
!isGrantedSubscription &&
Expand Down
3 changes: 2 additions & 1 deletion packages/ui-react/src/containers/PaymentContainer/PaymentContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const PaymentContainer = () => {

const { accessModel } = useConfigStore(({ accessModel }) => ({ accessModel }), shallow);
const { user: customer, subscription: activeSubscription, transactions, activePayment, pendingOffer, loading } = useAccountStore();
const { canUpdatePaymentMethod, canShowReceipts, canRenewSubscription } = accountController.getFeatures();
const { canUpdatePaymentMethod, canShowReceipts, canRenewSubscription, canSwitchSubscription } = accountController.getFeatures();
const { subscriptionOffers, switchSubscriptionOffers } = useOffers();

const [showAllTransactions, setShowAllTransactions] = useState(false);
Expand Down Expand Up @@ -135,6 +135,7 @@ const PaymentContainer = () => {
isExternalPaymentProvider={isExternalPaymentProvider}
paymentProvider={paymentProvider}
paymentProviderLink={paymentProviderLink}
canSwitchSubscription={canSwitchSubscription}
/>
);
};
Expand Down
7 changes: 3 additions & 4 deletions packages/ui-react/src/pages/User/__snapshots__/User.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,13 +690,12 @@ exports[`User Component tests > Payments Page 1`] = `
</p>
</div>
<button
aria-disabled="false"
class="_button_f8f296 _upgradeSubscription_c57ff5 _primary_f8f296 _outlined_f8f296"
data-testid="change-subscription-button"
class="_button_f8f296 _changePlanCancelButton_c57ff5 _default_f8f296 _danger_f8f296"
data-testid="cancel-subscription-button"
type="button"
>
<span>
user:payment.change_subscription
user:payment.cancel_subscription
</span>
</button>
</section>
Expand Down
Loading