Skip to content

KER-270 react-bootstrap #1198

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

Merged
mikkojamG merged 3 commits into from
Oct 16, 2025
Merged

KER-270 react-bootstrap #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12f7b91
refactor: remove react-boostrap components Ref: KER-270
mikkojamG Oct 16, 2025
f74e96f
deps: remove react-bootstrap Ref: KER-270
mikkojamG Oct 16, 2025
1946745
chore: hearingHeader fix preview link migration Ref: KER-270
mikkojamG Oct 16, 2025
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
8 changes: 0 additions & 8 deletions .babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@
[
"transform-imports",
{
"react-bootstrap": {
"transform": "react-bootstrap/lib/${member}",
"preventFullImport": true
},
"lodash": {
"transform": "lodash/${member}",
"preventFullImport": true
Expand All @@ -45,10 +41,6 @@
[
"transform-imports",
{
"react-bootstrap": {
"transform": "react-bootstrap/lib/${member}",
"preventFullImport": true
},
"lodash": {
"transform": "lodash/${member}",
"preventFullImport": true
Expand Down
1 change: 1 addition & 0 deletions assets/sass/kerrokantasi/_hearing-page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

.hearing-header {
&-title {
display: flex;
margin-top: 0;
margin-bottom: $line-height-computed;

Expand Down
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
"qs": "^6.11.2",
"react": "^18.0.0",
"react-anchor-link-smooth-scroll": "^1.0.12",
"react-bootstrap": "0.33.1",
"react-datetime": "^2.2.0",
"react-device-detect": "^2.2.3",
"react-dom": "^18.0.0",
Expand Down
53 changes: 20 additions & 33 deletions src/components/Hearing/Header.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import isEmpty from 'lodash/isEmpty';
import keys from 'lodash/keys';
import PropTypes from 'prop-types';
import moment from 'moment';
import { Col, Grid, OverlayTrigger, Row, Tooltip } from 'react-bootstrap';
import { Button } from 'hds-react';
import { Button, Tooltip } from 'hds-react';
import { connect, useDispatch, useSelector } from 'react-redux';
import { FormattedPlural, FormattedMessage, useIntl } from 'react-intl';
import { stringify } from 'qs';
Expand Down Expand Up @@ -218,7 +217,7 @@ function HeaderComponent(props) {
</span>
);
}
return <Tooltip id='eye-tooltip'>{text}</Tooltip>;
return text;
};

const writeToClipboard = (url) => {
Expand All @@ -234,18 +233,9 @@ function HeaderComponent(props) {

const getPreviewLinkButton = () => (
<div className='hearing-meta__element'>
<OverlayTrigger
placement='bottom'
overlay={
<Tooltip id='hearingPreviewLink'>
<FormattedMessage id='hearingPreviewLinkTooltip'>{(text) => text}</FormattedMessage>
</Tooltip>
}
>
<Button className='kerrokantasi-btn info' onClick={() => writeToClipboard(hearing.preview_url)}>
<FormattedMessage id='hearingPreviewLink'>{(text) => text}</FormattedMessage>
</Button>
</OverlayTrigger>
<Button className='kerrokantasi-btn info' onClick={() => writeToClipboard(hearing.preview_url)}>
<FormattedMessage id='hearingPreviewLinkTooltip'>{(text) => text}</FormattedMessage>
</Button>
</div>
);

Expand Down Expand Up @@ -279,39 +269,36 @@ function HeaderComponent(props) {
return (
<>
<div className='header-section'>
<Grid>
<div className='container'>
<div className='hearing-header'>
<Row>
<Col md={9}>
<div className='row'>
<div className='col-md-9'>
<h1 className='hearing-header-title'>
{!isPublic(hearing) && (
<OverlayTrigger placement='bottom' overlay={getEyeTooltip()}>
<span>
<Icon name='eye-slash' />
&nbsp;
</span>
</OverlayTrigger>
<Tooltip placement='bottom' style={{ marginRight: 'var(--spacing-2-xs)' }}>
{getEyeTooltip()}
</Tooltip>
)}
{getAttr(hearing.title, language)}
</h1>
</Col>
</div>
{isMainSection(section) && config.showSocialMediaSharing && (
<Col md={3}>
<div className='col-md-3'>
<SocialBar />
</Col>
</div>
)}
</Row>
</div>
{isMainSection(section) ? (
<>
{!isEmpty(section.abstract) && (
<Row>
<Col md={9}>
<div className='row'>
<div className='col-md-9'>
<div
className='header-abstract lead'
dangerouslySetInnerHTML={{ __html: getAttr(section.abstract, language) }}
/>
</Col>
</Row>
</div>
</div>
)}
<div className='hearing-meta'>
{getTimetableText(hearing)}
Expand All @@ -330,7 +317,7 @@ function HeaderComponent(props) {
</Link>
)}
</div>
</Grid>
</div>
</div>
{showClosureInfo && <SectionClosureInfo content={closureInfoContent} />}
</>
Expand Down
Loading
Loading