From 9d2e4f1a92063ce28e25e180fc539c1b773c0a11 Mon Sep 17 00:00:00 2001 From: Florinda Date: Thu, 19 Dec 2024 13:05:37 +0100 Subject: [PATCH] refiniments --- src/layout/AppMenu.vue | 2 +- src/service/KsCodeRepoService.js | 12 ++++++ src/stores/KsCodeRepoStore.js | 38 +++++++++++++++++++ .../ksCodeParser/KsGitCodeParser.vue | 27 ++++++++++--- .../similaritySearch/KsSimilaritySearch.vue | 37 +++++++++++++++++- 5 files changed, 108 insertions(+), 8 deletions(-) create mode 100644 src/service/KsCodeRepoService.js create mode 100644 src/stores/KsCodeRepoStore.js diff --git a/src/layout/AppMenu.vue b/src/layout/AppMenu.vue index 93892c7..254ade5 100644 --- a/src/layout/AppMenu.vue +++ b/src/layout/AppMenu.vue @@ -16,7 +16,7 @@ const model = ref([ label: 'Vector Database', items: [//{ label: 'Dashboard', icon: 'pi pi-fw pi-home', to: '/' }, { label: 'Similarity Search', icon: 'pi pi-fw pi-search', to: '/ks_similarity_search' }, - { label: 'Vector Database Search', icon: 'pi pi-fw pi-search', to: '/ks_vector_data' } + //{ label: 'Vector Database Search', icon: 'pi pi-fw pi-search', to: '/ks_vector_data' } ] }, ]); diff --git a/src/service/KsCodeRepoService.js b/src/service/KsCodeRepoService.js new file mode 100644 index 0000000..a248748 --- /dev/null +++ b/src/service/KsCodeRepoService.js @@ -0,0 +1,12 @@ +import axios from 'axios'; +export const KsCodeRepoService = { + getKsCodeRepo() { + return axios.get('/fe-api/ks_git_repos') + }, + + pauseRERepo(processId){ + return axios.get('/java-re-module/pauseRERepo/'+processId) + } + + +} \ No newline at end of file diff --git a/src/stores/KsCodeRepoStore.js b/src/stores/KsCodeRepoStore.js new file mode 100644 index 0000000..2751055 --- /dev/null +++ b/src/stores/KsCodeRepoStore.js @@ -0,0 +1,38 @@ +import { defineStore } from 'pinia'; +import { computed, ref } from 'vue'; +import { KsCodeRepoService } from '../service/KsCodeRepoService'; +import { LoadingStore } from './LoadingStore'; + + +export const KsCodeRepoStore = defineStore('ks_code_repo_store', () => { + + const lstKsCodeRepo = ref([]) + const selectedKsCodeRepo = ref(null) + const loadingStore = LoadingStore() + + + async function fetchKsCodeRepoStore() { + console.log("i'm in"); + loadingStore.scenario_loading = true; + return KsCodeRepoService.getKsCodeRepo().then(resp => { + lstKsCodeRepo.value = resp.data; + console.log("lstKsCodeRepo", lstKsCodeRepo.value); + loadingStore.scenario_loading = false; + }); + + } + const KsCodeRepo = computed(() => { + return lstKsCodeRepo.value + }) + + const getSelectedKsCodeRepo = computed(() => { + return selectedKsCodeRepo.value + }) + + async function setSelectedKsCodeRepo(ksDoc){ + selectedKsCodeRepo.value = ksDoc + console.log("selectedKsCodeRepo", selectedKsCodeRepo.value); + } + + return { fetchKsCodeRepoStore, selectedKsCodeRepo, KsCodeRepo, getSelectedKsCodeRepo, setSelectedKsCodeRepo} + }) \ No newline at end of file diff --git a/src/views/pages/ksGitRepo/ksCodeParser/KsGitCodeParser.vue b/src/views/pages/ksGitRepo/ksCodeParser/KsGitCodeParser.vue index 206a15c..98325f3 100644 --- a/src/views/pages/ksGitRepo/ksCodeParser/KsGitCodeParser.vue +++ b/src/views/pages/ksGitRepo/ksCodeParser/KsGitCodeParser.vue @@ -222,7 +222,7 @@ import { FilterMatchMode, FilterOperator } from '@primevue/core/api'; import axios from 'axios'; import moment from 'moment'; import { useToast } from 'primevue/usetoast'; -import { onMounted, ref } from 'vue'; +import { onMounted, ref, watch } from 'vue'; import { useRouter } from 'vue-router'; import { useConfirm } from "primevue/useconfirm"; @@ -231,6 +231,9 @@ import ProgressBar from 'primevue/progressbar'; import VueJsonView from '@matpool/vue-json-view'; +import ProgressBar from 'primevue/progressbar'; +import { KsCodeRepoStore } from '../../../../stores/KsCodeRepoStore'; +import { UserPrefStore } from '../../../../stores/UserPrefStore'; //dialog import cloneForm from './KsGitCodeParserDialog.vue'; @@ -259,12 +262,12 @@ const loading = ref(true); const toast = useToast(); const confirm = useConfirm(); const expandedRows = ref({}); - +const ks_code_repo_store = KsCodeRepoStore(); const ingestionResult = ref(''); const popupTitle = ref(''); const popupMessage = ref(''); const statuses = ref(['ERROR', 'IN-PROGRESS', 'INGESTED', 'NEW', 'COMPLETED']); - +const userPrefStore = UserPrefStore(); const collapsed = ref(1) const theme = ref('bright:inverted') const sortKeys = ref(true) @@ -402,10 +405,16 @@ function calculateCustomerTotal(name) { const fetchCodeRepoInfo = async () => { try { - const response = await axios.get('/fe-api/ks_git_repos'); + await ks_code_repo_store.fetchKsCodeRepoStore() + console.log("here"); + //const response = await axios.get('/fe-api/ks_git_repos'); //console.log(response.data); - const filterDate = getCustomDatewithAllResponse(response.data); + //const filterDate = getCustomDatewithAllResponse(response.data); + console.log("ks_code_repo_store", ks_code_repo_store.KsCodeRepo); + const filterDate = getCustomDatewithAllResponse(ks_code_repo_store.KsCodeRepo); + console.log("filterDate", filterDate); const filterParseEnabled = getCustomJsonWithJavaParseEnabled(filterDate); + console.log("filterParseEnabled", filterParseEnabled); codeRepoInfo.value = await updateParsingProgress(filterParseEnabled); codeRepoInfo.value = await updateRevProgress(filterParseEnabled); loading.value = false; @@ -414,6 +423,12 @@ const fetchCodeRepoInfo = async () => { } }; +function updateKsRepo() { + stopPolling(); + fetchCodeRepoInfo(); + startPolling(); +}; + const getCustomDatewithAllResponse = (data) => { return [...(data || [])].map((d) => { d.ingestionDateFormat = new Date(d.ingestionDateFormat); @@ -639,6 +654,8 @@ const collapseAll = () => { function isButtonDisabled(data) { return data.cloneStatus !== 'COMPLETED'; } + +watch(() => userPrefStore.getSelApp, updateKsRepo, { immediate: true });