diff --git a/ui/src/buckets/components/BucketsTab.tsx b/ui/src/buckets/components/BucketsTab.tsx index 4882b5445a..721ded9e63 100644 --- a/ui/src/buckets/components/BucketsTab.tsx +++ b/ui/src/buckets/components/BucketsTab.tsx @@ -112,27 +112,26 @@ class BucketsTab extends PureComponent { titleText={this.createButtonTitleText} /> - - - searchTerm={searchTerm} - searchKeys={['name', 'ruleString', 'labels[].name']} - list={prettyBuckets(buckets)} - > - {bs => ( - - )} - - + + + searchTerm={searchTerm} + searchKeys={['name', 'ruleString', 'labels[].name']} + list={prettyBuckets(buckets)} + > + {bs => ( + + )} + { public render() { - const {limitStatus, resourceName} = this.props + const {limitStatus, resourceName, className} = this.props + if (CLOUD && limitStatus === LimitStatus.EXCEEDED) { return ( { - {this.props.children} ) } - return this.props.children + + return null } } diff --git a/ui/src/dashboards/components/DashboardPage.tsx b/ui/src/dashboards/components/DashboardPage.tsx index e4de0c5614..5b05f77c16 100644 --- a/ui/src/dashboards/components/DashboardPage.tsx +++ b/ui/src/dashboards/components/DashboardPage.tsx @@ -186,52 +186,52 @@ class DashboardPage extends Component { return ( - - - + + {showVariablesControls && !!dashboard && ( + + )} + + {!!dashboard && ( + - {showVariablesControls && !!dashboard && ( - - )} - {!!dashboard && ( - - )} - {children} - - + )} + {children} + ) diff --git a/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx b/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx index 58592aa30d..13e4187b67 100644 --- a/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx +++ b/ui/src/dashboards/components/dashboard_index/DashboardsIndex.tsx @@ -99,24 +99,23 @@ class DashboardIndex extends PureComponent { - ( - - )} - onDeleteDashboard={handleDeleteDashboard} - onCreateDashboard={createDashboard} - onCloneDashboard={cloneDashboard} - onUpdateDashboard={handleUpdateDashboard} - searchTerm={searchTerm} - onFilterChange={this.handleFilterDashboards} - onImportDashboard={this.summonImportOverlay} - /> - + /> + ( + + )} + onDeleteDashboard={handleDeleteDashboard} + onCreateDashboard={createDashboard} + onCloneDashboard={cloneDashboard} + onUpdateDashboard={handleUpdateDashboard} + searchTerm={searchTerm} + onFilterChange={this.handleFilterDashboards} + onImportDashboard={this.summonImportOverlay} + /> diff --git a/ui/src/dataExplorer/components/DataExplorer.tsx b/ui/src/dataExplorer/components/DataExplorer.tsx index cd4d485ae1..e124d6f41a 100644 --- a/ui/src/dataExplorer/components/DataExplorer.tsx +++ b/ui/src/dataExplorer/components/DataExplorer.tsx @@ -45,18 +45,17 @@ class DataExplorer extends PureComponent { const {resourceName, limitStatus} = this.props return ( -
- - - - - - - -
+ + +
+ + + +
+
) } } diff --git a/ui/src/shared/components/cloud/CloudOnly.scss b/ui/src/shared/components/cloud/CloudOnly.scss new file mode 100644 index 0000000000..d59708a074 --- /dev/null +++ b/ui/src/shared/components/cloud/CloudOnly.scss @@ -0,0 +1,4 @@ +.dashboard--asset-alert { + padding: 0 $page-gutter; + width: 100% +} \ No newline at end of file diff --git a/ui/src/style/chronograf.scss b/ui/src/style/chronograf.scss index 9e9bc2b2c6..6b69ccf945 100644 --- a/ui/src/style/chronograf.scss +++ b/ui/src/style/chronograf.scss @@ -109,7 +109,11 @@ @import 'src/onboarding/components/SigninForm.scss'; @import 'src/shared/components/ThresholdsSettings.scss'; @import 'src/shared/components/ThresholdMarkers.scss'; +<<<<<<< HEAD @import 'src/shared/components/DeleteDataForm/DeleteDataForm.scss'; +======= +@import 'src/shared/components/cloud/CloudOnly.scss'; +>>>>>>> fix(ui/asset-alert): fix asset-alert clipping dashboard contents // External diff --git a/ui/src/tasks/containers/TasksPage.tsx b/ui/src/tasks/containers/TasksPage.tsx index 77648345f6..b2e5e15076 100644 --- a/ui/src/tasks/containers/TasksPage.tsx +++ b/ui/src/tasks/containers/TasksPage.tsx @@ -134,42 +134,41 @@ class TasksPage extends PureComponent { + + list={this.filteredTasks} + searchTerm={searchTerm} + searchKeys={['name', 'labels[].name']} > - - list={this.filteredTasks} - searchTerm={searchTerm} - searchKeys={['name', 'labels[].name']} - > - {ts => ( - this.search} - onUpdate={updateTaskName} - onImportTask={this.summonImportOverlay} - onImportFromTemplate={ - this.summonImportFromTemplateOverlay - } - sortKey={sortKey} - sortDirection={sortDirection} - sortType={sortType} - onClickColumn={this.handleClickColumn} - checkTaskLimits={checkTaskLimits} - /> - )} - - {this.hiddenTaskAlert} - + {ts => ( + this.search} + onUpdate={updateTaskName} + onImportTask={this.summonImportOverlay} + onImportFromTemplate={ + this.summonImportFromTemplateOverlay + } + sortKey={sortKey} + sortDirection={sortDirection} + sortType={sortType} + onClickColumn={this.handleClickColumn} + checkTaskLimits={checkTaskLimits} + /> + )} + + {this.hiddenTaskAlert}