Skip to content
Snippets Groups Projects
Unverified Commit 77c8c800 authored by Nick Fitzpatrick's avatar Nick Fitzpatrick Committed by GitHub
Browse files

Updating Model title (#23763)

parent d51174d8
No related branches found
No related tags found
No related merge requests found
...@@ -61,3 +61,4 @@ export function HeadBreadcrumbs({ ...@@ -61,3 +61,4 @@ export function HeadBreadcrumbs({
} }
HeadBreadcrumbs.Badge = HeaderBadge; HeadBreadcrumbs.Badge = HeaderBadge;
HeadBreadcrumbs.Divider = Divider;
...@@ -45,6 +45,7 @@ import { ...@@ -45,6 +45,7 @@ import {
StyledLastEditInfoLabel, StyledLastEditInfoLabel,
StyledQuestionDataSource, StyledQuestionDataSource,
SavedQuestionLeftSideRoot, SavedQuestionLeftSideRoot,
HeaderDivider,
} from "./ViewHeader.styled"; } from "./ViewHeader.styled";
const viewTitleHeaderPropTypes = { const viewTitleHeaderPropTypes = {
...@@ -184,6 +185,7 @@ function SavedQuestionLeftSide(props) { ...@@ -184,6 +185,7 @@ function SavedQuestionLeftSide(props) {
}); });
const hasLastEditInfo = question.lastEditInfo() != null; const hasLastEditInfo = question.lastEditInfo() != null;
const isDataset = question.isDataset();
const onHeaderChange = useCallback( const onHeaderChange = useCallback(
name => { name => {
...@@ -200,16 +202,31 @@ function SavedQuestionLeftSide(props) { ...@@ -200,16 +202,31 @@ function SavedQuestionLeftSide(props) {
showSubHeader={showSubHeader} showSubHeader={showSubHeader}
> >
<ViewHeaderMainLeftContentContainer> <ViewHeaderMainLeftContentContainer>
<SavedQuestionHeaderButtonContainer> <SavedQuestionHeaderButtonContainer isDataset={isDataset}>
<SavedQuestionHeaderButton <HeadBreadcrumbs
question={question} divider={<HeaderDivider>/</HeaderDivider>}
onSave={onHeaderChange} parts={[
...(isAdditionalInfoVisible && isDataset
? [
<DatasetCollectionBadge
key="collection"
dataset={question}
/>,
]
: []),
<SavedQuestionHeaderButton
key="question-title"
question={question}
onSave={onHeaderChange}
/>,
]}
/> />
</SavedQuestionHeaderButtonContainer> </SavedQuestionHeaderButtonContainer>
</ViewHeaderMainLeftContentContainer> </ViewHeaderMainLeftContentContainer>
{isAdditionalInfoVisible && ( {isAdditionalInfoVisible && (
<ViewHeaderLeftSubHeading> <ViewHeaderLeftSubHeading>
{QuestionDataSource.shouldRender(props) && ( {QuestionDataSource.shouldRender(props) && !isDataset && (
<StyledQuestionDataSource <StyledQuestionDataSource
question={question} question={question}
isObjectDetail={isObjectDetail} isObjectDetail={isObjectDetail}
......
...@@ -8,7 +8,6 @@ import { color, alpha } from "metabase/lib/colors"; ...@@ -8,7 +8,6 @@ import { color, alpha } from "metabase/lib/colors";
import { breakpointMaxSmall, space } from "metabase/styled-components/theme"; import { breakpointMaxSmall, space } from "metabase/styled-components/theme";
import ViewSection, { ViewSubHeading, ViewHeading } from "./ViewSection"; import ViewSection, { ViewSubHeading, ViewHeading } from "./ViewSection";
import QuestionDataSource from "./QuestionDataSource"; import QuestionDataSource from "./QuestionDataSource";
import SavedQuestionHeaderButton from "../SavedQuestionHeaderButton/SavedQuestionHeaderButton";
export const ViewHeaderContainer = styled(ViewSection)` export const ViewHeaderContainer = styled(ViewSection)`
border-bottom: 1px solid ${color("border")}; border-bottom: 1px solid ${color("border")};
...@@ -47,8 +46,7 @@ export const SaveButton = styled(Link)` ...@@ -47,8 +46,7 @@ export const SaveButton = styled(Link)`
`; `;
export const SavedQuestionHeaderButtonContainer = styled.div` export const SavedQuestionHeaderButtonContainer = styled.div`
position: relative; right: ${props => (props.isDataset ? "0px" : "0.38rem")};
right: 0.38rem;
`; `;
export const HeaderButton = styled(Button)` export const HeaderButton = styled(Button)`
...@@ -105,7 +103,7 @@ export const ViewSubHeaderRoot = styled(ViewSection)` ...@@ -105,7 +103,7 @@ export const ViewSubHeaderRoot = styled(ViewSection)`
export const StyledLastEditInfoLabel = styled(LastEditInfoLabel)` export const StyledLastEditInfoLabel = styled(LastEditInfoLabel)`
color: ${color("text-light")}; color: ${color("text-light")};
margin-left: 4px; //margin-left: 4px;
${breakpointMaxSmall} { ${breakpointMaxSmall} {
margin-left: 0; margin-left: 0;
...@@ -124,7 +122,7 @@ export const StyledQuestionDataSource = styled(QuestionDataSource)` ...@@ -124,7 +122,7 @@ export const StyledQuestionDataSource = styled(QuestionDataSource)`
`; `;
export const SavedQuestionLeftSideRoot = styled.div` export const SavedQuestionLeftSideRoot = styled.div`
${SavedQuestionHeaderButton.Root} { ${SavedQuestionHeaderButtonContainer} {
transition: all 400ms ease; transition: all 400ms ease;
position: relative; position: relative;
top: ${props => (props.showSubHeader ? "0" : "10px")}; top: ${props => (props.showSubHeader ? "0" : "10px")};
...@@ -137,7 +135,7 @@ export const SavedQuestionLeftSideRoot = styled.div` ...@@ -137,7 +135,7 @@ export const SavedQuestionLeftSideRoot = styled.div`
&:hover, &:hover,
&:focus-within { &:focus-within {
${SavedQuestionHeaderButton.Root} { ${SavedQuestionHeaderButtonContainer} {
top: 0px; top: 0px;
} }
...@@ -146,3 +144,12 @@ export const SavedQuestionLeftSideRoot = styled.div` ...@@ -146,3 +144,12 @@ export const SavedQuestionLeftSideRoot = styled.div`
} }
} }
`; `;
export const HeaderDivider = styled.span`
font-size: 1.25rem;
line-height: 1.5rem;
font-weight: 700;
color: ${color("text-medium")};
padding-left: 0.5rem;
padding-right: 0.25rem;
`;
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