Remove revenue graph (#237)

uselotus · Oct 21, 2022 · eaf1c97 · eaf1c97
1 parent bb5ef30
commit eaf1c97
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/frontend/src/api/api.ts b/frontend/src/api/api.ts
@@ -9,7 +9,7 @@ import {
   PlanType,
   CreatePlanType,
   UpdatePlanType,
-  PlansByCustomer,
+  PlansByCustomerArray,
 } from "../types/plan-type";
 import { RevenueType } from "../types/revenue-type";
 import {
@@ -166,7 +166,7 @@ export const GetSubscriptions = {
 };
 
 export const PlansByCustomer = {
-  getPlansByCustomer: (): Promise<PlansByCustomer> =>
+  getPlansByCustomer: (): Promise<PlansByCustomerArray> =>
     requests.get("api/plans_by_customer/"),
 };
 

diff --git a/frontend/src/components/Dashboard/Dashboard.tsx b/frontend/src/components/Dashboard/Dashboard.tsx
@@ -66,10 +66,7 @@ const Dashboard: FC = () => {
         <Col span="24">
           <div className="grid grid-cols-12 justify-center space-x-4">
             <div className="col-span-8">
-              <RevenueBarGraph
-                data={data?.daily_usage_revenue_period_1}
-                isLoading={isLoading}
-              />
+              <MetricBarGraph range={dateRange} />
             </div>
             <div className="col-span-4">
               <CustomerByPlanPie
@@ -79,9 +76,6 @@ const Dashboard: FC = () => {
             </div>
           </div>
         </Col>
-        <Col span="24">
-          <MetricBarGraph range={dateRange} />
-        </Col>
       </Row>
     </PageLayout>
   );

diff --git a/frontend/src/components/Dashboard/MetricBarGraph.tsx b/frontend/src/components/Dashboard/MetricBarGraph.tsx
@@ -108,19 +108,22 @@ function MetricBarGraph(props: { range: any }) {
 
   return (
     <Paper>
-      <h2>Metric Usage By Customer</h2>
-      <Select
-        defaultValue="Select Metric"
-        onChange={changeMetric}
-        value={selectedMetric}
-        className="my-5"
-      >
-        {metricList.map((metric_name) => (
-          <Option value={metric_name} loading={isLoading}>
-            {metric_name}
-          </Option>
-        ))}
-      </Select>
+      <div className="flex flex-row items-center mb-5 space-x-4">
+        <h2>Metric Usage By Customer</h2>
+        <Select
+          defaultValue="Select Metric"
+          onChange={changeMetric}
+          value={selectedMetric}
+          className="w-4/12 self-center"
+        >
+          {metricList.map((metric_name) => (
+            <Option value={metric_name} loading={isLoading}>
+              {metric_name}
+            </Option>
+          ))}
+        </Select>
+      </div>
+
       <div className="mt-5">
         <Column {...config} />
       </div>