iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: css prop is now overwhelmed with emotion (#9742)

This commit is contained in:
David Aaron Suddjian 2020-05-05 10:10:56 -07:00 committed by GitHub
parent 0d85d25314
commit d65d29c810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
superset-frontend/spec/javascripts/dashboard/components/HeaderActionsDropdown_spec.jsx
View File

@ -32,7 +32,7 @@ describe('HeaderActionsDropdown', () => {
dashboardId: 1,
dashboardTitle: 'Title',
hasUnsavedChanges: false,
css: '',
customCss: '',
onChange: () => {},
updateCss: () => {},
forceRefreshAllCharts: () => {},

6
superset-frontend/src/dashboard/components/Header.jsx
View File

@ -56,7 +56,7 @@ const propTypes = {
charts: PropTypes.objectOf(chartPropShape).isRequired,
layout: PropTypes.object.isRequired,
expandedSlices: PropTypes.object.isRequired,
css: PropTypes.string.isRequired,
customCss: PropTypes.string.isRequired,
colorNamespace: PropTypes.string,
colorScheme: PropTypes.string,
isStarred: PropTypes.bool.isRequired,
@ -301,7 +301,7 @@ class Header extends React.PureComponent {
dashboardTitle,
layout,
expandedSlices,
css,
customCss,
colorNamespace,
colorScheme,
onUndo,
@ -476,7 +476,7 @@ class Header extends React.PureComponent {
dashboardTitle={dashboardTitle}
layout={layout}
expandedSlices={expandedSlices}
css={css}
customCss={customCss}
colorNamespace={colorNamespace}
colorScheme={colorScheme}
onSave={onSave}

8
superset-frontend/src/dashboard/components/HeaderActionsDropdown.jsx
View File

@ -37,7 +37,7 @@ const propTypes = {
dashboardId: PropTypes.number.isRequired,
dashboardTitle: PropTypes.string.isRequired,
hasUnsavedChanges: PropTypes.bool.isRequired,
css: PropTypes.string.isRequired,
customCss: PropTypes.string.isRequired,
colorNamespace: PropTypes.string,
colorScheme: PropTypes.string,
onChange: PropTypes.func.isRequired,
@ -69,7 +69,7 @@ class HeaderActionsDropdown extends React.PureComponent {
constructor(props) {
super(props);
this.state = {
css: props.css,
css: props.customCss,
cssTemplates: [],
};
@ -116,7 +116,7 @@ class HeaderActionsDropdown extends React.PureComponent {
forceRefreshAllCharts,
refreshFrequency,
editMode,
css,
customCss,
colorNamespace,
colorScheme,
hasUnsavedChanges,
@ -150,7 +150,7 @@ class HeaderActionsDropdown extends React.PureComponent {
layout={layout}
expandedSlices={expandedSlices}
refreshFrequency={refreshFrequency}
css={css}
customCss={customCss}
colorNamespace={colorNamespace}
colorScheme={colorScheme}
onSave={onSave}

6
superset-frontend/src/dashboard/components/SaveModal.jsx
View File

@ -36,7 +36,7 @@ const propTypes = {
layout: PropTypes.object.isRequired,
saveType: PropTypes.oneOf([SAVE_TYPE_OVERWRITE, SAVE_TYPE_NEWDASHBOARD]),
triggerNode: PropTypes.node.isRequired,
css: PropTypes.string.isRequired,
customCss: PropTypes.string.isRequired,
colorNamespace: PropTypes.string,
colorScheme: PropTypes.string,
onSave: PropTypes.func.isRequired,
@ -95,7 +95,7 @@ class SaveModal extends React.PureComponent {
const {
dashboardTitle,
layout: positions,
css,
customCss,
colorNamespace,
colorScheme,
expandedSlices,
@ -110,7 +110,7 @@ class SaveModal extends React.PureComponent {
const labelColors = colorScheme ? scale.getColorMap() : {};
const data = {
positions,
css,
css: customCss,
color_namespace: colorNamespace,
color_scheme: colorScheme,
label_colors: labelColors,

2
superset-frontend/src/dashboard/containers/DashboardHeader.jsx
View File

@ -71,7 +71,7 @@ function mapStateToProps({
).text,
expandedSlices: dashboardState.expandedSlices,
refreshFrequency: dashboardState.refreshFrequency,
css: dashboardState.css,
customCss: dashboardState.css,
colorNamespace: dashboardState.colorNamespace,
colorScheme: dashboardState.colorScheme,
charts,