Merge pull request #177 from Geode-solutions/next

Next

Author: JulienChampagnol

components/ObjectSelector.vue

@@ -1,7 +1,7 @@
 <template>
   <FetchingData v-if="loading" />
   <v-row v-else-if="Object.keys(allowed_objects).length" class="justify-left">
-    <v-col v-for="(value, key) in allowed_objects" :key="key" cols="2" md="4">
+    <v-col v-for="(value, key) in allowed_objects" :key="key" cols="3" md="4">
       <v-tooltip
         :text="
           value['is_loadable']
@@ -107,6 +107,9 @@
     }
 
     allowed_objects.value = final_object
+    if (Object.keys(allowed_objects.value).length == 1) {
+      set_geode_object(Object.keys(allowed_objects.value)[0])
+    }
     toggle_loading()
   }
 

package.json

@@ -73,4 +73,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

test/components/ObjectSelector.nuxt.test.js

@@ -21,18 +21,18 @@ const vuetify = createVuetify({
   directives,
 })
 
-const geode_object = "BRep"
 describe("ObjectSelector.vue", async () => {
   const pinia = createTestingPinia()
   setActivePinia(pinia)
   const geode_store = use_geode_store()
   geode_store.base_url = ""
 
-  test(`BRep`, async () => {
+  test(`test loadable with one class`, async () => {
     var response = {
       allowed_objects: {},
     }
-    response["allowed_objects"][geode_object] = { is_loadable: true }
+    const geode_object_1 = "BRep"
+    response["allowed_objects"][geode_object_1] = { is_loadable: true }
     registerEndpoint(allowed_objects.$id, {
       method: allowed_objects.methods[0],
       handler: () => response,
@@ -45,12 +45,40 @@ describe("ObjectSelector.vue", async () => {
     })
     const v_card = wrapper.findComponent(components.VCard)
     const v_img = v_card.findComponent(components.VImg)
-    expect(v_img.vm.src).toContain(`${geode_object}.svg`)
+    expect(v_img.vm.src).toContain(`${geode_object_1}.svg`)
+    expect(wrapper.emitted()).toHaveProperty("update_values")
+    expect(wrapper.emitted().update_values).toHaveLength(1)
+    expect(wrapper.emitted().update_values[0][0]).toEqual({
+      input_geode_object: geode_object_1,
+    })
+  })
+
+  test(`test loabable with multiple classes`, async () => {
+    var response = {
+      allowed_objects: {},
+    }
+    const geode_object_1 = "BRep"
+    const geode_object_2 = "EdgedCurve3D"
+    response["allowed_objects"][geode_object_1] = { is_loadable: true }
+    response["allowed_objects"][geode_object_2] = { is_loadable: true }
+    registerEndpoint(allowed_objects.$id, {
+      method: allowed_objects.methods[0],
+      handler: () => response,
+    })
+    const wrapper = await mountSuspended(ObjectSelector, {
+      global: {
+        plugins: [vuetify, pinia],
+      },
+      props: { filenames: ["test.toto"], supported_feature: "test" },
+    })
+    const v_card = wrapper.findComponent(components.VCard)
+    const v_img = v_card.findComponent(components.VImg)
+    expect(v_img.vm.src).toContain(`${geode_object_1}.svg`)
     await v_card.trigger("click")
     expect(wrapper.emitted()).toHaveProperty("update_values")
     expect(wrapper.emitted().update_values).toHaveLength(1)
     expect(wrapper.emitted().update_values[0][0]).toEqual({
-      input_geode_object: geode_object,
+      input_geode_object: geode_object_1,
     })
   })
 })