coderabbitai · gurinder39 · Oct 13, 2023 · Oct 13, 2023
diff --git a/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx b/public/app/features/dashboard/components/SubMenu/SubMenuItems.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 
 import { selectors } from '@grafana/e2e-selectors';
+import { useSelector } from 'app/types';
 
 import { PickerRenderer } from '../../../variables/pickers/PickerRenderer';
 import { VariableHide, VariableModel } from '../../../variables/types';
@@ -13,6 +14,8 @@ interface Props {
 export const SubMenuItems = ({ variables, readOnly }: Props) => {
   const [visibleVariables, setVisibleVariables] = useState<VariableModel[]>([]);
 
+  const hiddenVariables = useSelector((state) => state.fnGlobalState.hiddenVariables);
+
   useEffect(() => {
     setVisibleVariables(variables.filter((state) => state.hide !== VariableHide.hideVariable));
   }, [variables]);
@@ -24,6 +27,10 @@ export const SubMenuItems = ({ variables, readOnly }: Props) => {
   return (
     <>
       {visibleVariables.map((variable) => {
+        if (hiddenVariables?.includes(variable.id)) {
+          return null;
+        }
+
         return (
           <div
             key={variable.id}

diff --git a/public/app/features/variables/pickers/PickerRenderer.tsx b/public/app/features/variables/pickers/PickerRenderer.tsx
@@ -1,18 +1,33 @@
-import React, { PropsWithChildren, ReactElement, useMemo } from 'react';
+import { css } from '@emotion/css';
+import React, { CSSProperties, FunctionComponent, PropsWithChildren, ReactElement, useMemo } from 'react';
+// eslint-disable-next-line no-restricted-imports
+import { useSelector } from 'react-redux';
 
 import { selectors } from '@grafana/e2e-selectors';
 import { Tooltip } from '@grafana/ui';
+import { FnGlobalState } from 'app/core/reducers/fn-slice';
+import type { StoreState } from 'app/types';
 
 import { variableAdapters } from '../adapters';
-import { VARIABLE_PREFIX } from '../constants';
 import { VariableHide, VariableModel } from '../types';
 
 interface Props {
   variable: VariableModel;
   readOnly?: boolean;
 }
 
-export const PickerRenderer = (props: Props) => {
+const renderWrapperStyle = css`
+  & button,
+  & span,
+  & label,
+  & input {
+    height: 24px;
+    font-size: 12px;
+    line-height: 24px;
+  }
+`;
+
+export const PickerRenderer: FunctionComponent<Props> = (props) => {
   const PickerToRender = useMemo(() => variableAdapters.get(props.variable.type).picker, [props.variable]);
 
   if (!props.variable) {
@@ -23,41 +38,70 @@ export const PickerRenderer = (props: Props) => {
     <div className="gf-form">
       <PickerLabel variable={props.variable} />
       {props.variable.hide !== VariableHide.hideVariable && PickerToRender && (
-        <PickerToRender variable={props.variable} readOnly={props.readOnly ?? false} />
+        <div className={renderWrapperStyle}>
+          <PickerToRender variable={props.variable} readOnly={props.readOnly ?? false} />
+        </div>
       )}
     </div>
   );
 };
 
+const COMMON_PICKER_LABEL_STYLE: CSSProperties = {
+  borderRadius: '2px',
+  border: 'none',
+  fontWeight: 400,
+  fontSize: '12px',
+  padding: '3px 6px',
+  letterSpacing: '0.15px',
+  height: '24px',
+  marginTop: '2px',
+};
+
 function PickerLabel({ variable }: PropsWithChildren<Props>): ReactElement | null {
   const labelOrName = useMemo(() => variable.label || variable.name, [variable]);
+  const { FNDashboard, mode } = useSelector<StoreState, FnGlobalState>(({ fnGlobalState }) => fnGlobalState);
+
+  const fnLabelStyle = useMemo(
+    () => ({
+      ...COMMON_PICKER_LABEL_STYLE,
+      ...(FNDashboard
+        ? {
+            color: mode === 'light' ? '#2D333E' : '#DBD9D7',
+            backgroundColor: mode === 'light' ? '#E0E0E0' : '#56524D',
+          }
+        : {}),
+    }),
+    [mode, FNDashboard]
+  );
 
   if (variable.hide !== VariableHide.dontHide) {
     return null;
   }
+  const fnLabelOrName = FNDashboard ? labelOrName.replace('druid_adhoc_filters', 'ad-hoc') : labelOrName;
 
-  const elementId = VARIABLE_PREFIX + variable.id;
+  const elementId = `var-${variable.id}`;
   if (variable.description) {
     return (
       <Tooltip content={variable.description} placement={'bottom'}>
         <label
           className="gf-form-label gf-form-label--variable"
+          style={fnLabelStyle}
           data-testid={selectors.pages.Dashboard.SubMenu.submenuItemLabels(labelOrName)}
           htmlFor={elementId}
         >
-          {labelOrName}
+          {fnLabelOrName}
         </label>
       </Tooltip>
     );
   }
-
   return (
     <label
       className="gf-form-label gf-form-label--variable"
+      style={fnLabelStyle}
       data-testid={selectors.pages.Dashboard.SubMenu.submenuItemLabels(labelOrName)}
       htmlFor={elementId}
     >
-      {labelOrName}
+      {fnLabelOrName}
     </label>
   );
 }