@@ -2,7 +2,6 @@ import { acceptHMRUpdate, defineStore, storeToRefs } from "pinia";
22import { computed , ref , watch , shallowReadonly } from "vue" ;
33import { useServiceControlStore } from "./ServiceControlStore" ;
44import { useCookies } from "vue3-cookies" ;
5- import { MessageGroupClient } from "@/components/failedmessages/messageGroupClient" ;
65import { useRoute } from "vue-router" ;
76import { ExtendedFailedMessage , FailedMessageStatus } from "@/resources/FailedMessage" ;
87import { SortDirection } from "@/resources/SortOptions" ;
@@ -35,7 +34,6 @@ export const useMessagesStore = defineStore("MessagesStore", () => {
3534 const endpoints = ref < string [ ] > ( [ ] ) ;
3635
3736 const serviceControlStore = useServiceControlStore ( ) ;
38- const messageGroupClient = new MessageGroupClient ( serviceControlStore ) ;
3937 const configurationStore = useConfigurationStore ( ) ;
4038 const { configuration } = storeToRefs ( configurationStore ) ;
4139
@@ -71,13 +69,14 @@ export const useMessagesStore = defineStore("MessagesStore", () => {
7169 }
7270 startDate . value = newStartDate ;
7371 }
74- var additionalQuery = ( ( ) => {
72+ const additionalQuery = ( ( ) => {
7573 switch ( messageStatus ) {
7674 case FailedMessageStatus . Archived :
7775 return `&modified=${ dateRange . value } ` ;
78- case FailedMessageStatus . RetryIssued :
76+ case FailedMessageStatus . RetryIssued : {
7977 const searchPhrase = selectedQueue . value === "empty" ? "" : selectedQueue . value ;
8078 return `&queueaddress=${ searchPhrase } &modified=${ dateRange . value } ` ;
79+ }
8180 default :
8281 return "" ;
8382 }
@@ -145,23 +144,26 @@ export const useMessagesStore = defineStore("MessagesStore", () => {
145144 messages . value = [ ] ;
146145 //reset all the paging variables
147146 switch ( messageStatus ) {
148- case FailedMessageStatus . Archived :
147+ case FailedMessageStatus . Archived : {
149148 sortBy . value = "" ;
150149 let deletedMessagePeriod = cookies . cookies . get ( "all_deleted_messages_period" ) as DeletedPeriodOption ;
151150 if ( ! deletedMessagePeriod ) {
152151 deletedMessagePeriod = deletedPeriodOptions [ deletedPeriodOptions . length - 1 ] ; //default is last 7 days
153152 }
154153 selectedPeriod . value = deletedMessagePeriod ;
155154 break ;
155+ }
156156 case FailedMessageStatus . RetryIssued :
157- sortBy . value = "time_of_failure" ;
158- let retryMessagePeriod = cookies . cookies . get ( "pending_retries_period" ) ;
159- if ( ! retryMessagePeriod ) {
160- retryMessagePeriod = retryPeriodOptions [ 0 ] ; //default All Pending Retries
157+ {
158+ sortBy . value = "time_of_failure" ;
159+ let retryMessagePeriod = cookies . cookies . get ( "pending_retries_period" ) ;
160+ if ( ! retryMessagePeriod ) {
161+ retryMessagePeriod = retryPeriodOptions [ 0 ] ; //default All Pending Retries
162+ }
163+ selectedPeriod . value = retryMessagePeriod ;
164+ const [ , data ] = await serviceControlStore . fetchTypedFromServiceControl < QueueAddress [ ] > ( "errors/queues/addresses" ) ;
165+ endpoints . value = data . map ( ( endpoint ) => endpoint . physical_address ) ;
161166 }
162- selectedPeriod . value = retryMessagePeriod ;
163- const [ , data ] = await serviceControlStore . fetchTypedFromServiceControl < QueueAddress [ ] > ( "errors/queues/addresses" ) ;
164- endpoints . value = data . map ( ( endpoint ) => endpoint . physical_address ) ;
165167 break ;
166168 default :
167169 sortBy . value = "time_of_failure" ;
0 commit comments