diff --git a/dashboard/components/dashboard/components/cost-explorer/DashboardCostExplorerCard.tsx b/dashboard/components/dashboard/components/cost-explorer/DashboardCostExplorerCard.tsx index 83318b374..4374fd93d 100644 --- a/dashboard/components/dashboard/components/cost-explorer/DashboardCostExplorerCard.tsx +++ b/dashboard/components/dashboard/components/cost-explorer/DashboardCostExplorerCard.tsx @@ -117,7 +117,39 @@ function DashboardCostExplorerCard({
{chartData && } - {!chartData && ( + {/* ⤵ will be removed when cost is supported at Resource level */} + {queryGroup === 'Resource' && ( +
+
+
+

+ Cost at resource level not yet supported +

+

+ We recommend our cloud version, Tailwarden,
+ as it supports accurate costs at the resource level +

+ + +
+ Purplin on a Rocket +
+
+ )} + {!chartData && queryGroup !== 'Resource' && (
diff --git a/dashboard/components/dashboard/components/cost-explorer/hooks/useCostExplorer.tsx b/dashboard/components/dashboard/components/cost-explorer/hooks/useCostExplorer.tsx index 7b8eba919..2a0b9b402 100644 --- a/dashboard/components/dashboard/components/cost-explorer/hooks/useCostExplorer.tsx +++ b/dashboard/components/dashboard/components/cost-explorer/hooks/useCostExplorer.tsx @@ -21,7 +21,8 @@ export type CostExplorerQueryGroupProps = | 'service' | 'region' | 'account' - | 'view'; + | 'view' + | 'Resource'; export type CostExplorerQueryGranularityProps = 'monthly' | 'daily'; export type CostExplorerQueryDateProps = | 'thisMonth' diff --git a/dashboard/components/dashboard/components/cost-explorer/hooks/useCostExplorerChart.tsx b/dashboard/components/dashboard/components/cost-explorer/hooks/useCostExplorerChart.tsx index 5baff1201..d600f23fb 100644 --- a/dashboard/components/dashboard/components/cost-explorer/hooks/useCostExplorerChart.tsx +++ b/dashboard/components/dashboard/components/cost-explorer/hooks/useCostExplorerChart.tsx @@ -84,12 +84,13 @@ function useCostExplorerChart({ }; */ const groupBySelect: GroupBySelectProps = { - values: ['provider', 'service', 'region', 'account'], + values: ['provider', 'service', 'region', 'account','Resource'], displayValues: [ 'Cloud provider', 'Cloud service', 'Cloud region', - 'Cloud account' + 'Cloud account', + 'Resource' ] }; diff --git a/dashboard/components/dashboard/components/resources-manager/hooks/useResourcesManager.tsx b/dashboard/components/dashboard/components/resources-manager/hooks/useResourcesManager.tsx index fb5a1fae5..8f6a25b5e 100644 --- a/dashboard/components/dashboard/components/resources-manager/hooks/useResourcesManager.tsx +++ b/dashboard/components/dashboard/components/resources-manager/hooks/useResourcesManager.tsx @@ -11,7 +11,8 @@ export type ResourcesManagerQuery = | 'service' | 'region' | 'account' - | 'view'; + | 'view' + | 'Resource'; export type ResourcesManagerGroupBySelectProps = { values: ResourcesManagerQuery[]; diff --git a/dashboard/components/select/Select.tsx b/dashboard/components/select/Select.tsx index d05ae8d1c..3968727c8 100644 --- a/dashboard/components/select/Select.tsx +++ b/dashboard/components/select/Select.tsx @@ -23,7 +23,6 @@ function Select({ function toggle() { setIsOpen(!isOpen); } - return (