Skip to content
Snippets Groups Projects
Unverified Commit 2e01bd53 authored by Anton Kulyk's avatar Anton Kulyk Committed by GitHub
Browse files

Fix data app page style (#25881)

* Remove info sidebar for data app pages

* Fix "Last edited by" text behavior
parent a68e9880
No related branches found
No related tags found
No related merge requests found
...@@ -74,6 +74,7 @@ export const HeaderLastEditInfoLabel = styled(LastEditInfoLabel)` ...@@ -74,6 +74,7 @@ export const HeaderLastEditInfoLabel = styled(LastEditInfoLabel)`
interface HeaderContentProps { interface HeaderContentProps {
showSubHeader: boolean; showSubHeader: boolean;
hasSubHeader: boolean;
} }
export const HeaderContent = styled.div<HeaderContentProps>` export const HeaderContent = styled.div<HeaderContentProps>`
...@@ -86,8 +87,8 @@ export const HeaderContent = styled.div<HeaderContentProps>` ...@@ -86,8 +87,8 @@ export const HeaderContent = styled.div<HeaderContentProps>`
opacity: ${props => (props.showSubHeader ? "1x" : "0")}; opacity: ${props => (props.showSubHeader ? "1x" : "0")};
} }
${({ showSubHeader }) => ${({ hasSubHeader }) =>
showSubHeader && hasSubHeader &&
css` css`
&:hover, &:hover,
&:focus-within { &:focus-within {
......
...@@ -137,7 +137,7 @@ const DashboardHeader = ({ ...@@ -137,7 +137,7 @@ const DashboardHeader = ({
className={cx("QueryBuilder-section", headerClassName)} className={cx("QueryBuilder-section", headerClassName)}
ref={header} ref={header}
> >
<HeaderContent showSubHeader={!isDataApp && showSubHeader}> <HeaderContent hasSubHeader={!isDataApp} showSubHeader={showSubHeader}>
<HeaderCaptionContainer> <HeaderCaptionContainer>
<HeaderCaption <HeaderCaption
key={dashboard.name} key={dashboard.name}
......
...@@ -34,10 +34,13 @@ import { ...@@ -34,10 +34,13 @@ import {
} from "./DashboardHeader.styled"; } from "./DashboardHeader.styled";
const mapStateToProps = (state, props) => { const mapStateToProps = (state, props) => {
const isDataApp = props.dashboard.is_app_page;
const isShowingDashboardInfoSidebar =
!isDataApp && getIsShowDashboardInfoSidebar(state);
return { return {
isBookmarked: getIsBookmarked(state, props), isBookmarked: getIsBookmarked(state, props),
isNavBarOpen: getIsNavbarOpen(state), isNavBarOpen: getIsNavbarOpen(state),
isShowingDashboardInfoSidebar: getIsShowDashboardInfoSidebar(state), isShowingDashboardInfoSidebar,
}; };
}; };
...@@ -196,6 +199,7 @@ class DashboardHeader extends Component { ...@@ -196,6 +199,7 @@ class DashboardHeader extends Component {
closeSidebar, closeSidebar,
} = this.props; } = this.props;
const isDataAppPage = dashboard.is_app_page;
const canEdit = dashboard.can_write && isEditable && !!dashboard; const canEdit = dashboard.can_write && isEditable && !!dashboard;
const buttons = []; const buttons = [];
...@@ -361,24 +365,26 @@ class DashboardHeader extends Component { ...@@ -361,24 +365,26 @@ class DashboardHeader extends Component {
onDeleteBookmark={deleteBookmark} onDeleteBookmark={deleteBookmark}
isBookmarked={isBookmarked} isBookmarked={isBookmarked}
/>, />,
<Tooltip key="dashboard-info-button" tooltip={t`More info`}> !isDataAppPage && (
<DashboardHeaderButton <Tooltip key="dashboard-info-button" tooltip={t`More info`}>
icon="info" <DashboardHeaderButton
isActive={isShowingDashboardInfoSidebar} icon="info"
onClick={() => isActive={isShowingDashboardInfoSidebar}
isShowingDashboardInfoSidebar onClick={() =>
? closeSidebar() isShowingDashboardInfoSidebar
: setSidebar({ name: SIDEBAR_NAME.info }) ? closeSidebar()
} : setSidebar({ name: SIDEBAR_NAME.info })
/> }
</Tooltip>, />
</Tooltip>
),
<EntityMenu <EntityMenu
key="dashboard-action-menu-button" key="dashboard-action-menu-button"
items={extraButtons} items={extraButtons}
triggerIcon="ellipsis" triggerIcon="ellipsis"
tooltip={t`Move, archive, and more...`} tooltip={t`Move, archive, and more...`}
/>, />,
], ].filter(Boolean),
); );
} }
...@@ -395,6 +401,7 @@ class DashboardHeader extends Component { ...@@ -395,6 +401,7 @@ class DashboardHeader extends Component {
setSidebar, setSidebar,
} = this.props; } = this.props;
const isDataAppPage = dashboard.is_app_page;
const hasLastEditInfo = dashboard["last-edit-info"] != null; const hasLastEditInfo = dashboard["last-edit-info"] != null;
return ( return (
...@@ -405,7 +412,9 @@ class DashboardHeader extends Component { ...@@ -405,7 +412,9 @@ class DashboardHeader extends Component {
dashboard={dashboard} dashboard={dashboard}
isEditing={isEditing} isEditing={isEditing}
isBadgeVisible={!isEditing && !isFullscreen && isAdditionalInfoVisible} isBadgeVisible={!isEditing && !isFullscreen && isAdditionalInfoVisible}
isLastEditInfoVisible={hasLastEditInfo && isAdditionalInfoVisible} isLastEditInfoVisible={
!isDataAppPage && hasLastEditInfo && isAdditionalInfoVisible
}
isEditingInfo={isEditing} isEditingInfo={isEditing}
isNavBarOpen={this.props.isNavBarOpen} isNavBarOpen={this.props.isNavBarOpen}
headerButtons={this.getHeaderButtons()} headerButtons={this.getHeaderButtons()}
......
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