@geode/opengeodeweb-front 10.27.0 → 10.27.1-rc.2

package/app/utils/local/cleanup.js

@@ -32,6 +32,9 @@ async function deleteFolderRecursive(folderPath) {
       console.log("Retrying delete folder");
     }
   }
+  throw new Error(
+    `Failed to delete folder ${folderPath} after ${MAX_DELETE_FOLDER_RETRIES} retries`,
+  );
 }
 
 function killHttpMicroservice(microservice) {
@@ -102,7 +105,7 @@ function killWebsocketMicroservice(microservice) {
   });
 }
 
-async function killMicroservice(microservice, microservices) {
+async function killMicroservice(microservice) {
   if (microservice.type === "back") {
     await killHttpMicroservice(microservice);
   } else if (microservice.type === "viewer") {
@@ -110,20 +113,18 @@ async function killMicroservice(microservice, microservices) {
   } else {
     throw new Error(`Unknown microservice type: ${microservice.type}`);
   }
-
-  if (microservices) {
-    const index = microservices.indexOf(microservice);
-    if (index !== -1) {
-      microservices.splice(index, 1);
-    }
-  }
 }
 
-function killMicroservices(microservices) {
+async function killMicroservices(microservices) {
   console.log("killMicroservices", { microservices });
-  return Promise.all(
-    microservices.map((microservice) => killMicroservice(microservice, microservices)),
+  const results = await Promise.allSettled(
+    microservices.map((microservice) => killMicroservice(microservice)),
   );
+  const killed = microservices.filter((_, index) => results[index].status === "fulfilled");
+  for (let i = 0; i < killed.length; i += 1) {
+    const microservice = microservices[i];
+    microservices.splice(microservices.indexOf(microservice), 1);
+  }
 }
 
 function projectMicroservices(projectFolderPath) {

package/app/utils/local/microservices.js

@@ -68,7 +68,7 @@ async function runBack(execName, execPath, args = {}) {
     projectFolderPath,
     "--upload_folder_path",
     uploadFolderPath,
-    "--allowed_origin",
+    "--allowed_origins",
     "http://localhost:*",
     "--timeout",
     "0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.27.0",
+  "version": "10.27.1-rc.2",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {
@@ -34,8 +34,8 @@
     "build": ""
   },
   "dependencies": {
-    "@geode/opengeodeweb-back": "latest",
-    "@geode/opengeodeweb-viewer": "latest",
+    "@geode/opengeodeweb-back": "next",
+    "@geode/opengeodeweb-viewer": "next",
     "@google-cloud/run": "3.2.0",
     "@kitware/vtk.js": "33.3.0",
     "@mdi/font": "7.4.47",

package/app/components/Inspector/InspectionButton.vue

@@ -1,48 +0,0 @@
-<script setup>
-import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
-import { useBackStore } from "@ogw_front/stores/back";
-
-const schema = schemas.opengeodeweb_back.inspect_file;
-
-const emit = defineEmits(["update_values", "increment_step", "decrement_step"]);
-const { geodeObjectType, filename } = defineProps({
-  geodeObjectType: { type: String, required: true },
-  filename: { type: String, required: true },
-});
-const loading = ref(false);
-const toggle_loading = useToggle(loading);
-
-async function get_inspection_results() {
-  toggle_loading();
-  const params = {
-    geode_object_type: geodeObjectType,
-    filename,
-  };
-  const backStore = useBackStore();
-
-  await backStore.request(
-    { schema, params },
-    {
-      response_function: (response) => {
-        emit("update_values", {
-          inspection_result: [response.inspection_result],
-        });
-        emit("increment_step");
-      },
-    },
-  );
-  toggle_loading();
-}
-</script>
-
-<template>
-  <div class="pa-0">
-    <v-btn :loading="loading" color="primary" @click="get_inspection_results()">
-      Inspect
-      <template #loader>
-        <v-progress-circular indeterminate size="20" color="white" width="3" />
-      </template>
-    </v-btn>
-    <v-btn variant="text" @click="emit('decrement_step')">Cancel</v-btn>
-  </div>
-</template>

package/app/components/Inspector/ResultPanel.vue

@@ -1,46 +0,0 @@
-<script setup>
-import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel";
-
-const { inspectionResult } = defineProps({
-  inspectionResult: { type: Array, required: true },
-});
-const opened_panels = ref([]);
-
-onMounted(() => {
-  opened_panels.value = inspectionResult
-    .map((result, i) => (result.nb_issues > 0 ? i : -1))
-    .filter((index) => index !== -1);
-});
-</script>
-
-<template>
-  <v-container class="pa-2">
-    <v-expansion-panels v-model="opened_panels" multiple elevation="5">
-      <v-expansion-panel v-for="(result, index) in inspectionResult" :key="index" class="card">
-        <v-expansion-panel-title>
-          <v-row align="center">
-            <v-col cols="auto">
-              <v-icon v-if="result.nb_issues == 0" color="primary" size="25">
-                mdi-check-circle-outline
-              </v-icon>
-              <v-icon v-else color="error" size="25"> mdi-close-circle </v-icon>
-            </v-col>
-            <v-col>
-              {{ result.title }}
-            </v-col>
-          </v-row>
-        </v-expansion-panel-title>
-        <v-expansion-panel-text>
-          <InspectorResultPanel v-if="result.children" :inspectionResult="result.children" />
-          <v-container v-if="result.issues">
-            <v-col>
-              <v-row v-for="(issue, index) in result.issues" :key="index" class="pa-0">
-                {{ issue }}
-              </v-row>
-            </v-col>
-          </v-container>
-        </v-expansion-panel-text>
-      </v-expansion-panel>
-    </v-expansion-panels>
-  </v-container>
-</template>

package/tests/unit/components/Inspector/InspectionButton.nuxt.test.js

@@ -1,58 +0,0 @@
-// Third party imports
-import * as components from "vuetify/components";
-import { describe, expect, test, vi } from "vitest";
-import { flushPromises } from "@vue/test-utils";
-import { mountSuspended } from "@nuxt/test-utils/runtime";
-
-// Local imports
-import { setupActivePinia, vuetify } from "@ogw_tests/utils";
-import InspectorInspectionButton from "@ogw_front/components/Inspector/InspectionButton";
-import { useBackStore } from "@ogw_front/stores/back";
-
-describe("inspector inspection button", () => {
-  const pinia = setupActivePinia();
-  const backStore = useBackStore();
-  backStore.base_url = "/";
-
-  test("with issues", async () => {
-    const inspection_result = {
-      title: "Brep inspection",
-      nb_issues: 3,
-      children: [
-        {
-          title: "Brep inspection",
-          nb_issues: 2,
-          issues: ["issue 1", "issue 2"],
-        },
-        {
-          title: "Brep inspection",
-          nb_issues: 1,
-          issues: ["issue 1"],
-        },
-      ],
-    };
-    backStore.request = vi.fn((request, callbacks) => {
-      callbacks?.response_function?.({ inspection_result });
-      return Promise.resolve({ inspection_result });
-    });
-    const geode_object_type = "BRep";
-    const filename = "test.txt";
-    const wrapper = await mountSuspended(InspectorInspectionButton, {
-      global: {
-        plugins: [vuetify, pinia],
-      },
-      props: { geode_object_type, filename },
-    });
-    expect(wrapper.exists()).toBe(true);
-    const v_btn = await wrapper.findComponent(components.VBtn);
-    await v_btn.trigger("click");
-    await flushPromises();
-
-    expect(wrapper.emitted()).toHaveProperty("update_values");
-    expect(wrapper.emitted().update_values).toHaveLength(1);
-    expect(wrapper.emitted().update_values[0][0]).toStrictEqual({
-      inspection_result: [inspection_result],
-    });
-    expect(wrapper.emitted()).toHaveProperty("increment_step");
-  });
-});

package/tests/unit/components/Inspector/ResultPanel.nuxt.test.js

@@ -1,56 +0,0 @@
-// Third party imports
-import { describe, expect, test } from "vitest";
-import { mountSuspended } from "@nuxt/test-utils/runtime";
-
-// Local imports
-import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel";
-import { vuetify } from "@ogw_tests/utils";
-
-describe("inspector result panel", () => {
-  test("with issues", async () => {
-    const inspection_result = [
-      {
-        title: "Brep inspection",
-        nb_issues: 26,
-        children: [],
-      },
-    ];
-
-    const wrapper = await mountSuspended(InspectorResultPanel, {
-      global: {
-        plugins: [vuetify],
-      },
-      props: { inspectionResult: inspection_result },
-    });
-
-    expect(wrapper.exists()).toBe(true);
-    expect(wrapper.componentVM.inspectionResult).toStrictEqual(inspection_result);
-
-    const child_result_panel_wrapper = await wrapper.findComponent(InspectorResultPanel);
-    expect(child_result_panel_wrapper.exists()).toBe(true);
-    expect(child_result_panel_wrapper.componentVM.inspectionResult).toStrictEqual(
-      inspection_result[0].children,
-    );
-  });
-
-  test("without issues", async () => {
-    const inspection_result = [
-      {
-        title: "Brep inspection",
-        nb_issues: 0,
-      },
-    ];
-    const wrapper = await mountSuspended(InspectorResultPanel, {
-      global: {
-        plugins: [vuetify],
-      },
-      props: { inspectionResult: inspection_result },
-    });
-
-    expect(wrapper.exists()).toBe(true);
-
-    console.log({ wrapper });
-
-    expect(wrapper.componentVM.inspectionResult).toStrictEqual(inspection_result);
-  });
-});