diff --git a/src/components/Discover/Conformance/ConformanceResults.vue b/src/components/Discover/Conformance/ConformanceResults.vue index b213184..2e81407 100644 --- a/src/components/Discover/Conformance/ConformanceResults.vue +++ b/src/components/Discover/Conformance/ConformanceResults.vue @@ -358,8 +358,8 @@ { // Use async/await to prevent errors caused by asynchronous data not being available yet issuesNo.value = no; await conformanceStore.getConformanceIssue(no); - if (issueTraces.value.length === 0) return; - traceId.value = issueTraces.value[0].id; + if (allIssueTraces.value.length === 0) return; + traceId.value = allIssueTraces.value[0].id; firstCases.value = await conformanceStore.getConformanceTraceDetail( no, - issueTraces.value[0].id, + allIssueTraces.value[0].id, 0, ); issuesModal.value = true; @@ -543,11 +543,11 @@ const openLoopMore = async (no) => { // Use async/await to prevent errors caused by asynchronous data not being available yet loopNo.value = no; await conformanceStore.getConformanceLoop(no); - if (loopTraces.value.length === 0) return; - looptraceId.value = loopTraces.value[0].id; + if (allLoopTraces.value.length === 0) return; + looptraceId.value = allLoopTraces.value[0].id; loopFirstCases.value = await conformanceStore.getConformanceLoopsTraceDetail( no, - loopTraces.value[0].id, + allLoopTraces.value[0].id, 0, ); loopModal.value = true; @@ -959,7 +959,7 @@ const setTimeChartData = (chartData, xMax, xMin, yMax, yMin) => { }; // watch -watch(conformanceTempReportData, (newValue) => { +watch(allConformanceTempReportData, (newValue) => { if (newValue?.rule && newValue.rule.min !== null) { selectDurationTime.value = { min: newValue.rule.min, diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue index 8c60210..153fc98 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar.vue @@ -180,7 +180,7 @@ const { selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, - conformanceAllTasks, + allConformanceTask, cfmPtEteWhole, cfmPtEteStart: cfmPtEteStartStore, cfmPtEteEnd: cfmPtEteEndStore, @@ -204,7 +204,7 @@ const { conformanceRuleData, conformanceLogCreateCheckId, conformanceFilterCreateCheckId, - conformanceTempReportData, + allConformanceTempReportData, } = storeToRefs(conformanceStore); const { activityRadioData } = storeToRefs(conformanceInputStore); @@ -391,7 +391,7 @@ const isApplyBtnDisabled = computed(() => { // When opening a rule file, display the saved options, rules, and time let reportWatchTimerId = null; -watch(conformanceTempReportData, (newValue) => { +watch(allConformanceTempReportData, (newValue) => { if (reportWatchTimerId) clearTimeout(reportWatchTimerId); reportWatchTimerId = setTimeout(() => { if (newValue !== null) { diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue index 945eaf9..b544f69 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue @@ -376,8 +376,8 @@ const { selectedActSeqMore, selectedActSeqFromTo, conformanceTask, - cfmSeqStart, - cfmSeqEnd, + allCfmSeqStart, + allCfmSeqEnd, cfmPtEteStart, cfmPtEteEnd, cfmPtEteSE, @@ -435,14 +435,14 @@ const taskEnd = ref(null); const cfmSeqStartData = computed(() => { const selectedTask = task.value ?? props.isSubmitShowDataSeq?.task ?? null; return isEndSelected.value - ? setSeqStartAndEndData(cfmSeqEnd.value, "sources", selectedTask) - : cfmSeqStart.value.map((i) => i.label); + ? setSeqStartAndEndData(allCfmSeqEnd.value, "sources", selectedTask) + : allCfmSeqStart.value.map((i) => i.label); }); const cfmSeqEndData = computed(() => { const selectedTask = task.value ?? props.isSubmitShowDataSeq?.task ?? null; return isStartSelected.value - ? setSeqStartAndEndData(cfmSeqStart.value, "sinks", selectedTask) - : cfmSeqEnd.value.map((i) => i.label); + ? setSeqStartAndEndData(allCfmSeqStart.value, "sinks", selectedTask) + : allCfmSeqEnd.value.map((i) => i.label); }); // Processing time const cfmPtEteStartData = computed(() => { @@ -584,7 +584,7 @@ watch( /** * Sets the start and end radio data. - * @param {object} data - Activities list data from the backend (cfmSeqStart, cfmSeqEnd, cfmPtEteSE, etc.). + * @param {object} data - Activities list data from the backend (allCfmSeqStart, allCfmSeqEnd, cfmPtEteSE, etc.). * @param {string} category - 'start' or 'end'. * @returns {array} */ @@ -615,7 +615,7 @@ function setStartAndEndData(data, category, taskVal) { } /** * Resets the activity sequence linked start and end radio data. - * @param {object} data - Activities list data from the backend (cfmSeqStart or cfmSeqEnd). + * @param {object} data - Activities list data from the backend (allCfmSeqStart or allCfmSeqEnd). * @param {string} category - 'sources' or 'sinks'. * @param {string} task - The selected activity task. * @returns {array} diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue index c01a3fa..e959a3a 100644 --- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue +++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue @@ -250,10 +250,10 @@ const { selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, - conformanceAllTasks, + allConformanceTask, conformanceTask, - cfmSeqStart, - cfmSeqEnd, + allCfmSeqStart, + allCfmSeqEnd, cfmPtEteStart, cfmPtEteEnd, cfmPtEteSE, @@ -471,7 +471,7 @@ emitter.on("actRadioData", (data) => { // Activity duration case "cfmDur": state.timeDuration = getDurationTime( - conformanceAllTasks.value, + allConformanceTask.value, "act", task, ); diff --git a/src/stores/conformance.ts b/src/stores/conformance.ts index 6a18ab3..4fb4ce1 100644 --- a/src/stores/conformance.ts +++ b/src/stores/conformance.ts @@ -91,18 +91,9 @@ export const useConformanceStore = defineStore("conformanceStore", { conformanceFileName: null, // File name displayed in the save success modal }), getters: { - conformanceAllTasks: (state) => { - return state.allConformanceTask; - }, conformanceTask: (state) => { return state.allConformanceTask.map((i) => i.label); }, - cfmSeqStart: (state) => { - return state.allCfmSeqStart; - }, - cfmSeqEnd: (state) => { - return state.allCfmSeqEnd; - }, cfmPtEteWhole: (state) => { return state.allProcessingTime.end_to_end.whole; }, @@ -157,18 +148,6 @@ export const useConformanceStore = defineStore("conformanceStore", { cfmCtEteSE: (state) => { return state.allCycleTime.end_to_end.start_end; }, - conformanceTempReportData: (state) => { - return state.allConformanceTempReportData; - }, - routeFile: (state) => { - return state.allRouteFile; - }, - issueTraces: (state) => { - return state.allIssueTraces; - }, - taskSeq: (state) => { - return state.allTaskSeq; - }, cases: (state) => { if (state.allCases !== null) { return state.allCases.map((c) => { @@ -220,12 +199,6 @@ export const useConformanceStore = defineStore("conformanceStore", { } return []; }, - loopTraces: (state) => { - return state.allLoopTraces; - }, - loopTaskSeq: (state) => { - return state.allLoopTaskSeq; - }, loopCases: (state) => { if (state.allLoopCases !== null) { return state.allLoopCases.map((c) => { diff --git a/src/views/Compare/MapCompare.vue b/src/views/Compare/MapCompare.vue index bd6520c..126a4c7 100644 --- a/src/views/Compare/MapCompare.vue +++ b/src/views/Compare/MapCompare.vue @@ -138,7 +138,7 @@ export default { break; } await conformanceStore.getConformanceReport(true); - to.meta.file = conformanceStore.routeFile; + to.meta.file = conformanceStore.allRouteFile; } next(); }, diff --git a/src/views/Discover/Conformance/ConformancePage.vue b/src/views/Discover/Conformance/ConformancePage.vue index e89ab09..483089f 100644 --- a/src/views/Discover/Conformance/ConformancePage.vue +++ b/src/views/Discover/Conformance/ConformancePage.vue @@ -42,7 +42,7 @@ defineOptions({ break; } await conformanceStore.getConformanceReport(); - to.meta.file = await conformanceStore.conformanceTempReportData?.file; + to.meta.file = await conformanceStore.allConformanceTempReportData?.file; } next(); }, @@ -68,7 +68,7 @@ const { selectedActSeqMore, selectedActSeqFromTo, conformanceRuleData, - conformanceTempReportData, + allConformanceTempReportData, conformanceFileName, } = storeToRefs(conformanceStore); diff --git a/src/views/Discover/Map/MapPage.vue b/src/views/Discover/Map/MapPage.vue index df7615c..6ea6e28 100644 --- a/src/views/Discover/Map/MapPage.vue +++ b/src/views/Discover/Map/MapPage.vue @@ -137,7 +137,7 @@ export default { break; } await conformanceStore.getConformanceReport(true); - to.meta.file = conformanceStore.routeFile; + to.meta.file = conformanceStore.allRouteFile; } next(); }, diff --git a/src/views/Discover/Performance/PerformancePage.vue b/src/views/Discover/Performance/PerformancePage.vue index b400b6a..e72c4fb 100644 --- a/src/views/Discover/Performance/PerformancePage.vue +++ b/src/views/Discover/Performance/PerformancePage.vue @@ -263,7 +263,7 @@ export default { break; } await conformanceStore.getConformanceReport(true); - to.meta.file = conformanceStore.routeFile; + to.meta.file = conformanceStore.allRouteFile; } next(); },