colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent 'still loading' image requests

This commit is contained in:
Jannis Mattheis 2019-03-16 18:18:41 +01:00
parent 0dfdc78160
commit 144f5fb8e4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/src/message/Message.tsx
View File

@ -57,13 +57,15 @@ class Message extends React.PureComponent<IProps & WithStyles<typeof styles>> {
<div className={`${classes.wrapperPadding} message`} ref={(ref) => (this.node = ref)}> <div className={`${classes.wrapperPadding} message`} ref={(ref) => (this.node = ref)}>
<Container style={{display: 'flex'}}> <Container style={{display: 'flex'}}>
<div className={classes.imageWrapper}> <div className={classes.imageWrapper}>
<img {image !== null ? (
src={config.get('url') + image} <img
alt="app logo" src={config.get('url') + image}
width="70" alt="app logo"
height="70" width="70"
className={classes.image} height="70"
/> className={classes.image}
/>
) : null}
</div> </div>
<div className={classes.messageContentWrapper}> <div className={classes.messageContentWrapper}>
<div className={classes.header}> <div className={classes.header}>

4
ui/src/message/MessagesStore.ts
View File

@ -127,7 +127,7 @@ export class MessagesStore {
} }
}; };
private getUnCached = (appId: number): Array<IMessage & {image: string}> => { private getUnCached = (appId: number): Array<IMessage & {image: string | null}> => {
const appToImage = this.appStore const appToImage = this.appStore
.getItems() .getItems()
.reduce((all, app) => ({...all, [app.id]: app.image}), {}); .reduce((all, app) => ({...all, [app.id]: app.image}), {});
@ -135,7 +135,7 @@ export class MessagesStore {
return this.stateOf(appId, false).messages.map((message: IMessage) => { return this.stateOf(appId, false).messages.map((message: IMessage) => {
return { return {
...message, ...message,
image: appToImage[message.appid] || 'still loading', image: appToImage[message.appid] || null,
}; };
}); });
}; };