From 4567ca8fce32395a1911a122358f5ebad98bd019 Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Tue, 7 Mar 2023 20:48:57 +0000 Subject: [PATCH] feat: show current plan name in usage information --- packages/backend/src/graphql/queries/get-usage-data.ee.ts | 1 + packages/backend/src/graphql/schema.graphql | 1 + .../web/src/components/UsageDataInformation/index.ee.tsx | 8 ++++++++ packages/web/src/graphql/queries/get-usage-data.ee.ts | 1 + packages/web/src/hooks/useUsageData.ee.ts | 2 ++ 5 files changed, 13 insertions(+) diff --git a/packages/backend/src/graphql/queries/get-usage-data.ee.ts b/packages/backend/src/graphql/queries/get-usage-data.ee.ts index de67d52d..a5dfc69b 100644 --- a/packages/backend/src/graphql/queries/get-usage-data.ee.ts +++ b/packages/backend/src/graphql/queries/get-usage-data.ee.ts @@ -17,6 +17,7 @@ const getUsageData = async ( .throwIfNotFound(); const computedUsageData = { + name: paymentPlan.name, allowedTaskCount: paymentPlan.taskCount, consumedTaskCount: usageData.consumedTaskCount, remainingTaskCount: paymentPlan.taskCount - usageData.consumedTaskCount, diff --git a/packages/backend/src/graphql/schema.graphql b/packages/backend/src/graphql/schema.graphql index f3db6a75..c15ccd36 100644 --- a/packages/backend/src/graphql/schema.graphql +++ b/packages/backend/src/graphql/schema.graphql @@ -470,6 +470,7 @@ type GetAutomatischInfo { } type GetUsageData { + name: String allowedTaskCount: Int consumedTaskCount: Int remainingTaskCount: Int diff --git a/packages/web/src/components/UsageDataInformation/index.ee.tsx b/packages/web/src/components/UsageDataInformation/index.ee.tsx index 9bc85b92..f655a692 100644 --- a/packages/web/src/components/UsageDataInformation/index.ee.tsx +++ b/packages/web/src/components/UsageDataInformation/index.ee.tsx @@ -18,6 +18,14 @@ export default function UsageDataInformation() { + + + Current plan + + + {usageData.name} + + Total allowed task count diff --git a/packages/web/src/graphql/queries/get-usage-data.ee.ts b/packages/web/src/graphql/queries/get-usage-data.ee.ts index 7f410ca2..dd6f8cb3 100644 --- a/packages/web/src/graphql/queries/get-usage-data.ee.ts +++ b/packages/web/src/graphql/queries/get-usage-data.ee.ts @@ -3,6 +3,7 @@ import { gql } from '@apollo/client'; export const GET_USAGE_DATA = gql` query GetUsageData { getUsageData { + name allowedTaskCount consumedTaskCount remainingTaskCount diff --git a/packages/web/src/hooks/useUsageData.ee.ts b/packages/web/src/hooks/useUsageData.ee.ts index 7880dc19..3a6e7c3f 100644 --- a/packages/web/src/hooks/useUsageData.ee.ts +++ b/packages/web/src/hooks/useUsageData.ee.ts @@ -4,6 +4,7 @@ import { DateTime } from 'luxon'; import { GET_USAGE_DATA } from 'graphql/queries/get-usage-data.ee'; type UseUsageDataReturn = { + name: string; allowedTaskCount: number; consumedTaskCount: number; remainingTaskCount: number; @@ -19,6 +20,7 @@ export default function useUsageData(): UseUsageDataReturn { const nextResetAtDateTimeObject = nextResetAt && DateTime.fromMillis(Number(nextResetAt)); return { + name: usageData?.name, allowedTaskCount: usageData?.allowedTaskCount, consumedTaskCount: usageData?.consumedTaskCount, remainingTaskCount: usageData?.remainingTaskCount,