refactor(renterd): remove contracts metrics

SiaFoundation · Nov 27, 2024 · eaf3d72 · eaf3d72
1 parent 363237b
commit eaf3d72
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 189 deletions.
diff --git a/.changeset/plenty-tomatoes-teach.md b/.changeset/plenty-tomatoes-teach.md
@@ -0,0 +1,5 @@
+---
+'renterd': minor
+---
+
+The contracts graphs no longer include a count metric.
diff --git a/.changeset/shaggy-dolls-smash.md b/.changeset/shaggy-dolls-smash.md
diff --git a/.changeset/two-seas-judge.md b/.changeset/two-seas-judge.md
diff --git a/apps/renterd/components/Contracts/ContractMetrics.tsx b/apps/renterd/components/Contracts/ContractMetrics.tsx
@@ -7,7 +7,6 @@ export function ContractMetrics() {
     selectedContract,
     allContractsSpendingMetrics,
     selectedContractSpendingMetrics,
-    contractsCountMetrics,
     graphMode,
     setGraphMode,
   } = useContracts()
@@ -31,14 +30,6 @@ export function ContractMetrics() {
           {stripPrefix(selectedContract.id).slice(0, 6)}
         </Button>
       )}
-      {!selectedContract && (
-        <Button
-          variant={graphMode === 'count' ? 'accent' : 'gray'}
-          onClick={() => setGraphMode('count')}
-        >
-          Count
-        </Button>
-      )}
     </div>
   )
 
@@ -66,17 +57,6 @@ export function ContractMetrics() {
           emptyState={<StateNoData />}
         />
       )}
-      {graphMode === 'count' && !selectedContract && (
-        <ChartXY
-          id="renterd/v0/contracts/graphs/count"
-          height="100%"
-          data={contractsCountMetrics.data}
-          config={contractsCountMetrics.config}
-          isLoading={contractsCountMetrics.isLoading}
-          actionsLeft={tabsEl}
-          emptyState={<StateNoData />}
-        />
-      )}
     </div>
   )
 }
diff --git a/apps/renterd/contexts/contracts/index.tsx b/apps/renterd/contexts/contracts/index.tsx
@@ -31,7 +31,6 @@ import { defaultDatasetRefreshInterval } from '../../config/swr'
 import { useDataset } from './dataset'
 import { useFilteredStats } from './useFilteredStats'
 import { daysInMilliseconds } from '@siafoundation/units'
-import { useContractsMetrics } from './useContractsMetrics'
 
 const defaultLimit = 50
 
@@ -175,8 +174,6 @@ function useContractsMain() {
       disabled: !selectedContract,
     })
 
