Merge pull request #15943 from grafana/15429-removed-sass-var-in-js

Removed SASS variables being used in JS

packages/grafana-ui/src/themes/_variables.scss.tmpl.ts

@@ -246,9 +246,4 @@ $external-services: (
     icon: '',
     icon: '',
   ),
   ),
 ) !default;
 ) !default;
-
-:export {
-  panelhorizontalpadding: $panel-horizontal-padding;
-  panelverticalpadding: $panel-vertical-padding;
-}
 `;
 `;

packages/grafana-ui/src/themes/default.ts

@@ -62,6 +62,10 @@ const theme: GrafanaThemeCommons = {
       sm: '1px',
       sm: '1px',
     },
     },
   },
   },
+  panelPadding: {
+    horizontal: 10,
+    vertical: 5,
+  },
 };
 };
 
 
 export default theme;
 export default theme;

packages/grafana-ui/src/types/theme.ts

@@ -67,6 +67,10 @@ export interface GrafanaThemeCommons {
       sm: string;
       sm: string;
     };
     };
   };
   };
+  panelPadding: {
+    horizontal: number;
+    vertical: number;
+  };
 }
 }
 
 
 export interface GrafanaTheme extends GrafanaThemeCommons {
 export interface GrafanaTheme extends GrafanaThemeCommons {

public/app/features/dashboard/containers/DashboardPage.test.tsx

@@ -6,11 +6,6 @@ import { cleanUpDashboard } from '../state/actions';
 import { getNoPayloadActionCreatorMock, NoPayloadActionCreatorMock } from 'app/core/redux';
 import { getNoPayloadActionCreatorMock, NoPayloadActionCreatorMock } from 'app/core/redux';
 import { DashboardRouteInfo, DashboardInitPhase } from 'app/types';
 import { DashboardRouteInfo, DashboardInitPhase } from 'app/types';
 
 
-jest.mock('sass/_variables.generated.scss', () => ({
-  panelhorizontalpadding: 10,
-  panelVerticalPadding: 10,
-}));
-
 jest.mock('app/features/dashboard/components/DashboardSettings/SettingsCtrl', () => ({}));
 jest.mock('app/features/dashboard/components/DashboardSettings/SettingsCtrl', () => ({}));
 
 
 interface ScenarioContext {
 interface ScenarioContext {

public/app/features/dashboard/dashgrid/PanelChrome.test.tsx

 import { PanelChrome } from './PanelChrome';
 import { PanelChrome } from './PanelChrome';
 
 
-jest.mock('sass/_variables.generated.scss', () => ({
-  panelhorizontalpadding: 10,
-  panelVerticalPadding: 10,
-}));
-
 describe('PanelChrome', () => {
 describe('PanelChrome', () => {
   let chrome: PanelChrome;
   let chrome: PanelChrome;
 
 

public/app/features/dashboard/dashgrid/PanelChrome.tsx

@@ -14,6 +14,7 @@ import ErrorBoundary from '../../../core/components/ErrorBoundary/ErrorBoundary'
 import { applyPanelTimeOverrides, snapshotDataToPanelData } from 'app/features/dashboard/utils/panel';
 import { applyPanelTimeOverrides, snapshotDataToPanelData } from 'app/features/dashboard/utils/panel';
 import { PANEL_HEADER_HEIGHT } from 'app/core/constants';
 import { PANEL_HEADER_HEIGHT } from 'app/core/constants';
 import { profiler } from 'app/core/profiler';
 import { profiler } from 'app/core/profiler';
+import config from 'app/core/config';
 
 
 // Types
 // Types
 import { DashboardModel, PanelModel } from '../state';
 import { DashboardModel, PanelModel } from '../state';
@@ -21,7 +22,6 @@ import { PanelPlugin } from 'app/types';
 import { DataQueryResponse, TimeRange, LoadingState, PanelData, DataQueryError } from '@grafana/ui';
 import { DataQueryResponse, TimeRange, LoadingState, PanelData, DataQueryError } from '@grafana/ui';
 import { ScopedVars } from '@grafana/ui';
 import { ScopedVars } from '@grafana/ui';
 
 
-import variables from 'sass/_variables.generated.scss';
 import templateSrv from 'app/features/templating/template_srv';
 import templateSrv from 'app/features/templating/template_srv';
 
 
 const DEFAULT_PLUGIN_ERROR = 'Error in plugin';
 const DEFAULT_PLUGIN_ERROR = 'Error in plugin';
@@ -160,8 +160,8 @@ export class PanelChrome extends PureComponent<Props, State> {
           panelData={panelData}
           panelData={panelData}
           timeRange={timeRange}
           timeRange={timeRange}
           options={panel.getOptions(plugin.exports.reactPanel.defaults)}
           options={panel.getOptions(plugin.exports.reactPanel.defaults)}
-          width={width - 2 * variables.panelhorizontalpadding}
-          height={height - PANEL_HEADER_HEIGHT - variables.panelverticalpadding}
+          width={width - 2 * config.theme.panelPadding.horizontal}
+          height={height - PANEL_HEADER_HEIGHT - config.theme.panelPadding.vertical}
           renderCounter={renderCounter}
           renderCounter={renderCounter}
           replaceVariables={this.replaceVariables}
           replaceVariables={this.replaceVariables}
         />
         />

public/sass/_variables.generated.scss

@@ -249,8 +249,3 @@ $external-services: (
     icon: '',
     icon: '',
   ),
   ),
 ) !default;
 ) !default;
-
-:export {
-  panelhorizontalpadding: $panel-horizontal-padding;
-  panelverticalpadding: $panel-vertical-padding;
-}

public/sass/_variables.generated.scss.d.ts

-export interface GrafanaVariables {
-  panelhorizontalpadding: number;
-  panelverticalpadding: number;
-}
-
-declare const variables: GrafanaVariables;
-
-export default variables;