Merge pull request #100 from Geode-solutions/next

Next

Author: JulienChampagnol

.github/workflows/CICD.yml

@@ -25,7 +25,7 @@ jobs:
         uses: cycjimmy/semantic-release-action@v3
         id: semantic
         env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_TOKEN: ${{ secrets.TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       - name: Merge master -> next
         if: github.ref == 'refs/heads/master'

components/ExtensionSelector.vue

@@ -39,7 +39,7 @@
                       :color="extension.is_saveable ? 'primary' : 'grey'"
                       hover
                       @click="
-                        set_variables(output_geode_object, output_extension)
+                        update_values(output_geode_object, output_extension)
                       "
                       :disabled="!extension.is_saveable"
                     >
@@ -123,13 +123,12 @@
     toggle_loading()
   }
 
-  function set_variables(output_geode_object, output_extension) {
+  function update_values(output_geode_object, output_extension) {
     if (output_geode_object != "" && output_extension != "") {
-      const keys_values_object = {
+      emit("update_values", {
         output_geode_object,
         output_extension,
-      }
-      emit("update_values", keys_values_object)
+      })
       emit("increment_step")
     }
   }

components/Inspector/InspectionButton.vue

@@ -0,0 +1,50 @@
+<template>
+  <div class="pa-0">
+    <v-btn
+      :loading="loading"
+      color="primary"
+      @click="get_inspection_results(props.input_geode_object, props.filename)"
+    >
+      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>
+
+<script setup>
+  import schemas from "@geode/opengeodeweb-back/schemas.json"
+  const schema = schemas.opengeodeweb_back.inspect_file
+
+  const emit = defineEmits([
+    "update_values",
+    "increment_step",
+    "decrement_step",
+  ])
+  const props = defineProps({
+    input_geode_object: { type: String, required: true },
+    filename: { type: String, required: true },
+  })
+  const loading = ref(false)
+  const toggle_loading = useToggle(loading)
+
+  async function get_inspection_results(input_geode_object, filename) {
+    toggle_loading()
+    const params = { input_geode_object, filename }
+
+    await api_fetch(
+      { schema, params },
+      {
+        response_function: (response) => {
+          emit("update_values", {
+            inspection_result: [response._data.inspection_result],
+          })
+          emit("increment_step")
+        },
+      },
+    )
+    toggle_loading()
+  }
+</script>

components/Inspector/ResultPanel.vue

@@ -0,0 +1,55 @@
+<template>
+  <v-container class="pa-2">
+    <v-expansion-panels v-model="opened_panels" multiple elevation="5">
+      <v-expansion-panel
+        v-for="(result, index) in props.inspection_result"
+        :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"
+            :inspection_result="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>
+
+<script setup>
+  const props = defineProps({
+    inspection_result: { type: Array, required: true },
+  })
+  const opened_panels = ref([])
+
+  onMounted(async () => {
+    opened_panels.value = props.inspection_result
+      .map((result, i) => (result.nb_issues > 0 ? i : -1))
+      .filter((index) => index !== -1)
+  })
+</script>

package.json

@@ -38,7 +38,7 @@
   "version": "0.0.0-semantically-released",
   "main": "./nuxt.config.js",
   "dependencies": {
-    "@geode/opengeodeweb-back": "4.0.0",
+    "@geode/opengeodeweb-back": "4.1.0",
     "@geode/opengeodeweb-viewer": "0.1.1",
     "@kitware/vtk.js": "^30.3.1",
     "@mdi/font": "^7.4.47",
@@ -52,7 +52,7 @@
     "semver": "^7.6.0",
     "vue-recaptcha": "^2.0.3",
     "vue3-carousel": "^0.3.3",
-    "vuetify": "^3.5.14"
+    "vuetify": "^3.6.3"
   },
   "repository": {
     "type": "git",

test/components/ErrorsBanner.nuxt.test.js renamed to test/components/Errors/ErrorsBanner.nuxt.test.js

@@ -15,11 +15,20 @@ const vuetify = createVuetify({
 
 describe("ErrorsSnackers.vue", async () => {
   test(`Test delete error`, async () => {
-    const wrapper = await mount(ErrorsSnackers, {
-      global: {
-        plugins: [vuetify],
+    const wrapper = mount(
+      {
+        template: "<v-layout><ErrorsSnackers/></v-layout>",
       },
-    })
+      {
+        props: {},
+        global: {
+          components: {
+            ErrorsSnackers,
+          },
+          plugins: [vuetify],
+        },
+      },
+    )
 
     const errors_store = use_errors_store()
     const error = {
@@ -30,7 +39,7 @@ describe("ErrorsSnackers.vue", async () => {
     }
     await errors_store.add_error(error)
     expect(errors_store.errors.length).toBe(1)
-    const v_btn = wrapper.findComponent(components.VBtn)
+    const v_btn = await wrapper.findComponent(components.VBtn)
     await v_btn.trigger("click")
     expect(errors_store.errors.length).toBe(0)
   })

test/components/ErrorsSnackers.nuxt.test.js renamed to test/components/Errors/ErrorsSnackers.nuxt.test.js

@@ -11,8 +11,7 @@ import ExtensionSelector from "@/components/ExtensionSelector.vue"
 
 import schemas from "@geode/opengeodeweb-back/schemas.json"
 
-const geode_objects_and_output_extensions =
-  schemas.opengeodeweb_back.geode_objects_and_output_extensions
+const schema = schemas.opengeodeweb_back.geode_objects_and_output_extensions
 
 const vuetify = createVuetify({
   components,
@@ -24,8 +23,8 @@ describe("ExtensionSelector.vue", async () => {
     const output_geode_object = "BRep"
     const output_extension = "msh"
 
-    registerEndpoint(geode_objects_and_output_extensions.$id, {
-      method: geode_objects_and_output_extensions.methods[0],
+    registerEndpoint(schema.$id, {
+      method: schema.methods[0],
       handler: () => ({
         geode_objects_and_output_extensions: {
           BRep: { msh: { is_saveable: true } },
@@ -44,7 +43,7 @@ describe("ExtensionSelector.vue", async () => {
     // await v_card[1].trigger("click")
     // expect(wrapper.emitted()).toHaveProperty("update_values")
     // expect(wrapper.emitted().update_values).toHaveLength(1)
-    // expect(wrapper.emitted().update_values[0][0]).toEqual({
+    // expect(wrapper.emitted().update_values[0][0]).toStrictEqual({
     //   output_geode_object,
     //   output_extension,
     // })

test/components/ExtensionSelector.nuxt.test.js

@@ -0,0 +1,67 @@
+// @vitest-environment nuxt
+
+import { describe, expect, test } from "vitest"
+import { registerEndpoint, mountSuspended } from "@nuxt/test-utils/runtime"
+import { flushPromises } from "@vue/test-utils"
+
+import { createVuetify } from "vuetify"
+import * as components from "vuetify/components"
+import * as directives from "vuetify/directives"
+
+import InspectorInspectionButton from "@/components/Inspector/InspectionButton.vue"
+import schemas from "@geode/opengeodeweb-back/schemas.json"
+const schema = schemas.opengeodeweb_back.inspect_file
+
+const vuetify = createVuetify({
+  components,
+  directives,
+})
+
+describe("Inspector/InspectionButton.vue", async () => {
+  test(`Test with issues`, async () => {
+    var 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"],
+        },
+      ],
+    }
+
+    registerEndpoint(schema.$id, {
+      method: schema.methods[0],
+      handler: () => ({
+        inspection_result,
+      }),
+    })
+    const input_geode_object = "BRep"
+    const filename = "test.txt"
+
+    const wrapper = await mountSuspended(InspectorInspectionButton, {
+      global: {
+        plugins: [vuetify],
+      },
+      props: { input_geode_object, 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")
+  })
+})

test/components/Inspector/InspectionButon.nuxt.test.js

@@ -0,0 +1,68 @@
+// @vitest-environment nuxt
+
+import { describe, expect, test } from "vitest"
+import { mountSuspended } from "@nuxt/test-utils/runtime"
+
+import { createVuetify } from "vuetify"
+import * as components from "vuetify/components"
+import * as directives from "vuetify/directives"
+
+import InspectorResultPanel from "@/components/Inspector/ResultPanel.vue"
+
+const vuetify = createVuetify({
+  components,
+  directives,
+})
+
+describe("Inspector/ResultPanel.vue", async () => {
+  test(`Test with issues`, async () => {
+    const inspection_result = [
+      {
+        title: "Brep inspection",
+        nb_issues: 26,
+        children: [],
+      },
+    ]
+
+    const wrapper = await mountSuspended(InspectorResultPanel, {
+      global: {
+        plugins: [vuetify],
+      },
+      props: { inspection_result },
+    })
+
+    expect(wrapper.exists()).toBe(true)
+    expect(wrapper.componentVM.opened_panels._value).toStrictEqual([0])
+    expect(wrapper.componentVM.props.inspection_result).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.props.inspection_result,
+    ).toStrictEqual(inspection_result[0].children)
+  })
+
+  test(`Test without issues`, async () => {
+    const inspection_result = [
+      {
+        title: "Brep inspection",
+        nb_issues: 0,
+      },
+    ]
+    const wrapper = await mountSuspended(InspectorResultPanel, {
+      global: {
+        plugins: [vuetify],
+      },
+      props: { inspection_result },
+    })
+
+    expect(wrapper.exists()).toBe(true)
+    expect(wrapper.componentVM.opened_panels._value).toStrictEqual([])
+    expect(wrapper.componentVM.props.inspection_result).toStrictEqual(
+      inspection_result,
+    )
+  })
+})