From 3e01079caf7738e02e337b458077c70f7335a081 Mon Sep 17 00:00:00 2001
From: Donald Zou <donaldzou@live.hk>
Date: Sat, 7 Dec 2024 21:41:05 +0800
Subject: [PATCH] Added sorting and search to configuration list

---
 src/dashboard.py                              |   2 -
 .../configurationComponents/peerList.vue      |   3 +
 .../app/src/components/configurationList.vue  | 105 ++++++++++++++----
 src/static/app/src/components/navbar.vue      |   1 -
 src/static/app/src/router/router.js           |   1 -
 src/static/app/src/stores/wgdashboardStore.js |  20 ----
 6 files changed, 88 insertions(+), 44 deletions(-)
 delete mode 100644 src/static/app/src/stores/wgdashboardStore.js

diff --git a/src/dashboard.py b/src/dashboard.py
index 1b9cf66..48bdea6 100644
--- a/src/dashboard.py
+++ b/src/dashboard.py
@@ -3108,7 +3108,6 @@ def ProtocolsEnabled() -> list[str]:
         protocols.append("wg")
     return protocols
     
-
 def InitWireguardConfigurationsList(startup: bool = False):    
     confs = os.listdir(DashboardConfig.GetConfig("Server", "wg_conf_path")[1])
     confs.sort()
@@ -3164,7 +3163,6 @@ def startThreads():
     scheduleJobThread.daemon = True
     scheduleJobThread.start()
 
-
 if __name__ == "__main__":
     startThreads()
     app.run(host=app_ip, debug=False, port=app_port)
\ No newline at end of file
diff --git a/src/static/app/src/components/configurationComponents/peerList.vue b/src/static/app/src/components/configurationComponents/peerList.vue
index b4541af..b10ce6f 100644
--- a/src/static/app/src/components/configurationComponents/peerList.vue
+++ b/src/static/app/src/components/configurationComponents/peerList.vue
@@ -204,6 +204,9 @@ export default {
 					this.dashboardConfigurationStore.newMessage("Server",
 						res.message, 'danger')
 				}
+				this.wireguardConfigurationStore.Configurations.find(x => x.Name === this.configurationInfo.Name).Status = res.data
+				console.log(this.wireguardConfigurationStore.Configurations.find(x => x.Name === this.configurationInfo.Name).Status)
+				
 				this.configurationInfo.Status = res.data
 				this.configurationToggling = false;
 			})
diff --git a/src/static/app/src/components/configurationList.vue b/src/static/app/src/components/configurationList.vue
index 6407b31..951eade 100644
--- a/src/static/app/src/components/configurationList.vue
+++ b/src/static/app/src/components/configurationList.vue
@@ -1,9 +1,9 @@
 <script>
-import {wgdashboardStore} from "@/stores/wgdashboardStore.js";
 import {WireguardConfigurationsStore} from "@/stores/WireguardConfigurationsStore.js";
 import ConfigurationCard from "@/components/configurationListComponents/configurationCard.vue";
 import LocaleText from "@/components/text/localeText.vue";
 import SystemStatus from "@/components/systemStatusComponents/systemStatusWidget.vue";