-  const { contractsMetrics: contractsCountMetrics } = useContractsMetrics()
-
   return {
     dataState,
     limit,
@@ -215,7 +212,6 @@ function useContractsMain() {
     selectContract,
     allContractsSpendingMetrics,
     selectedContractSpendingMetrics,
-    contractsCountMetrics,
     isFetchingPrunableSizeAll,
     isFetchingPrunableSizeById,
     fetchPrunableSize,

diff --git a/apps/renterd/contexts/contracts/types.ts b/apps/renterd/contexts/contracts/types.ts
@@ -181,7 +181,7 @@ export const sortOptions: {
 ]
 
 export type ViewMode = 'list' | 'detail'
-export type GraphMode = 'spending' | 'count'
+export type GraphMode = 'spending'
 
 export type ChartContractKey =
   | 'uploadSpending'
@@ -196,7 +196,3 @@ export type ChartContractCategory = 'funding' | 'spending'
 export type ChartContractsKey = 'contracts'
 
 export type ChartContractsCategory = never
-
-export type ChartContractsChurnKey = 'contracts'
-
-export type ChartContractsChurnCategory = never
diff --git a/apps/renterd/contexts/contracts/useContractsMetrics.tsx b/apps/renterd/contexts/contracts/useContractsMetrics.tsx
diff --git a/libs/renterd-js/src/bus.ts b/libs/renterd-js/src/bus.ts
@@ -44,12 +44,6 @@ import {
   ContractRenewedPayload,
   ContractRenewedResponse,
   ContractResponse,
-  ContractsMetricsParams,
-  ContractsMetricsPayload,
-  ContractsMetricsResponse,
-  ContractsChurnMetricsParams,
-  ContractsChurnMetricsPayload,
-  ContractsChurnMetricsResponse,
   ContractSizeParams,
   ContractSizePayload,
   ContractSizeResponse,
@@ -191,8 +185,6 @@ import {
   busHostsBlocklistRoute,
   busHostsHostKeyRoute,
   busMetricContractRoute,
-  busMetricContractsRoute,
-  busMetricChurnRoute,
   busMetricWalletRoute,
   busMultipartAbortRoute,
   busMultipartCompleteRoute,
@@ -560,16 +552,6 @@ export function Bus({ api, password }: { api: string; password?: string }) {
       ContractMetricsPayload,
       ContractMetricsResponse
     >(axios, 'get', busMetricContractRoute),
-    contractsMetrics: buildRequestHandler<
-      ContractsMetricsParams,
-      ContractsMetricsPayload,
-      ContractsMetricsResponse
-    >(axios, 'get', busMetricContractsRoute),
-    contractsChurnMetrics: buildRequestHandler<
-      ContractsChurnMetricsParams,
-      ContractsChurnMetricsPayload,
-      ContractsChurnMetricsResponse
-    >(axios, 'get', busMetricChurnRoute),
     walletMetrics: buildRequestHandler<
       WalletMetricsParams,
       WalletMetricsPayload,

diff --git a/libs/renterd-react/src/bus.ts b/libs/renterd-react/src/bus.ts
@@ -60,10 +60,6 @@ import {
   ContractRenewedPayload,
   ContractRenewedResponse,
   ContractResponse,
-  ContractsMetricsParams,
-  ContractsMetricsResponse,
-  ContractsChurnMetricsParams,
-  ContractsChurnMetricsResponse,
   ContractsAddParams,
   ContractsAddPayload,
   ContractsAddResponse,
@@ -196,8 +192,6 @@ import {
   busAlertsDismissRoute,
   busSlabKeyObjectsRoute,
   busMetricContractRoute,
-  busMetricContractsRoute,
-  busMetricChurnRoute,
   busMetricWalletRoute,
   busMultipartCreateRoute,
   busMultipartRoute,
@@ -919,17 +913,6 @@ export function useMetricsContract(
   return useGetSwr({ ...args, route: busMetricContractRoute })
 }
 
-export function useMetricsContracts(
-  args: HookArgsSwr<ContractsMetricsParams, ContractsMetricsResponse>
-) {
-  return useGetSwr({ ...args, route: busMetricContractsRoute })
-}
-export function useMetricsContractsChurn(
-  args: HookArgsSwr<ContractsChurnMetricsParams, ContractsChurnMetricsResponse>
-) {
-  return useGetSwr({ ...args, route: busMetricChurnRoute })
-}
-
 export function useMetricsWallet(
   args: HookArgsSwr<WalletMetricsParams, WalletMetricsResponse>
 ) {

diff --git a/libs/renterd-types/src/bus.ts b/libs/renterd-types/src/bus.ts
@@ -77,8 +77,6 @@ export const busAlertsRoute = '/bus/alerts'
 export const busAlertsDismissRoute = '/bus/alerts/dismiss'
 export const busSlabKeyObjectsRoute = '/bus/slab/:key/objects'
 export const busMetricContractRoute = '/bus/metric/contract'
-export const busMetricContractsRoute = '/bus/metric/contracts'
-export const busMetricChurnRoute = '/bus/metric/churn'
 export const busMetricWalletRoute = '/bus/metric/wallet'
 export const busMultipartRoute = '/bus/multipart'
 export const busMultipartCreateRoute = '/bus/multipart/create'
@@ -523,26 +521,6 @@ export type ContractMetricsParams = MetricsParams & {
 export type ContractMetricsPayload = void
 export type ContractMetricsResponse = ContractMetric[]
 
-export type ContractsMetric = {
-  contracts: number
-  timestamp: string
-}
-export type ContractsMetricsParams = MetricsParams
-export type ContractsMetricsPayload = void
-export type ContractsMetricsResponse = ContractsMetric[]
-export type ContractsChurnMetric = {
-  direction: string
-  contractID: string
-  reason: string
-  timestamp: string
-}
-export type ContractsChurnMetricsParams = MetricsParams & {
-  direction?: string
-  reason?: string
-}
-export type ContractsChurnMetricsPayload = void
-export type ContractsChurnMetricsResponse = ContractsChurnMetric[]
-
 export type WalletMetric = {
   timestamp: string
   confirmed: string
@@ -554,20 +532,6 @@ export type WalletMetricsParams = MetricsParams
 export type WalletMetricsPayload = void
 export type WalletMetricsResponse = WalletMetric[]
 
-// export type PerformanceMetric = {
-//   action: string
-//   hostKey: string
-//   origin: string
-//   duration: number
-//   timestamp: string
-// }
-
-// export type PerformanceMetricsParams = MetricsParams & {
-//   action: string
-//   hostKey: string
-//   origin: string
-// }
-
 // multipart
 
 export type MultipartUploadCreateParams = void