fix: #337 some inconsistencies

metrico · Jun 13, 2023 · 8d1ea25 · 8d1ea25
1 parent 4438453
commit 8d1ea25
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/components/LabelBrowser/components/LabelsSelector/ValuesList.tsx b/src/components/LabelBrowser/components/LabelsSelector/ValuesList.tsx
@@ -125,7 +125,7 @@ const ValuesList: React.FC<ValuesListProps> = (props) => {
     const [filterState, setFilterState] = useState("");
 
     // get values hook
-    const { response, loading }: any = useLabelValues(
+    const { response: labelValuesResponse, loading }: any = useLabelValues(
         dataSourceId,
         label,
         new Date(start),
@@ -174,20 +174,22 @@ const ValuesList: React.FC<ValuesListProps> = (props) => {
     }, [props.data.labels]);
 
     const resp = useMemo(() => {
-        if (response?.data?.data?.length > 0) {
+
 
-            const label = data?.labels?.find(
-                (label: any) => label.name === label
+        if (labelValuesResponse?.data?.data?.length > 0) {
+            const labelFromResponse = data?.labels?.find(
+                (l: any) => l.name === label
             );
-
-            const values = label?.values;
-            const valuesMap = new Map();
+    
+            const values = labelFromResponse?.values;
+            const valuesMap = new Map(); 
 
             values?.forEach((value: any) => {
-                valuesMap.set(value.name, value);
+                valuesMap.set(value.name, {...value,label});
             });
+
 
-            return response?.data?.data?.map((val: any) => ({
+            return labelValuesResponse?.data?.data?.map((val: any) => ({
                 label,
                 name: val,
                 selected: valuesMap.get(val)?.selected || false,
@@ -199,7 +201,7 @@ const ValuesList: React.FC<ValuesListProps> = (props) => {
             return [];
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [response]);
+    }, [labelValuesResponse]);
 
     const [valuesState, setValuesState] = useState(resp);
     const [filterValuesState, setFilterValuesState] = useState(valuesState);

diff --git a/src/components/LabelBrowser/components/QueryBar/QueryBar.tsx b/src/components/LabelBrowser/components/QueryBar/QueryBar.tsx
@@ -807,7 +807,6 @@ const QueryBar: React.FC<QueryBarProps> = (props) => {
                             value="traceId"
                             onChange={switchTraceQueryType}
                         />
-                        {traceQueryType === "traceId" && showResultButton}
                     </div>
                     {traceQueryType === "traceId" && querySearch}
                     {traceQueryType === "search" && traceSearch}