+import {GetLocale} from "@/utilities/locale.js";
 
 export default {
 	name: "configurationList",
@@ -14,10 +14,26 @@ export default {
 	},
 	data(){
 		return {
-			configurationLoaded: false
+			configurationLoaded: false,
+			sort: {
+				Name: GetLocale("Name"),
+				Status: GetLocale("Status"),
+				'DataUsage.Total': GetLocale("Total Usage")
+			},
+			currentSort: {
+				key: "Name",
+				order: "asc"
+			},
+			searchKey: ""
 		}
 	},
 	async mounted() {
+		if (!window.localStorage.getItem('ConfigurationListSort')){
+			window.localStorage.setItem('ConfigurationListSort', JSON.stringify(this.currentSort))
+		}else{
+			this.currentSort = JSON.parse(window.localStorage.getItem('ConfigurationListSort'))
+		}
+		
 		await this.wireguardConfigurationsStore.getConfigurations();
 		this.configurationLoaded = true;
 		
@@ -27,6 +43,37 @@ export default {
 	},
 	beforeUnmount() {
 		clearInterval(this.wireguardConfigurationsStore.ConfigurationListInterval)
+	},
+	computed: {
+		configurations(){
+			return [...this.wireguardConfigurationsStore.Configurations]
+				.filter(x => x.Name.includes(this.searchKey) || x.PublicKey.includes(this.searchKey) || !this.searchKey)
+				.sort((a, b) => {
+				
+
+				if (this.currentSort.order === 'desc') {
+					return this.dotNotation(a, this.currentSort.key) < this.dotNotation(b, this.currentSort.key) ? 
+						1 : this.dotNotation(a, this.currentSort.key) > this.dotNotation(b, this.currentSort.key) ? -1 : 0;
+				} else {
+					return this.dotNotation(a, this.currentSort.key) > this.dotNotation(b, this.currentSort.key) ? 
+						1 : this.dotNotation(a, this.currentSort.key) < this.dotNotation(b, this.currentSort.key) ? -1 : 0;
+				}
+			})
+		}
+	},
+	methods: {
+		dotNotation(object, dotNotation){
+			return dotNotation.split('.').reduce((o, key) => o && o[key], object)
+		},
+		updateSort(key){
+			if (this.currentSort.key === key){
+				if (this.currentSort.order === 'asc') this.currentSort.order = 'desc'
+				else this.currentSort.order = 'asc'
+			}else{
+				this.currentSort.key = key
+			}
+			window.localStorage.setItem('ConfigurationListSort', JSON.stringify(this.currentSort))
+		}
 	}
 }
 </script>
@@ -35,33 +82,53 @@ export default {
 	<div class="mt-md-5 mt-3">
 		<div class="container-md">
 			<SystemStatus></SystemStatus>
-			<div class="d-flex mb-4 configurationListTitle align-items-center gap-3">
-				<h2 class="text-body d-flex">
-					<span>
-						<LocaleText t="WireGuard Configurations"></LocaleText>
-					</span>
+			<div class="d-flex mb-4 configurationListTitle align-items-md-center gap-3 flex-column flex-md-row">
+				<h2 class="text-body d-flex mb-0">
+					<LocaleText t="WireGuard Configurations"></LocaleText>
 				</h2>
 				<RouterLink to="/new_configuration"
-				            class="btn btn-dark btn-brand rounded-3 p-2 shadow ms-auto rounded-3">
-					<h2 class="mb-0" style="line-height: 0">
-						<i class="bi bi-plus-circle"></i>
-					</h2>
+				            class="ms-md-auto py-2 text-decoration-none btn text-primary-emphasis bg-primary-subtle rounded-3 border-1 border-primary-subtle">
+					<i class="bi bi-plus-circle me-2"></i><LocaleText t="Configuration"></LocaleText>
 				</RouterLink>
 				<RouterLink to="/restore_configuration"
-				            class="btn btn-dark btn-brand p-2 shadow ms-2" style="border-radius: 100%">
-					<h2 class="mb-0" style="line-height: 0">
-						<i class="bi bi-clock-history "></i>
-					</h2>
+				            class="py-2 text-decoration-none btn text-primary-emphasis bg-primary-subtle rounded-3 border-1 border-primary-subtle">
+					<i class="bi bi-clock-history me-2"></i><LocaleText t="Restore"></LocaleText>
 				</RouterLink>
 				
 			</div>
+			<div class="text-body filter mb-3 d-flex gap-2 flex-column flex-md-row" v-if="this.configurationLoaded">
+				<div class="d-flex align-items-center gap-3 align-items-center ">
+					<small class="text-muted">
+						<LocaleText t="Sort By"></LocaleText>
+					</small>
+					<a role="button" 
+					   @click="updateSort(sv)"
+					   :class="{'bg-primary-subtle text-primary-emphasis': this.currentSort.key === sv}"
+					   class="px-2 py-1 rounded-3" v-for="(s, sv) in this.sort">
+						<small>
+							<i class="bi me-2" 
+							   :class="[this.currentSort.order === 'asc' ? 'bi-sort-up' : 'bi-sort-down']" 
+							   v-if="this.currentSort.key === sv"></i>{{s}}
+						</small>
+					</a>
+				</div>
+				<div class="d-flex align-items-center ms-md-auto">
+					<label for="configurationSearch" class="text-muted">
+						<i class="bi bi-search me-2"></i>
+					</label>
+					<input class="form-control form-control-sm rounded-3" 
+					       v-model="this.searchKey"
+					       id="configurationSearch">
+				</div>
+			</div>
+			
 			<TransitionGroup name="fade" tag="div" class="d-flex flex-column gap-3 mb-4">
 				<p class="text-muted" 
 				   key="noConfiguration"
 				   v-if="this.configurationLoaded && this.wireguardConfigurationsStore.Configurations.length === 0">
 					<LocaleText t="You don't have any WireGuard configurations yet. Please check the configuration folder or change it in Settings. By default the folder is /etc/wireguard."></LocaleText>
 				</p>
-				<ConfigurationCard v-for="(c, index) in this.wireguardConfigurationsStore.Configurations"
+				<ConfigurationCard v-for="(c, index) in configurations"
 				                   :delay="index*0.05 + 's'"
 				                   v-else-if="this.configurationLoaded"
 				                   :key="c.Name" :c="c"></ConfigurationCard>
@@ -73,9 +140,7 @@ export default {
 </template>
 
 <style scoped>
-.configurationListTitle{
-	.btn{
-		border-radius: 50% !important;
-	}
+.filter a{
+	text-decoration: none;
 }
 </style>
\ No newline at end of file
diff --git a/src/static/app/src/components/navbar.vue b/src/static/app/src/components/navbar.vue
index 8b4a11c..4c8a18b 100644
--- a/src/static/app/src/components/navbar.vue
+++ b/src/static/app/src/components/navbar.vue
@@ -1,5 +1,4 @@
 <script>
-import {wgdashboardStore} from "@/stores/wgdashboardStore.js";
 import {WireguardConfigurationsStore} from "@/stores/WireguardConfigurationsStore.js";
 import {DashboardConfigurationStore} from "@/stores/DashboardConfigurationStore.js";
 import {fetchGet} from "@/utilities/fetch.js";
diff --git a/src/static/app/src/router/router.js b/src/static/app/src/router/router.js
index 80eb95d..d55600f 100644
--- a/src/static/app/src/router/router.js
+++ b/src/static/app/src/router/router.js
@@ -156,7 +156,6 @@ router.beforeEach(async (to, from, next) => {
 	dashboardConfigurationStore.ShowNavBar = false;
 	document.querySelector(".loadingBar").classList.remove("loadingDone")
 	document.querySelector(".loadingBar").classList.add("loading")
-	console.log(to.path)
 	if (to.meta.requiresAuth){
 		if (!dashboardConfigurationStore.getActiveCrossServer()){
 			if (await checkAuth()){
diff --git a/src/static/app/src/stores/wgdashboardStore.js b/src/static/app/src/stores/wgdashboardStore.js
deleted file mode 100644
index 3c1111c..0000000
--- a/src/static/app/src/stores/wgdashboardStore.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import {defineStore} from "pinia";
-import {fetchGet} from "@/utilities/fetch.js";
-
-
-export const wgdashboardStore = defineStore('WGDashboardStore', {
-	state: () => ({
-		WireguardConfigurations: undefined,
-		DashboardConfiguration: undefined
-	}),
-	actions: {
-		async getDashboardConfiguration(){
-			await fetchGet("/api/getDashboardConfiguration", {}, (res) => {
-				console.log(res.status)
-				if (res.status)  this.DashboardConfiguration = res.data
-			})
-		}
-	}
-});
-
-