Skip to content

EC-1111 Consultation document preview does not use the document title #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexPowell-nice wants to merge 1 commit into
base: master
Choose a base branch
from
Open

EC-1111 Consultation document preview does not use the document title #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions Comments/ClientApp/src/components/DocumentPreview/DocumentPreview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,16 +297,28 @@ export class DocumentPreview extends Component<PropsType, StateType> {
this.setState({ chapterData });
};

getCurrentDocumentTitle = () => {
const documents = this.state.documentsData;
const documentId = parseInt(this.props.match.params.documentId, 0);
const matchCurrentDocument = d => d.documentId === parseInt(documentId, 0);
const currentDocumentDetails = documents.filter(matchCurrentDocument)[0];
return currentDocumentDetails.title;
};

getPageTitle = () => {
return `${this.getCurrentDocumentTitle()} | ${this.state.consultationData.title}`;
};

render() {
if (this.state.error.hasError) { throw new Error(this.state.error.message); }
if (!this.state.hasInitialData && this.state.isAuthorised) return <h1>Loading...</h1>;
const { title, reference } = this.state.consultationData || {};
const { reference } = this.state.consultationData || {};
const { content } = this.state.chapterData || {};
const documentId = parseInt(this.props.match.params.documentId, 0);
return (
<Fragment>
<Helmet>
<title>{title}</title>
<title>{this.getPageTitle()}</title>
</Helmet>
<UserContext.Consumer>
{(contextValue: any) => !contextValue.isAuthorised ?
Expand All @@ -327,7 +339,7 @@ export class DocumentPreview extends Component<PropsType, StateType> {
}
<main role="main">
<Header
title={title}
title={this.getCurrentDocumentTitle()}
reference={reference}
consultationState={this.state.consultationData.consultationState}/>
<div className="grid">
Expand Down
2 changes: 1 addition & 1 deletion ...ntApp/src/components/DocumentPreview/__tests__/__snapshots__/DocumentPreview.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ exports[`should match snapshot with supplied data 1`] = `
class="page-header__heading mt--0"
data-qa-sel="changeable-page-header"
>
Warren's Project
DRAFT_Appendices_A-T_CLEAN.docx
</h1>
<div
class="mb--d"
Expand Down