diff --git a/frontend/app/components/Dashboard/components/MetricsList/ListView.tsx b/frontend/app/components/Dashboard/components/MetricsList/ListView.tsx
index 7b92e4e7b..9b3c52d00 100644
--- a/frontend/app/components/Dashboard/components/MetricsList/ListView.tsx
+++ b/frontend/app/components/Dashboard/components/MetricsList/ListView.tsx
@@ -1,20 +1,19 @@
import React, { useState, useMemo } from 'react';
-import { Checkbox, Table, Typography } from 'antd';
+import { Checkbox, Table, Typography, Switch, Tag, Tooltip } from 'antd';
import MetricListItem from '../MetricListItem';
import { TablePaginationConfig, SorterResult } from 'antd/lib/table/interface';
import Widget from 'App/mstore/types/widget';
-import { LockOutlined, TeamOutlined } from ".store/@ant-design-icons-virtual-981121729b/package";
-import { Switch, Tag, Tooltip } from ".store/antd-virtual-9b6c8c01be/package";
+import { LockOutlined, TeamOutlined } from "@ant-design/icons";
const { Text } = Typography;
-// interface Metric {
-// metricId: number;
-// name: string;
-// owner: string;
-// lastModified: string;
-// visibility: string;
-// }
+interface Metric {
+ metricId: number;
+ name: string;
+ owner: string;
+ lastModified: string;
+ visibility: string;
+}
interface Props {
list: Widget[];
diff --git a/frontend/app/components/Dashboard/components/WidgetOptions.tsx b/frontend/app/components/Dashboard/components/WidgetOptions.tsx
index 8f92eb904..1aeb71b92 100644
--- a/frontend/app/components/Dashboard/components/WidgetOptions.tsx
+++ b/frontend/app/components/Dashboard/components/WidgetOptions.tsx
@@ -60,20 +60,22 @@ function WidgetOptions() {
metric.metricOf != FilterKey.USERID &&
metric.metricOf != FilterKey.ERRORS && (
handleChange(info.key)
- }}
- >
-
+ trigger={['click']}
+ menu={{
+ selectable: true,
+ items: [
+ { key: 'sessionCount', label: 'All Sessions' },
+ { key: 'userCount', label: 'Unique Users' },
+ ],
+ onClick: (info: { key: string }) => handleChange(info.key),
+ }}
+ >
+
)}
{hasViewTypes ? : null}
@@ -102,8 +104,10 @@ const SeriesTypeOptions = observer(({ metric }: { metric: any }) => {
key,
label: (
- {chartIcons[key]}
-
{name}
+ <>
+ {chartIcons[key]}
+
{name}
+ >
),
})),
@@ -112,11 +116,16 @@ const SeriesTypeOptions = observer(({ metric }: { metric: any }) => {
},
}}
>
-