From 22d7755215615ae62c6ff92cf73b698d0a74fe82 Mon Sep 17 00:00:00 2001
From: baldo <baldo@toppoint.de>
Date: Tue, 23 Aug 2022 22:20:14 +0200
Subject: [PATCH] Fix sorting after merge.

---
 frontend/src/stores/nodes.ts          | 10 +++++-----
 frontend/src/views/AdminNodesView.vue | 27 ++++++++++++++-------------
 server/shared/types/index.ts          |  4 ++--
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/frontend/src/stores/nodes.ts b/frontend/src/stores/nodes.ts
index a6a47bc..7143ed2 100644
--- a/frontend/src/stores/nodes.ts
+++ b/frontend/src/stores/nodes.ts
@@ -3,7 +3,7 @@ import {
     type DomainSpecificNodeResponse,
     isDomainSpecificNodeResponse,
     type NodesFilter,
-    NodeSortField,
+    NodeSortFieldEnum,
     SortDirection,
 } from "@/types";
 import { internalApi } from "@/utils/Api";
@@ -14,7 +14,7 @@ interface NodesStoreState {
     nodesPerPage: number;
     totalNodes: number;
     sortDirection: SortDirection;
-    sortField: NodeSortField;
+    sortField: NodeSortFieldEnum;
 }
 
 export const useNodesStore = defineStore({
@@ -26,7 +26,7 @@ export const useNodesStore = defineStore({
             nodesPerPage: 20,
             totalNodes: 0,
             sortDirection: SortDirection.ASCENDING,
-            sortField: NodeSortField.HOSTNAME,
+            sortField: NodeSortFieldEnum.HOSTNAME,
         };
     },
     getters: {
@@ -51,7 +51,7 @@ export const useNodesStore = defineStore({
             page: number,
             nodesPerPage: number,
             sortDirection: SortDirection,
-            sortField: NodeSortField,
+            sortField: NodeSortFieldEnum,
             filter: NodesFilter,
             searchTerm?: string
         ): Promise<void> {
@@ -63,7 +63,7 @@ export const useNodesStore = defineStore({
             }
             const result = await internalApi.getPagedList<
                 DomainSpecificNodeResponse,
-                NodeSortField
+                NodeSortFieldEnum
             >(
                 "nodes",
                 isDomainSpecificNodeResponse,
diff --git a/frontend/src/views/AdminNodesView.vue b/frontend/src/views/AdminNodesView.vue
index d38d6d1..ffae358 100644
--- a/frontend/src/views/AdminNodesView.vue
+++ b/frontend/src/views/AdminNodesView.vue
@@ -10,7 +10,8 @@ import type {
 import {
     ButtonSize,
     ComponentVariant,
-    NodeSortField,
+    type NodeSortField,
+    NodeSortFieldEnum,
     SortDirection,
 } from "@/types";
 import ListPager from "@/components/ListPager.vue";
@@ -41,7 +42,7 @@ const props = defineProps({
     },
     sortField: {
         type: String as PropType<NodeSortField>,
-        default: NodeSortField.HOSTNAME,
+        default: NodeSortFieldEnum.HOSTNAME,
     },
 });
 
@@ -196,7 +197,7 @@ watch(props, async () => {
             <thead>
                 <tr>
                     <sth
-                        :field="NodeSortField.HOSTNAME"
+                        :field="NodeSortFieldEnum.HOSTNAME"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -204,7 +205,7 @@ watch(props, async () => {
                         Name
                     </sth>
                     <sth
-                        :field="NodeSortField.NICKNAME"
+                        :field="NodeSortFieldEnum.NICKNAME"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -212,7 +213,7 @@ watch(props, async () => {
                         Besitzer*in
                     </sth>
                     <sth
-                        :field="NodeSortField.EMAIL"
+                        :field="NodeSortFieldEnum.EMAIL"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -220,7 +221,7 @@ watch(props, async () => {
                         E-Mail
                     </sth>
                     <sth
-                        :field="NodeSortField.TOKEN"
+                        :field="NodeSortFieldEnum.TOKEN"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -228,7 +229,7 @@ watch(props, async () => {
                         Token
                     </sth>
                     <sth
-                        :field="NodeSortField.MAC"
+                        :field="NodeSortFieldEnum.MAC"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -236,7 +237,7 @@ watch(props, async () => {
                         MAC
                     </sth>
                     <sth
-                        :field="NodeSortField.KEY"
+                        :field="NodeSortFieldEnum.KEY"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -244,7 +245,7 @@ watch(props, async () => {
                         VPN
                     </sth>
                     <sth
-                        :field="NodeSortField.SITE"
+                        :field="NodeSortFieldEnum.SITE"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -252,7 +253,7 @@ watch(props, async () => {
                         Site
                     </sth>
                     <sth
-                        :field="NodeSortField.DOMAIN"
+                        :field="NodeSortFieldEnum.DOMAIN"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -260,7 +261,7 @@ watch(props, async () => {
                         Domäne
                     </sth>
                     <sth
-                        :field="NodeSortField.COORDS"
+                        :field="NodeSortFieldEnum.COORDS"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -268,7 +269,7 @@ watch(props, async () => {
                         GPS
                     </sth>
                     <sth
-                        :field="NodeSortField.ONLINE_STATE"
+                        :field="NodeSortFieldEnum.ONLINE_STATE"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
@@ -276,7 +277,7 @@ watch(props, async () => {
                         Status
                     </sth>
                     <sth
-                        :field="NodeSortField.MONITORING_STATE"
+                        :field="NodeSortFieldEnum.MONITORING_STATE"
                         :currentField="sortField"
                         :currentDirection="sortDirection"
                         @sort="updateSortOrder"
diff --git a/server/shared/types/index.ts b/server/shared/types/index.ts
index 401be53..6928e48 100644
--- a/server/shared/types/index.ts
+++ b/server/shared/types/index.ts
@@ -573,7 +573,7 @@ export function isMonitoringResponse(arg: unknown): arg is MonitoringResponse {
 }
 
 // noinspection JSUnusedGlobalSymbols
-enum NodeSortFieldEnum {
+export enum NodeSortFieldEnum {
     HOSTNAME = "hostname",
     NICKNAME = "nickname",
     EMAIL = "email",
@@ -632,7 +632,7 @@ export function isNodesFilter(arg: unknown): arg is NodesFilter {
     );
 }
 
-export type SearchTerm = string & { readonly __tag: unique symbol }
+export type SearchTerm = string & { readonly __tag: unique symbol };
 export const isSearchTerm = isString;
 
 export enum MonitoringSortField {