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.

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

refactor: rewrite useSubscription with RQ #1719

Merged
merged 1 commit into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 0 additions & 17 deletions packages/backend/src/graphql/queries/get-subscription-status.ee.js

This file was deleted.

2 changes: 0 additions & 2 deletions packages/backend/src/graphql/query-resolvers.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import getRoles from './queries/get-roles.ee.js';
import getSamlAuthProviderRoleMappings from './queries/get-saml-auth-provider-role-mappings.ee.js';
import getSamlAuthProvider from './queries/get-saml-auth-provider.ee.js';
import getStepWithTestExecutions from './queries/get-step-with-test-executions.js';
import getSubscriptionStatus from './queries/get-subscription-status.ee.js';
import getTrialStatus from './queries/get-trial-status.ee.js';
import getUser from './queries/get-user.js';
import getUsers from './queries/get-users.js';
Expand All @@ -44,7 +43,6 @@ const queryResolvers = {
getSamlAuthProvider,
getSamlAuthProviderRoleMappings,
getStepWithTestExecutions,
getSubscriptionStatus,
getTrialStatus,
getUser,
getUsers,
Expand Down
5 changes: 0 additions & 5 deletions packages/backend/src/graphql/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ type Query {
getNotifications: [Notification]
getSamlAuthProvider: SamlAuthProvider
getSamlAuthProviderRoleMappings(id: String!): [SamlAuthProvidersRoleMapping]
getSubscriptionStatus: GetSubscriptionStatus
getTrialStatus: GetTrialStatus
getUser(id: String!): User
getUsers(limit: Int!, offset: Int!): UserConnection
Expand Down Expand Up @@ -612,10 +611,6 @@ type GetTrialStatus {
expireAt: String
}

type GetSubscriptionStatus {
cancellationEffectiveDate: String
}

type GetBillingAndUsage {
subscription: Subscription
usage: Usage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import * as React from 'react';
import Alert from '@mui/material/Alert';
import Typography from '@mui/material/Typography';
import useSubscriptionStatus from 'hooks/useSubscriptionStatus.ee';

import useSubscription from 'hooks/useSubscription.ee';

export default function SubscriptionCancelledAlert() {
const subscriptionStatus = useSubscriptionStatus();
if (!subscriptionStatus) return <React.Fragment />;
const subscription = useSubscription();

if (!subscription) return <React.Fragment />;

return (
<Alert
severity="warning"
Expand All @@ -14,7 +18,7 @@ export default function SubscriptionCancelledAlert() {
}}
>
<Typography variant="subtitle2" sx={{ lineHeight: 1.5 }}>
{subscriptionStatus.message}
{subscription.message}
</Typography>
</Alert>
);
Expand Down

This file was deleted.

38 changes: 38 additions & 0 deletions packages/web/src/hooks/useSubscription.ee.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { useQuery } from '@tanstack/react-query';
import { DateTime } from 'luxon';

import useFormatMessage from './useFormatMessage';
import api from 'helpers/api';

export default function useSubscription() {
const formatMessage = useFormatMessage();

const { data, isLoading: isSubscriptionLoading } = useQuery({
queryKey: ['subscription'],
queryFn: async ({ signal }) => {
const { data } = await api.get(`/v1/users/me/subscription`, {
signal,
});

return data;
},
});
const subscription = data?.data;

const cancellationEffectiveDate = subscription?.cancellationEffectiveDate;

const hasCancelled = !!cancellationEffectiveDate;

if (isSubscriptionLoading || !hasCancelled) return null;

const cancellationEffectiveDateObject = DateTime.fromISO(
cancellationEffectiveDate,
);

return {
message: formatMessage('subscriptionCancelledAlert.text', {
date: cancellationEffectiveDateObject.toFormat('DDD'),
}),
cancellationEffectiveDate: cancellationEffectiveDateObject,
};
}
21 changes: 0 additions & 21 deletions packages/web/src/hooks/useSubscriptionStatus.ee.js

This file was deleted.