Skip to content

Commit fc1c931

Browse files
authored
clean up initialisation of MessageStore (#2688)
1 parent 4f34440 commit fc1c931

File tree

3 files changed

+13
-33
lines changed

3 files changed

+13
-33
lines changed

src/Frontend/src/stores/ConfigurationStore.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export const useConfigurationStore = defineStore("ConfigurationStore", () => {
2222

2323
return {
2424
configuration,
25-
refresh,
2625
isMassTransitConnected,
2726
};
2827
});

src/Frontend/src/stores/EditRetryStore.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/Frontend/src/stores/MessageStore.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { acceptHMRUpdate, defineStore, storeToRefs } from "pinia";
2-
import { computed, reactive, Ref, ref } from "vue";
2+
import { computed, reactive, Ref, ref, watch } from "vue";
33
import Header from "@/resources/Header";
44
import type EndpointDetails from "@/resources/EndpointDetails";
55
import { FailedMessage, ExceptionDetails, FailedMessageStatus } from "@/resources/FailedMessage";
6-
import { useEditRetryStore } from "@/stores/EditRetryStore";
76
import { useConfigurationStore } from "@/stores/ConfigurationStore";
87
import Message, { MessageStatus } from "@/resources/Message";
98
import moment from "moment/moment";
109
import { parse, stringify } from "lossless-json";
1110
import xmlFormat from "xml-formatter";
1211
import { DataContainer } from "./DataContainer";
1312
import { useServiceControlStore } from "./ServiceControlStore";
13+
import { EditAndRetryConfig } from "@/resources/Configuration";
1414
import EditRetryResponse from "@/resources/EditRetryResponse";
1515
import { EditedMessage } from "@/resources/EditMessage";
1616
import useEnvironmentAndVersionsAutoRefresh from "@/composables/useEnvironmentAndVersionsAutoRefresh";
@@ -65,22 +65,28 @@ export const useMessageStore = defineStore("MessageStore", () => {
6565
const headers = ref<DataContainer<Header[]>>({ data: [] });
6666
const body = ref<DataContainer<{ value?: string; content_type?: string; no_content?: boolean }>>({ data: {} });
6767
const state = reactive<DataContainer<Model>>({ data: { failure_metadata: {}, failure_status: {}, dialog_status: {}, invoked_saga: {} } });
68+
const edit_and_retry_config = ref<EditAndRetryConfig>({ enabled: false, locked_headers: [], sensitive_headers: [] });
69+
const conversationData = ref<DataContainer<Message[]>>({ data: [] });
70+
6871
const editRetryResponse = ref<EditRetryResponse | null>(null);
6972
let bodyLoadedId = "";
7073
let conversationLoadedId = "";
71-
const conversationData = ref<DataContainer<Message[]>>({ data: [] });
72-
const editRetryStore = useEditRetryStore();
74+
7375
const configStore = useConfigurationStore();
7476
const serviceControlStore = useServiceControlStore();
77+
const { serviceControlUrl } = storeToRefs(serviceControlStore);
7578
const { store: environmentStore } = useEnvironmentAndVersionsAutoRefresh();
7679
const areSimpleHeadersSupported = environmentStore.serviceControlIsGreaterThan("5.2.0");
7780

78-
const { config: edit_and_retry_config } = storeToRefs(editRetryStore);
7981
const { configuration } = storeToRefs(configStore);
8082
const error_retention_period = computed(() => moment.duration(configuration.value?.data_retention?.error_retention_period).asHours());
8183

82-
// eslint-disable-next-line promise/catch-or-return,promise/prefer-await-to-then,promise/valid-params
83-
Promise.all([editRetryStore.loadConfig(), configStore.refresh()]).then();
84+
watch(serviceControlUrl, loadConfig, { immediate: true });
85+
async function loadConfig() {
86+
if (!serviceControlUrl.value) return;
87+
const [, data] = await serviceControlStore.fetchTypedFromServiceControl<EditAndRetryConfig>("edit/config");
88+
edit_and_retry_config.value = data;
89+
}
8490

8591
function reset() {
8692
state.data = { failure_metadata: {}, failure_status: {}, dialog_status: {}, invoked_saga: {} };

0 commit comments

Comments
 (0)