Merge pull request #7 from carbonblack/add-safe-logging-for-tables

Add log check to logTable method
kobra-dev · Aug 21, 2017 · 9502267 · 9502267
2 parents 6460284 + 3b50df9
commit 9502267
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 34 deletions.
diff --git a/dist/dist-min.tar.gz b/dist/dist-min.tar.gz
diff --git a/dist/dist-min.zip b/dist/dist-min.zip
diff --git a/dist/dist-min/react-console.min.js b/dist/dist-min/react-console.min.js
diff --git a/dist/dist-min/react-console.min.js.map b/dist/dist-min/react-console.min.js.map
diff --git a/dist/dist.tar.gz b/dist/dist.tar.gz
diff --git a/dist/dist.zip b/dist/dist.zip
diff --git a/dist/dist/react-console.js b/dist/dist/react-console.js
diff --git a/dist/dist/react-console.js.map b/dist/dist/react-console.js.map
diff --git a/lib/react-console.js b/lib/react-console.js
diff --git a/lib/react-console.js.map b/lib/react-console.js.map
diff --git a/src/react-console.tsx b/src/react-console.tsx
@@ -229,29 +229,29 @@ export default class extends React.Component<ConsoleProps,ConsoleState> {
 	setBusy = () => {
 		this.setState({acceptInput: false});
 	}
-	updateLastLog = (...messages: any[]) => {
-		let log = this.state.log;
-		if(!log.length){
-			log.push({label: '', command: '', message: [] });
+	getSafeLog = () => {
+		if(!this.state.log.length){
+			this.state.log.push({label: '', command: '', message: [] });
 		}
+		return this.state.log;
+	}
+	updateLastLog = (...messages: any[]) => {
+		let log = this.getSafeLog();
 		let indexToReplace = log[this.state.log.length-1].message.length > 0 ? log[this.state.log.length-1].message.length - 1 : 0;
 		log[this.state.log.length-1].message[indexToReplace] = {value: messages};
 		this.setState({
 			log: log,
 		}, this.scrollIfBottom() );
 	}
 	log = (...messages: any[]) => {
-		let log = this.state.log;
-		if(!log.length){
-			log.push({label: '', command: '', message: [] });
-		}
+		let log = this.getSafeLog();
 		log[this.state.log.length-1].message.push({value: messages});
 		this.setState({
 			log: log,
 		}, this.scrollIfBottom() );
 	}
 	logX = (type: string, ...messages: any[]) => {
-		let log = this.state.log;
+		let log = this.getSafeLog();
 		if(!log.length){
 			log.push({label: '', command: '', message: [] });
 		}
@@ -261,7 +261,7 @@ export default class extends React.Component<ConsoleProps,ConsoleState> {
 		}, this.scrollIfBottom() );
 	}
 	logTable = (tableData: ConsoleTableObject, type?: string) => {
-		let log = this.state.log;
+		let log = this.getSafeLog();
 		if(type){
 			log[this.state.log.length-1].message.push({isTable: true, type: type, value: [tableData]});
 		}else{