From e789d52c4b7879d66eef35288640115e3e7795c2 Mon Sep 17 00:00:00 2001
From: serega6531 <S.Shkurov@bssys.com>
Date: Fri, 10 Apr 2020 20:25:23 +0300
Subject: [PATCH 1/4] =?UTF-8?q?=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B0=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B8=20pcap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                | 12 ++++++++++++
 src/components/Sidebar.vue | 23 +++++++++++++++++++++++
 src/store.js               |  4 ++++
 src/views/EditService.vue  |  4 ++--
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f819f22..bf0295d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -129,6 +129,18 @@
 							this.$refs.navbar.$refs.patternsDropdown.togglePatternFromWs(parsed.value, false);
 							break;
 						}
+						case 'PCAP_STARTED': {
+							this.$store.commit('startPcap');
+							break;
+						}
+						case 'PCAP_STOPPED': {
+							this.$bvToast.toast(`All streams processed`, {
+								title: 'Notification',
+								variant: 'success',
+								autoHideDelay: 5000,
+							});
+							break;
+						}
 						default: {
 							console.error('[WS] Event is not implemented!', parsed);
 							break;
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index a9e29fb..dbe2a3d 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -15,6 +15,10 @@
 					@click.stop.prevent="toggleHexdump">
 				<i :class="this.$store.state.hexdumpMode ? 'far fa-file-code' : 'fas fa-align-left'"/>
 			</button>
+			<button type="button" class="btn btn-sm btn-outline-warning" v-if="!this.$store.state.pcapStarted"
+					@click.stop.prevent="startPcap">
+				<i class="fas fa-arrow-circle-down"/>
+			</button>
 			<button type="button" class="btn btn-sm btn-outline-info" style="float: right;"
 					@click.stop.prevent="scrollUp">
 				<i class="fas fa-angle-double-up"/>
@@ -163,6 +167,18 @@
 			toggleHexdump() {
 				this.$store.commit('toggleHexdumpMode');
 			},
+			startPcap() {
+				this.$http.post('pcap/start')
+					.then(() => {
+						this.$store.commit('startPcap');
+					}).catch(e => {
+					this.$bvToast.toast(`Failed to start pcap: ${e}`, {
+						title: 'Error',
+						variant: 'danger',
+					});
+					console.error('Failed to start pcap', e);
+				});
+			},
 			addStreamFromWs(stream) {
 				const currentPort = parseInt(this.$route?.params?.servicePort, 10);
 				if (currentPort && currentPort !== stream.service) return;
@@ -191,6 +207,13 @@
 		},
 		mounted() {
 			document.addEventListener('keydown', this.navigationKeysCallback);
+
+			this.$http.get('pcap/started')
+				.then(r => this.$store.state.pcapStarted = r.data)
+				.catch(e => {
+					console.error('Failed to get pcap status, defaulting to true:', e);
+					this.$store.state.pcapStarted = true;
+				});
 		},
 		beforeDestroy() {
 			document.removeEventListener('keydown', this.navigationKeysCallback);
diff --git a/src/store.js b/src/store.js
index c422215..c429bff 100644
--- a/src/store.js
+++ b/src/store.js
@@ -15,6 +15,7 @@ export default new Vuex.Store({
 		pageSize: 25,
 		displayFavoritesOnly: false,
 		pause: false,
+		pcapStarted: true,
 
 		hexdumpMode: false,
 
@@ -34,6 +35,8 @@ export default new Vuex.Store({
 		// eslint-disable-next-line no-unused-vars
 		togglePause: (s, p) => s.pause = !s.pause,
 		// eslint-disable-next-line no-unused-vars
+		startPcap: (s, p) => s.pcapStarted = true,
+		// eslint-disable-next-line no-unused-vars
 		toggleHexdumpMode: (s, p) => s.hexdumpMode = !s.hexdumpMode,
 
 		setServiceModalName: (s, p) => s.serviceModalName = p,
@@ -54,6 +57,7 @@ export default new Vuex.Store({
 					&& mName !== 'setServiceModalName'
 					&& mName !== 'setServiceModalId'
 					&& mName !== 'togglePause'
+					&& mName !== 'startPcap'
 					&& mName !== 'toggleHexdumpMode'
 					&& mName !== 'setPatterns'
 					&& mName !== 'addPattern';
diff --git a/src/views/EditService.vue b/src/views/EditService.vue
index ed1b223..b294900 100644
--- a/src/views/EditService.vue
+++ b/src/views/EditService.vue
@@ -59,7 +59,7 @@
 					this.reset();
 					this.$bvModal.hide('editServiceModal');
 				}).catch(e => {
-					this.$bvToast.toast(`Не удалось отредактировать сервис: ${e}`, {
+					this.$bvToast.toast(`Failed to edit service: ${e}`, {
 						title: 'Сбой',
 						variant: 'danger',
 					});
@@ -77,7 +77,7 @@
 						this.reset();
 						this.$bvModal.hide('editServiceModal');
 					}).catch(e => {
-					this.$bvToast.toast(`Не удалось удалить сервис: ${e}`, {
+					this.$bvToast.toast(`Failed to remove service: ${e}`, {
 						title: 'Сбой',
 						variant: 'danger',
 					});

From 03a7a4536135325cc7eaf8aa679fdd97691fabb6 Mon Sep 17 00:00:00 2001
From: serega6531 <S.Shkurov@bssys.com>
Date: Fri, 10 Apr 2020 20:44:12 +0300
Subject: [PATCH 2/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sidebar.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index dbe2a3d..c254c87 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -2,24 +2,29 @@
 	<nav class="col-sm-3 d-none d-sm-block bg-light sidebar">
 		<div class="m-2">
 			<button type="button" class="btn btn-sm"
+					:title="this.$store.state.pause ? 'Continue' : 'Pause new streams'"
 					:class="this.$store.state.pause ? 'btn-danger' : 'btn-outline-success'"
 					@click.stop.prevent="togglePause">
 				<i class="fas fa-pause"/>
 			</button>
 			<button type="button" class="btn btn-sm ml-1"
+					:title="this.$store.state.displayFavoritesOnly ? 'Show all streams' : 'Show only favorite streams'"
 					:class="this.$store.state.displayFavoritesOnly ? 'btn-danger' : 'btn-outline-danger'"
 					@click.stop.prevent="toggleFavorites">
 				<i class="fas fa-star"/>
 			</button>
 			<button type="button" class="btn btn-outline-primary btn-sm ml-1"
+					:title="this.$store.state.hexdumpMode ? 'Switch to text view' : 'Switch to hexdump view'"
 					@click.stop.prevent="toggleHexdump">
 				<i :class="this.$store.state.hexdumpMode ? 'far fa-file-code' : 'fas fa-align-left'"/>
 			</button>
-			<button type="button" class="btn btn-sm btn-outline-warning" v-if="!this.$store.state.pcapStarted"
+			<button type="button" class="btn btn-sm btn-outline-warning ml-1" v-if="!this.$store.state.pcapStarted"
+					title="Start pcap file processing"
 					@click.stop.prevent="startPcap">
 				<i class="fas fa-arrow-circle-down"/>
 			</button>
 			<button type="button" class="btn btn-sm btn-outline-info" style="float: right;"
+					title="Scroll to top"
 					@click.stop.prevent="scrollUp">
 				<i class="fas fa-angle-double-up"/>
 			</button>

From c4d60c9ee2835de8c02eec8a7d2cc15a28aa668a Mon Sep 17 00:00:00 2001
From: serega6531 <S.Shkurov@bssys.com>
Date: Fri, 10 Apr 2020 20:50:43 +0300
Subject: [PATCH 3/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=BE=D0=BF=D0=BE=D0=B2=D0=B5=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B0=D1=87=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B5=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                | 5 +++++
 src/components/Sidebar.vue | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/App.vue b/src/App.vue
index bf0295d..c8b8815 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -131,6 +131,11 @@
 						}
 						case 'PCAP_STARTED': {
 							this.$store.commit('startPcap');
+							this.$bvToast.toast(`Pcap file processing started`, {
+								title: 'Notification',
+								variant: 'info',
+								autoHideDelay: 5000,
+							});
 							break;
 						}
 						case 'PCAP_STOPPED': {
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index c254c87..c70280e 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -176,6 +176,11 @@
 				this.$http.post('pcap/start')
 					.then(() => {
 						this.$store.commit('startPcap');
+						this.$bvToast.toast(`Pcap file processing started`, {
+							title: 'Notification',
+							variant: 'info',
+							autoHideDelay: 5000,
+						});
 					}).catch(e => {
 					this.$bvToast.toast(`Failed to start pcap: ${e}`, {
 						title: 'Error',

From 44212ae2d90b75510f701329c6158c415a104cb5 Mon Sep 17 00:00:00 2001
From: serega6531 <S.Shkurov@bssys.com>
Date: Fri, 10 Apr 2020 21:13:17 +0300
Subject: [PATCH 4/4] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=BE?=
 =?UTF-8?q?=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B5=20=D1=81=D0=BE=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sidebar.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index c70280e..c9c5dfa 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -5,7 +5,7 @@
 					:title="this.$store.state.pause ? 'Continue' : 'Pause new streams'"
 					:class="this.$store.state.pause ? 'btn-danger' : 'btn-outline-success'"
 					@click.stop.prevent="togglePause">
-				<i class="fas fa-pause"/>
+				<i :class="this.$store.state.pause ? 'fas fa-play' : 'fas fa-pause'"/>
 			</button>
 			<button type="button" class="btn btn-sm ml-1"
 					:title="this.$store.state.displayFavoritesOnly ? 'Show all streams' : 'Show only favorite streams'"
@@ -176,11 +176,6 @@
 				this.$http.post('pcap/start')
 					.then(() => {
 						this.$store.commit('startPcap');
-						this.$bvToast.toast(`Pcap file processing started`, {
-							title: 'Notification',
-							variant: 'info',
-							autoHideDelay: 5000,
-						});
 					}).catch(e => {
 					this.$bvToast.toast(`Failed to start pcap: ${e}`, {
 						title: 'Error',