Make margins in orgs dashboard index consistent with other orgs indeces

Co-Authored-By: palakp41 <palak@influxdata.com>
pull/11775/head^2
Alex P 2019-02-07 16:18:53 -08:00
parent 25cd62b476
commit 9766eb03dd
4 changed files with 64 additions and 73 deletions

View File

@ -46,22 +46,20 @@ export default class DashboardsIndexContents extends Component<Props> {
} = this.props
return (
<div className="col-md-12">
<Table
searchTerm={searchTerm}
dashboards={this.filteredDashboards}
onDeleteDashboard={onDeleteDashboard}
onCreateDashboard={onCreateDashboard}
onCloneDashboard={onCloneDashboard}
onExportDashboard={onExportDashboard}
defaultDashboardLink={defaultDashboardLink}
onSetDefaultDashboard={onSetDefaultDashboard}
onUpdateDashboard={onUpdateDashboard}
onEditLabels={onEditLabels}
orgs={orgs}
showInlineEdit={showInlineEdit}
/>
</div>
<Table
searchTerm={searchTerm}
dashboards={this.filteredDashboards}
onDeleteDashboard={onDeleteDashboard}
onCreateDashboard={onCreateDashboard}
onCloneDashboard={onCloneDashboard}
onExportDashboard={onExportDashboard}
defaultDashboardLink={defaultDashboardLink}
onSetDefaultDashboard={onSetDefaultDashboard}
onUpdateDashboard={onUpdateDashboard}
onEditLabels={onEditLabels}
orgs={orgs}
showInlineEdit={showInlineEdit}
/>
)
}

View File

@ -132,20 +132,22 @@ class DashboardIndex extends PureComponent<Props, State> {
</Page.Header.Right>
</Page.Header>
<Page.Contents fullWidth={false} scrollable={true}>
<DashboardsContents
dashboards={dashboards}
orgs={orgs}
onSetDefaultDashboard={this.handleSetDefaultDashboard}
defaultDashboardLink={links.defaultDashboard}
onDeleteDashboard={this.handleDeleteDashboard}
onCreateDashboard={this.handleCreateDashboard}
onCloneDashboard={this.handleCloneDashboard}
onExportDashboard={this.handleExportDashboard}
onUpdateDashboard={handleUpdateDashboard}
onEditLabels={this.handleStartEditingLabels}
notify={notify}
searchTerm={searchTerm}
/>
<div className="col-md-12">
<DashboardsContents
dashboards={dashboards}
orgs={orgs}
onSetDefaultDashboard={this.handleSetDefaultDashboard}
defaultDashboardLink={links.defaultDashboard}
onDeleteDashboard={this.handleDeleteDashboard}
onCreateDashboard={this.handleCreateDashboard}
onCloneDashboard={this.handleCloneDashboard}
onExportDashboard={this.handleExportDashboard}
onUpdateDashboard={handleUpdateDashboard}
onEditLabels={this.handleStartEditingLabels}
notify={notify}
searchTerm={searchTerm}
/>
</div>
</Page.Contents>
</Page>
{this.renderImportOverlay}

View File

@ -6,13 +6,11 @@ import _ from 'lodash'
import {ComponentSize, EmptyState, IconFont, Input} from 'src/clockface'
import MemberList from 'src/organizations/components/MemberList'
import FilterList from 'src/shared/components/Filter'
import TabbedPageHeader from 'src/shared/components/tabbed_page/TabbedPageHeader'
// Types
import {ResourceOwner} from '@influxdata/influx'
// Constants
import TabbedPageHeader from 'src/shared/components/tabbed_page/TabbedPageHeader'
interface Props {
members: ResourceOwner[]
orgName: string

View File

@ -17,6 +17,7 @@ import {
} from 'src/clockface'
import ImportDashboardOverlay from 'src/dashboards/components/ImportDashboardOverlay'
import EditLabelsOverlay from 'src/shared/components/EditLabelsOverlay'
import TabbedPageHeader from 'src/shared/components/tabbed_page/TabbedPageHeader'
// Utils
import {getDeep} from 'src/utils/wrappers'
@ -116,46 +117,38 @@ class OrgDashboardIndex extends PureComponent<Props, State> {
return (
<>
<Page titleTag="Dashboards">
<Page.Header fullWidth={false}>
<Page.Header.Left>
<Input
icon={IconFont.Search}
placeholder="Filter tasks..."
widthPixels={290}
value={searchTerm}
onChange={this.handleFilterChange}
onBlur={this.handleFilterBlur}
/>
</Page.Header.Left>
<Page.Header.Right>
<Button
color={ComponentColor.Primary}
onClick={this.handleCreateDashboard}
icon={IconFont.Plus}
text="Create Dashboard"
titleText="Create a new dashboard"
/>
</Page.Header.Right>
</Page.Header>
<Page.Contents fullWidth={false} scrollable={true}>
<DashboardsContents
dashboards={dashboards}
orgs={orgs}
onSetDefaultDashboard={this.handleSetDefaultDashboard}
defaultDashboardLink={links.defaultDashboard}
onDeleteDashboard={this.handleDeleteDashboard}
onCreateDashboard={this.handleCreateDashboard}
onCloneDashboard={this.handleCloneDashboard}
onExportDashboard={this.handleExportDashboard}
onUpdateDashboard={handleUpdateDashboard}
onEditLabels={this.handleStartEditingLabels}
notify={notify}
searchTerm={searchTerm}
showInlineEdit={true}
/>
</Page.Contents>
</Page>
<TabbedPageHeader>
<Input
icon={IconFont.Search}
placeholder="Filter tasks..."
widthPixels={290}
value={searchTerm}
onChange={this.handleFilterChange}
onBlur={this.handleFilterBlur}
/>
<Button
color={ComponentColor.Primary}
onClick={this.handleCreateDashboard}
icon={IconFont.Plus}
text="Create Dashboard"
titleText="Create a new dashboard"
/>
</TabbedPageHeader>
<DashboardsContents
dashboards={dashboards}
orgs={orgs}
onSetDefaultDashboard={this.handleSetDefaultDashboard}
defaultDashboardLink={links.defaultDashboard}
onDeleteDashboard={this.handleDeleteDashboard}
onCreateDashboard={this.handleCreateDashboard}
onCloneDashboard={this.handleCloneDashboard}
onExportDashboard={this.handleExportDashboard}
onUpdateDashboard={handleUpdateDashboard}
onEditLabels={this.handleStartEditingLabels}
notify={notify}
searchTerm={searchTerm}
showInlineEdit={true}
/>
{this.renderImportOverlay}
{this.renderLabelEditorOverlay}
</>