Skip to content

Commit 1f03c02

Browse files
committed
add empty log message
Fixes #6 Fixes #25
1 parent a1f853f commit 1f03c02

File tree

4 files changed

+53
-37
lines changed

4 files changed

+53
-37
lines changed

build/main.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/main.js

Lines changed: 20 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/App.js

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class App extends Component {
6767
setLevel (level, newState) {
6868
let levels = this.state.levels;
6969
levels[level] = newState;
70-
const entries = this.state.entries.filter(entry=> {
70+
const entries = this.state.entries.filter(entry => {
7171
return this.state.levels[entry.level];
7272
});
7373
if (entries.length < 50) {
@@ -94,14 +94,14 @@ export class App extends Component {
9494
};
9595

9696
render () {
97-
let entries = this.state.entries.filter(entry=> {
97+
let entries = this.state.entries.filter(entry => {
9898
if (!entry.level && entry.level !== 0) {
9999
return true;
100100
}
101101
return this.state.levels[entry.level];
102102
});
103103

104-
let filters = this.state.levels.map((status, level)=> {
104+
let filters = this.state.levels.map((status, level) => {
105105
return (
106106
<ToggleEntry key={level} active={status}
107107
onChange={this.setLevel.bind(this, level)}>
@@ -110,6 +110,33 @@ export class App extends Component {
110110
);
111111
});
112112

113+
let content;
114+
115+
if (entries.length > 0) {
116+
content = <ReactScrolla
117+
id="app-content"
118+
percentage={85}
119+
onPercentage={this.fetchNextPage}
120+
isLoading={this.state.loading}>
121+
<div className={styles.content}>
122+
<LogTable
123+
inlineSettings={this.props.inlineSettings}
124+
levels={this.state.levels}
125+
setRelative={this.setRelative}
126+
setLevel={this.setLevel.bind(this)}
127+
entries={entries}
128+
relative={this.state.relative}
129+
dateFormat={this.state.dateFormat}/>
130+
</div>
131+
</ReactScrolla>
132+
} else {
133+
content = <div className="emptycontent">
134+
<div className="icon-filetype-text"/>
135+
<h2>{t('logreader', 'No server logs')}</h2>
136+
<p>{t('logreader', 'Everything is working fine')}</p>
137+
</div>
138+
}
139+
113140
return (
114141

115142
<AppContainer appId="logreader">
@@ -128,22 +155,7 @@ export class App extends Component {
128155
</SideBar>
129156
: <div/>}
130157

131-
<ReactScrolla
132-
id="app-content"
133-
percentage={85}
134-
onPercentage={this.fetchNextPage}
135-
isLoading={this.state.loading}>
136-
<div className={styles.content}>
137-
<LogTable
138-
inlineSettings={this.props.inlineSettings}
139-
levels={this.state.levels}
140-
setRelative={this.setRelative}
141-
setLevel={this.setLevel.bind(this)}
142-
entries={entries}
143-
relative={this.state.relative}
144-
dateFormat={this.state.dateFormat}/>
145-
</div>
146-
</ReactScrolla>
158+
{content}
147159
</AppContainer>
148160
);
149161
}

0 commit comments

Comments
 (0)