Skip to content
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

Jump to bottom

Convert Wikimedia classes to components #3407

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

Convert Wikimedia classes to components #3407

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
85 changes: 46 additions & 39 deletions root/static/scripts/common/components/CommonsImage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,48 +12,55 @@ import * as React from 'react';
import {minimalEntity} from '../../../../utility/hydrate.js';
import entityHref from '../utility/entityHref.js';

type Props = {
+cachedImage: ?CommonsImageT,
+entity: NonUrlRelatableEntityT,
};

type State = {
image: ?CommonsImageT,
};

class CommonsImage extends React.Component<Props, State> {
constructor(props: Props) {
super(props);
this.state = {image: props.cachedImage};
}

componentDidMount() {
if (!this.state.image) {
const $ = require('jquery');
$.get(entityHref(this.props.entity, '/commons-image'), data => {
this.setState({image: data.image});
});
type CommonsImageRequestCallbackT = (CommonsImageT | null) => void;

function loadCommonsImage(
entity: NonUrlRelatableEntityT,
callback: CommonsImageRequestCallbackT,
): void {
const url = entityHref(entity, '/commons-image');

fetch(url)
.then(resp => resp.json())
.then((reqData) => {
callback(reqData.image);
})
.finally(() => {
});
}

component CommonsImage(
cachedImage: ?CommonsImageT,
entity: NonUrlRelatableEntityT,
) {
const [commonsImage, setCommonsImage] = React.useState(cachedImage);

const loadCallback: CommonsImageRequestCallbackT =
React.useCallback((data) => {
setCommonsImage(data);
}, [setCommonsImage]);

React.useEffect(() => {
if (cachedImage == null) {
loadCommonsImage(entity, loadCallback);
}
}

render(): React.MixedElement | null {
const {image} = this.state;
return image ? (
<div className="picture">
<img src={image.thumb_url} />
<br />
<span className="picture-note">
<a href={image.page_url}>
{l('Image from Wikimedia Commons')}
</a>
</span>
</div>
) : null;
}
}, [entity, loadCallback]);

return commonsImage ? (
<div className="picture">
<img src={commonsImage.thumb_url} />
<br />
<span className="picture-note">
<a href={commonsImage.page_url}>
{l('Image from Wikimedia Commons')}
</a>
</span>
</div>
) : null;
}

export default (hydrate<Props>(
export default (hydrate<React.PropsOf<CommonsImage>>(
'div.commons-image',
CommonsImage,
minimalEntity,
): React.AbstractComponent<Props, void>);
): component(...React.PropsOf<CommonsImage>));
98 changes: 52 additions & 46 deletions root/static/scripts/common/components/WikipediaExtract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,59 +31,65 @@ type MinimalEntityWithWikipediaExtractT = {
+gid: string,
};

type Props = {
+cachedWikipediaExtract: WikipediaExtractT | null,
+entity:
| EntityWithWikipediaExtractT
| MinimalEntityWithWikipediaExtractT,
};
type WikipediaExtractRequestCallbackT = (WikipediaExtractT | null) => void;

type State = {
wikipediaExtract: WikipediaExtractT | null,
};
function loadWikipediaExtract(
entity: EntityWithWikipediaExtractT | MinimalEntityWithWikipediaExtractT,
callback: WikipediaExtractRequestCallbackT,
): void {
const url = entityHref(entity, '/wikipedia-extract');

fetch(url)
.then(resp => resp.json())
.then((reqData) => {
callback(reqData.wikipediaExtract);
})
.finally(() => {
});
}

component WikipediaExtract(
cachedWikipediaExtract: WikipediaExtractT | null,
entity: EntityWithWikipediaExtractT | MinimalEntityWithWikipediaExtractT,
) {
const [wikipediaExtract, setWikipediaExtract] =
React.useState(cachedWikipediaExtract);

class WikipediaExtract extends React.Component<Props, State> {
constructor(props: Props) {
super(props);
this.state = {wikipediaExtract: props.cachedWikipediaExtract};
}
const loadCallback: WikipediaExtractRequestCallbackT =
React.useCallback((data) => {
setWikipediaExtract(data);
}, [setWikipediaExtract]);

componentDidMount() {
if (!this.state.wikipediaExtract) {
const $ = require('jquery');
$.get(entityHref(this.props.entity, '/wikipedia-extract'), data => {
this.setState(data);
});
React.useEffect(() => {
if (cachedWikipediaExtract == null) {
loadWikipediaExtract(entity, loadCallback);
}
}
}, [entity, loadCallback]);

render(): React.MixedElement | null {
const {wikipediaExtract} = this.state;
return wikipediaExtract ? (
<>
<h2 className="wikipedia">{l('Wikipedia')}</h2>
<Collapsible
className="wikipedia-extract"
html={wikipediaExtract.content}
/>
<a href={wikipediaExtract.url}>
{l('Continue reading at Wikipedia...')}
</a>
{' '}
<small>
{exp.l(
`Wikipedia content provided under the terms of the
{license_link|Creative Commons BY-SA license}`,
{license_link: 'https://creativecommons.org/licenses/by-sa/3.0/'},
)}
</small>
</>
) : null;
}
return wikipediaExtract ? (
<>
<h2 className="wikipedia">{l('Wikipedia')}</h2>
<Collapsible
className="wikipedia-extract"
html={wikipediaExtract.content}
/>
<a href={wikipediaExtract.url}>
{l('Continue reading at Wikipedia...')}
</a>
{' '}
<small>
{exp.l(
`Wikipedia content provided under the terms of the
{license_link|Creative Commons BY-SA license}`,
{license_link: 'https://creativecommons.org/licenses/by-sa/3.0/'},
)}
</small>
</>
) : null;
}

export default (hydrate<Props>(
export default (hydrate<React.PropsOf<WikipediaExtract>>(
'div.wikipedia-extract',
WikipediaExtract,
minimalEntity,
): React.AbstractComponent<Props, void>);
): component(...React.PropsOf<WikipediaExtract>));