Skip to content

Fix pasting log lines #715

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
icewind1991 merged 4 commits into from
May 11, 2022
Merged

Fix pasting log lines #715

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22ea242
fix webpack dev config
icewind1991 May 10, 2022
504a58f
remove unneeded ToggleEntry state
icewind1991 May 10, 2022
fb206de
reset logtable when loading a log file
icewind1991 May 10, 2022
f6df978
build
icewind1991 May 10, 2022
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
Prev Previous commit
Next Next commit
reset logtable when loading a log file 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed May 10, 2022
commit fb206de50a0e71b0f6ace5e59f72fb80821cfa03
13 changes: 8 additions & 5 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class App extends Component {
this.logProvider = this.props.logProvider;
this.logProvider.on('entries', entries => {
if (this.state.provider === this.logProvider) {
this.setState({entries});
this.setState({entries, loading: false});
}
});
this.saveRelative = _.debounce(this.logProvider.setRelative, 100);
Expand Down Expand Up @@ -62,17 +62,20 @@ export class App extends Component {
async setLevel (level, newState) {
let levels = this.state.levels;
levels[level] = newState;
this.setState({levels});
this.setState({levels, entries: [], loading: true});
await this.logProvider.setLevels(levels);
this.logProvider.reset();
this.logProvider.load();
this.state.provider.reset();
await this.state.provider.load();
this.setState({loading: false});
}

onLogFile = async (content) => {
this.setState({loading: true});

const logFile = new LogFile(content);
logFile.on('entries', entries => {
if (this.state.provider === logFile) {
this.setState({entries});
this.setState({entries, loading: false});
}
});
try {
Expand Down