@@ -52,70 +52,24 @@ function statusToIcon(messageStatus: MessageStatus) {
52
52
}
53
53
54
54
function hasWarning(message : Message ) {
55
- if (message .status === MessageStatus .ResolvedSuccessfully ) {
56
- return true ;
57
- }
58
-
59
- if (dotNetTimespanToMilliseconds (message .critical_time ) < 0 ) {
60
- return true ;
61
- }
62
-
63
- if (dotNetTimespanToMilliseconds (message .processing_time ) < 0 ) {
64
- return true ;
65
- }
66
-
67
- if (dotNetTimespanToMilliseconds (message .delivery_time ) < 0 ) {
68
- return true ;
69
- }
70
-
71
- return false ;
55
+ return (
56
+ message .status === MessageStatus .ResolvedSuccessfully || //
57
+ dotNetTimespanToMilliseconds (message .critical_time ) < 0 ||
58
+ dotNetTimespanToMilliseconds (message .processing_time ) < 0 ||
59
+ dotNetTimespanToMilliseconds (message .delivery_time ) < 0
60
+ );
72
61
}
73
62
74
63
function navigateToMessage(message : Message ) {
75
64
const query = router .currentRoute .value .query ;
76
65
77
- if (message .status === MessageStatus .Successful ) {
78
- router .push ({
79
- path: routeLinks .messages .successMessage .link (message .message_id , message .id ),
80
- query: { ... query , ... { back: route .path } },
81
- });
82
- } else {
83
- router .push ({ path: routeLinks .messages .failedMessage .link (message .id ), query: { ... query , ... { back: route .path } } });
84
- }
85
- }
86
-
87
- function setQuery() {
88
- const query = router .currentRoute .value .query ;
89
-
90
- watchHandle .pause ();
91
-
92
- if (query .filter ) {
93
- messageFilterString .value = query .filter as string ;
94
- } else {
95
- messageFilterString .value = " " ;
96
- }
97
- if (query .sortBy && query .sortDir ) {
98
- sortBy .value = { isAscending: query .sortDir === " asc" , property: query .sortBy as string };
99
- } else {
100
- sortBy .value = { isAscending: false , property: FieldNames .TimeSent };
101
- }
102
- if (query .pageSize ) {
103
- itemsPerPage .value = parseInt (query .pageSize as string , 10 );
104
- } else {
105
- itemsPerPage .value = 100 ;
106
- }
107
- if (query .from && query .to ) {
108
- dateRange .value = [new Date (query .from as string ), new Date (query .to as string )];
109
- } else {
110
- dateRange .value = [];
111
- }
112
- if (query .endpoint ) {
113
- selectedEndpointName .value = query .endpoint as string ;
114
- } else {
115
- selectedEndpointName .value = " " ;
116
- }
117
-
118
- watchHandle .resume ();
66
+ router .push ({
67
+ path:
68
+ message .status === MessageStatus .Successful //
69
+ ? routeLinks .messages .successMessage .link (message .message_id , message .id )
70
+ : routeLinks .messages .failedMessage .link (message .id ),
71
+ query: { ... query , ... { back: route .path } },
72
+ });
119
73
}
120
74
121
75
let firstLoad = true ;
@@ -162,6 +116,23 @@ const watchHandle = watch([() => route.query, itemsPerPage, sortBy, messageFilte
162
116
163
117
await store .refresh ();
164
118
});
119
+
120
+ function setQuery() {
121
+ const query = router .currentRoute .value .query ;
122
+
123
+ watchHandle .pause ();
124
+
125
+ messageFilterString .value = query .filter ? (query .filter as string ) : " " ;
126
+ sortBy .value =
127
+ query .sortBy && query .sortDir //
128
+ ? { isAscending: query .sortDir === " asc" , property: query .sortBy as string }
129
+ : (sortBy .value = { isAscending: false , property: FieldNames .TimeSent });
130
+ itemsPerPage .value = query .pageSize ? parseInt (query .pageSize as string ) : 100 ;
131
+ dateRange .value = query .from && query .to ? [new Date (query .from as string ), new Date (query .to as string )] : [];
132
+ selectedEndpointName .value = (query .endpoint ?? " " ) as string ;
133
+
134
+ watchHandle .resume ();
135
+ }
165
136
</script >
166
137
167
138
<template >
0 commit comments