Skip to content

Commit cdaed35

Browse files
committed
typed field names
1 parent bca1b69 commit cdaed35

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

src/Frontend/src/components/audit/AuditList.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
22
import routeLinks from "@/router/routeLinks";
3-
import { useAuditStore } from "@/stores/AuditStore";
3+
import { FieldNames, useAuditStore } from "@/stores/AuditStore";
44
import { storeToRefs } from "pinia";
55
import Message, { MessageStatus } from "@/resources/Message";
66
import moment from "moment";
@@ -97,7 +97,7 @@ function setQuery() {
9797
if (query.sortBy && query.sortDir) {
9898
sortBy.value = { isAscending: query.sortDir === "asc", property: query.sortBy as string };
9999
} else {
100-
sortBy.value = { isAscending: false, property: "time_sent" };
100+
sortBy.value = { isAscending: false, property: FieldNames.TimeSent };
101101
}
102102
if (query.pageSize) {
103103
itemsPerPage.value = parseInt(query.pageSize as string, 10);

src/Frontend/src/components/audit/FiltersPanel.vue

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import FilterInput from "@/components/FilterInput.vue";
33
import { storeToRefs } from "pinia";
4-
import { useAuditStore } from "@/stores/AuditStore.ts";
4+
import { FieldNames, useAuditStore } from "@/stores/AuditStore.ts";
55
import ListFilterSelector from "@/components/audit/ListFilterSelector.vue";
66
import { computed, ref, watch } from "vue";
77
import DatePickerRange from "@/components/audit/DatePickerRange.vue";
@@ -12,11 +12,11 @@ const endpointNames = computed(() => {
1212
return [...new Set(endpoints.value.map((endpoint) => endpoint.name))].sort();
1313
});
1414
const sortByItemsMap = new Map([
15-
["Latest sent", "time_sent,desc"],
16-
["Oldest sent", "time_sent,asc"],
17-
["Slowest processing", "processing_time,desc"],
18-
["Highest critical time", "critical_time,desc"],
19-
["Longest delivery", "delivery_time,desc"],
15+
["Latest sent", `${FieldNames.TimeSent},desc`],
16+
["Oldest sent", `${FieldNames.TimeSent},asc`],
17+
["Slowest processing time", `${FieldNames.ProcessingTime},desc`],
18+
["Highest critical time", `${FieldNames.CriticalTime},desc`],
19+
["Longest delivery time", `${FieldNames.DeliveryTime},desc`],
2020
]);
2121
const numberOfItemsPerPage = ["50", "100", "250", "500"];
2222
const sortByItems = computed(() => [...sortByItemsMap.keys()]);
@@ -50,7 +50,7 @@ watch(selectedSortByItem, (newValue) => {
5050
const strings = item.split(",");
5151
sortBy.value = { isAscending: strings[1] === "asc", property: strings[0] };
5252
} else {
53-
sortBy.value = { isAscending: true, property: "time_sent" };
53+
sortBy.value = { isAscending: true, property: FieldNames.TimeSent };
5454
}
5555
});
5656
</script>
@@ -82,7 +82,7 @@ watch(selectedSortByItem, (newValue) => {
8282
<div class="filter last-filter">
8383
<div class="filter-label">Sort:</div>
8484
<div class="filter-component">
85-
<ListFilterSelector :items="sortByItems" instructions="" v-model="selectedSortByItem" item-name="result" :can-clear="false" :show-clear="false" :show-filter="false" />
85+
<ListFilterSelector :items="sortByItems" v-model="selectedSortByItem" item-name="result" :can-clear="false" :show-clear="false" :show-filter="false" />
8686
</div>
8787
</div>
8888
</div>
@@ -109,8 +109,6 @@ watch(selectedSortByItem, (newValue) => {
109109
font-weight: bold;
110110
}
111111
112-
.filter-component {
113-
}
114112
.text-search-container {
115113
width: 25rem;
116114
}

src/Frontend/src/stores/AuditStore.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,16 @@ import useAutoRefresh from "@/composables/autoRefresh";
88

99
export type DateRange = [fromDate: Date, toDate: Date] | [];
1010

11+
export enum FieldNames {
12+
TimeSent = "time_sent",
13+
ProcessingTime = "processing_time",
14+
CriticalTime = "critical_time",
15+
DeliveryTime = "delivery_time",
16+
}
17+
1118
export const useAuditStore = defineStore("AuditStore", () => {
1219
const sortByInstances = ref<SortInfo>({
13-
property: "time_sent",
20+
property: FieldNames.TimeSent,
1421
isAscending: false,
1522
});
1623

0 commit comments

Comments
 (0)