diff --git a/app/composables/run_function_when_microservices_connected.js b/app/composables/run_function_when_microservices_connected.js index e12371e5..f044ef28 100644 --- a/app/composables/run_function_when_microservices_connected.js +++ b/app/composables/run_function_when_microservices_connected.js @@ -1,17 +1,20 @@ import { useInfraStore } from "@ogw_front/stores/infra"; -export function run_function_when_microservices_connected(function_to_run) { +export function runFunctionWhenMicroservicesConnected(functionToRun) { const infraStore = useInfraStore(); const { microservices_connected } = storeToRefs(infraStore); console.log("inside microservices_connected", microservices_connected.value); if (microservices_connected.value) { - function_to_run(); - } else { - watch(microservices_connected, (value) => { + functionToRun(); + } + watch( + microservices_connected, + (value) => { if (value) { console.log("watch microservices_connected", value); - function_to_run(); + functionToRun(); } - }); - } + }, + { once: true }, + ); } diff --git a/app/utils/config.js b/app/utils/config.js index 4f2adef6..49a51716 100644 --- a/app/utils/config.js +++ b/app/utils/config.js @@ -27,14 +27,14 @@ function extensionsConf(projectName) { return extensionsConfig; } -function addExtensionToConf(projectName, { extensionID, extensionPath }) { +function addExtensionToConf(projectName, { extensionId, extensionPath }) { const projectConfig = projectConf(projectName); - projectConfig.set(`extensions.${extensionID}.path`, extensionPath); + projectConfig.set(`extensions.${extensionId}.path`, extensionPath); } -async function removeExtensionFromConf(projectName, extensionID) { +async function removeExtensionFromConf(projectName, extensionId) { const projectConfig = projectConf(projectName); - const extensionArchivePath = extensionPathFromConf(projectName, extensionID); + const extensionArchivePath = extensionPathFromConf(projectName, extensionId); await unlink(extensionArchivePath, (error) => { if (error) { @@ -42,13 +42,13 @@ async function removeExtensionFromConf(projectName, extensionID) { } console.log(`${extensionArchivePath} was deleted`); }); - projectConfig.delete(`extensions.${extensionID}`); - console.log(`${extensionID} was deleted from ${projectName} config`); + projectConfig.delete(`extensions.${extensionId}`); + console.log(`${extensionId} was deleted from ${projectName} config`); } -function extensionPathFromConf(projectName, extensionID) { +function extensionPathFromConf(projectName, extensionId) { const projectConfig = projectConf(projectName); - return projectConfig.get(`extensions.${extensionID}.path`); + return projectConfig.get(`extensions.${extensionId}.path`); } export { diff --git a/app/utils/local/path.js b/app/utils/local/path.js index dcf90343..0d5cc041 100644 --- a/app/utils/local/path.js +++ b/app/utils/local/path.js @@ -49,8 +49,8 @@ function generateProjectFolderPath(projectName) { return path.join(os.tmpdir(), projectName.replaceAll("/", "_"), uuidv4()); } -function extensionFolderPath(projectFolderPath, extensionID) { - return path.join(projectFolderPath, "extensions", extensionID); +function extensionFolderPath(projectFolderPath, extensionId) { + return path.join(projectFolderPath, "extensions", extensionId); } async function lookForLocalExtensionDistPath(rootPath, extentionRepoName, frontendFile) { diff --git a/server/api/extensions/run.post.js b/server/api/extensions/run.post.js index 4084ba74..355d5206 100644 --- a/server/api/extensions/run.post.js +++ b/server/api/extensions/run.post.js @@ -25,11 +25,11 @@ export default defineEventHandler(async (event) => { const extensionsConfig = extensionsConf(projectName); const extensionsArray = await Promise.all( - Object.keys(extensionsConfig).map(async (extensionID) => { - const extensionPath = extensionsConfig[extensionID].path; + Object.keys(extensionsConfig).map(async (extensionId) => { + const extensionPath = extensionsConfig[extensionId].path; const unzippedExtensionPath = await unzipFile( extensionPath, - extensionFolderPath(projectFolderPath, extensionID), + extensionFolderPath(projectFolderPath, extensionId), ); const metadataPath = path.join(unzippedExtensionPath, "metadata.json"); const metadataContent = await fs.promises.readFile(metadataPath, "utf8"); diff --git a/server/api/extensions/upload.put.js b/server/api/extensions/upload.put.js index f6f7b8ab..5a812e9e 100644 --- a/server/api/extensions/upload.put.js +++ b/server/api/extensions/upload.put.js @@ -83,7 +83,7 @@ export default defineEventHandler(async (event) => { const metadata = JSON.parse(metadataJson); const { id } = metadata; await addExtensionToConf(projectName, { - extensionID: id, + extensionId: id, extensionPath: file, }); }), diff --git a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js index d1d53e95..14fb0678 100644 --- a/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js +++ b/tests/unit/composables/run_function_when_microservices_connected.nuxt.test.js @@ -4,7 +4,7 @@ import { flushPromises } from "@vue/test-utils"; // Local imports import { Status } from "@ogw_front/utils/status"; -import { run_function_when_microservices_connected } from "@ogw_front/composables/run_function_when_microservices_connected"; +import { runFunctionWhenMicroservicesConnected } from "@ogw_front/composables/run_function_when_microservices_connected"; import { setupActivePinia } from "@ogw_tests/utils"; import { useBackStore } from "@ogw_front/stores/back"; import { useInfraStore } from "@ogw_front/stores/infra"; @@ -40,7 +40,7 @@ describe("when_microservices_connected_run_function", () => { test("microservices not connected", () => { const spy = vi.spyOn(dumb_obj, "dumb_method"); - run_function_when_microservices_connected(dumb_obj.dumb_method); + runFunctionWhenMicroservicesConnected(dumb_obj.dumb_method); backStore.$patch({ status: Status.NOT_CONNECTED }); viewerStore.$patch({ status: Status.NOT_CONNECTED }); expect(spy).not.toHaveBeenCalled(); @@ -48,7 +48,7 @@ describe("when_microservices_connected_run_function", () => { test("microservices connected", async () => { const spy = vi.spyOn(dumb_obj, "dumb_method"); - run_function_when_microservices_connected(dumb_obj.dumb_method); + runFunctionWhenMicroservicesConnected(dumb_obj.dumb_method); backStore.$patch({ status: Status.CONNECTED }); viewerStore.$patch({ status: Status.CONNECTED }); await flushPromises();