Skip to content
Snippets Groups Projects
Unverified Commit 2affdea9 authored by Ryan Laurie's avatar Ryan Laurie Committed by GitHub
Browse files

Fix Padding on Single Database Names (#21283)

* use block elements to pad single database name

* fix readonly proptype console error
parent a6ab6f90
No related branches found
No related tags found
No related merge requests found
......@@ -442,7 +442,7 @@ export default class NativeQueryEditor extends Component {
<VisibilityToggler
className={!isNativeEditorOpen ? "hide sm-show" : ""}
isOpen={isNativeEditorOpen}
readOnly={readOnly}
readOnly={!!readOnly}
toggleEditor={this.toggleEditor}
/>
)}
......
......@@ -32,7 +32,7 @@ const DatabaseSelectorPropTypes = {
setDatabaseId: PropTypes.func,
};
const DatabaseNameSpanPropTypes = {
const SingleDatabaseNamePropTypes = {
database: PropTypes.object,
};
......@@ -101,7 +101,9 @@ const PopulatedDataSourceSelectors = ({
/>,
);
} else if (database) {
dataSourceSelectors.push(<DatabaseNameSpan key="db" database={database} />);
dataSourceSelectors.push(
<SingleDatabaseName key="db" database={database} />,
);
}
if (query.requiresTable()) {
......@@ -139,11 +141,11 @@ const DatabaseSelector = ({ database, databases, readOnly, setDatabaseId }) => (
DatabaseSelector.propTypes = DatabaseSelectorPropTypes;
const DatabaseNameSpan = ({ database }) => (
<span className="p2 text-bold text-grey">{database.name}</span>
const SingleDatabaseName = ({ database }) => (
<div className="p2 text-bold text-grey">{database.name}</div>
);
DatabaseNameSpan.propTypes = DatabaseNameSpanPropTypes;
SingleDatabaseName.propTypes = SingleDatabaseNamePropTypes;
const TableSelector = ({ database, readOnly, selectedTable, setTableId }) => (
<div className="GuiBuilder-section GuiBuilder-data flex align-center ml2">
......@@ -161,9 +163,9 @@ const TableSelector = ({ database, readOnly, selectedTable, setTableId }) => (
TableSelector.propTypes = TableSelectorPropTypes;
const Placeholder = ({ query }) => (
<span className="ml2 p2 text-medium">
<div className="ml2 p2 text-medium">
{t`This question is written in ${query.nativeQueryLanguage()}.`}
</span>
</div>
);
Placeholder.propTypes = PlaceholderPropTypes;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment