@geode/opengeodeweb-front 10.23.0-rc.1 → 10.23.0-rc.2

package/app/components/Viewer/Generic/Model/BlocksOptions.vue

@@ -63,7 +63,7 @@ const blockColorMode = computed({
   get: () => dataStyleStore.modelBlockColorMode(modelId, blockId),
   set: async (colorMode) => {
     if (blockId) {
-      await dataStyleStore.setModelBlockColorMode(modelId, blockId, colorMode);
+      await dataStyleStore.setModelComponentColorMode(modelId, blockId, colorMode);
       hybridViewerStore.remoteRender();
     }
   },

package/app/components/Viewer/Generic/Model/CornersOptions.vue

@@ -63,7 +63,7 @@ const cornerColorMode = computed({
   get: () => dataStyleStore.modelCornerColorMode(modelId, cornerId),
   set: async (colorMode) => {
     if (cornerId) {
-      await dataStyleStore.setModelCornerColorMode(modelId, cornerId, colorMode);
+      await dataStyleStore.setModelComponentColorMode(modelId, cornerId, colorMode);
       hybridViewerStore.remoteRender();
     }
   },

package/app/components/Viewer/Generic/Model/LinesOptions.vue

@@ -63,7 +63,7 @@ const lineColorMode = computed({
   get: () => dataStyleStore.modelLineColorMode(modelId, lineId),
   set: async (colorMode) => {
     if (lineId) {
-      await dataStyleStore.setModelLineColorMode(modelId, lineId, colorMode);
+      await dataStyleStore.setModelComponentColorMode(modelId, lineId, colorMode);
       hybridViewerStore.remoteRender();
     }
   },

package/app/components/Viewer/Generic/Model/SurfacesOptions.vue

@@ -63,7 +63,7 @@ const surfaceColorMode = computed({
   get: () => dataStyleStore.modelSurfaceColorMode(modelId, surfaceId),
   set: async (colorMode) => {
     if (surfaceId) {
-      await dataStyleStore.setModelSurfaceColorMode(modelId, surfaceId, colorMode);
+      await dataStyleStore.setModelComponentColorMode(modelId, surfaceId, colorMode);
       hybridViewerStore.remoteRender();
     }
   },

package/app/stores/app.js

@@ -2,6 +2,7 @@
 import { api_fetch } from "@ogw_internal/utils/api_fetch.js";
 import { upload_file } from "@ogw_internal/utils/upload_file.js";
 
+// oxlint-disable-next-line max-lines-per-function, max-statements
 export const useAppStore = defineStore("app", () => {
   const stores = [];
 

package/internal/stores/data_style/model/blocks/color.js

@@ -21,9 +21,5 @@ export function useModelBlocksColor() {
     return mode === "constant" ? "color" : mode;
   }
 
-  function setModelBlockColorMode(modelId, block_id, color_mode) {
-    return modelCommonStyle.setModelComponentColorMode(modelId, block_id, color_mode);
-  }
-
-  return { setModelBlocksColor, modelBlockColor, modelBlockColorMode, setModelBlockColorMode };
+  return { setModelBlocksColor, modelBlockColor, modelBlockColorMode };
 }

package/internal/stores/data_style/model/corners/color.js

@@ -21,9 +21,5 @@ export function useModelCornersColor() {
     return mode === "constant" ? "color" : mode;
   }
 
-  function setModelCornerColorMode(modelId, corner_id, color_mode) {
-    return modelCommonStyle.setModelComponentColorMode(modelId, corner_id, color_mode);
-  }
-
-  return { setModelCornersColor, modelCornerColor, modelCornerColorMode, setModelCornerColorMode };
+  return { setModelCornersColor, modelCornerColor, modelCornerColorMode };
 }

package/internal/stores/data_style/model/lines/color.js

@@ -21,9 +21,5 @@ export function useModelLinesColor() {
     return mode === "constant" ? "color" : mode;
   }
 
-  function setModelLineColorMode(modelId, line_id, color_mode) {
-    return modelCommonStyle.setModelComponentColorMode(modelId, line_id, color_mode);
-  }
-
-  return { setModelLinesColor, modelLineColor, modelLineColorMode, setModelLineColorMode };
+  return { setModelLinesColor, modelLineColor, modelLineColorMode };
 }

package/internal/stores/data_style/model/surfaces/color.js

@@ -22,14 +22,9 @@ export function useModelSurfacesColor() {
     return mode === "constant" ? "color" : mode;
   }
 
-  function setModelSurfaceColorMode(modelId, surface_id, color_mode) {
-    return modelCommonStyle.setModelComponentColorMode(modelId, surface_id, color_mode);
-  }
-
   return {
     setModelSurfacesColor,
     modelSurfaceColor,
     modelSurfaceColorMode,
-    setModelSurfaceColorMode,
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.23.0-rc.1",
+  "version": "10.23.0-rc.2",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {

package/tests/integration/stores/data_style/model/blocks.nuxt.test.js

@@ -172,4 +172,50 @@ describe("model blocks", () => {
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
   });
+
+  describe("block component active coloring", () => {
+    test("coloring color", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const block_ids = await dataStore.getBlocksGeodeIds(id);
+      const [block_id] = block_ids;
+      const coloringName = "color";
+      const result = dataStyleStore.setModelComponentColorMode(id, block_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelBlockColorMode(id, block_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+
+    test("coloring vertex", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const block_ids = await dataStore.getBlocksGeodeIds(id);
+      const [block_id] = block_ids;
+      await dataStyleStore.setModelBlocksVertexAttributeName(id, [block_id], "points");
+      const coloringName = "vertex";
+      const result = dataStyleStore.setModelComponentColorMode(id, block_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelBlockColorMode(id, block_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+
+    test("coloring polyhedron", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const block_ids = await dataStore.getBlocksGeodeIds(id);
+      const [block_id] = block_ids;
+      await dataStyleStore.setModelBlocksPolyhedronAttributeName(id, [block_id], "test_attribute");
+      const coloringName = "polyhedron";
+      const result = dataStyleStore.setModelComponentColorMode(id, block_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelBlockColorMode(id, block_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+  });
 });

package/tests/integration/stores/data_style/model/corners.nuxt.test.js

@@ -137,4 +137,35 @@ describe("model corners", () => {
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
   });
+
+  describe("corner component active coloring", () => {
+    test("coloring color", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const corner_ids = await dataStore.getCornersGeodeIds(id);
+      const [corner_id] = corner_ids;
+      const coloringName = "color";
+      const result = dataStyleStore.setModelComponentColorMode(id, corner_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelCornerColorMode(id, corner_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+
+    test("coloring vertex", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const corner_ids = await dataStore.getCornersGeodeIds(id);
+      const [corner_id] = corner_ids;
+      await dataStyleStore.setModelCornersVertexAttributeName(id, [corner_id], "points");
+      const coloringName = "vertex";
+      const result = dataStyleStore.setModelComponentColorMode(id, corner_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelCornerColorMode(id, corner_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+  });
 });

package/tests/integration/stores/data_style/model/lines.nuxt.test.js

@@ -170,4 +170,50 @@ describe("model lines", () => {
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
   });
+
+  describe("line component active coloring", () => {
+    test("coloring color", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const line_ids = await dataStore.getLinesGeodeIds(id);
+      const [line_id] = line_ids;
+      const coloringName = "color";
+      const result = dataStyleStore.setModelComponentColorMode(id, line_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelLineColorMode(id, line_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+
+    test("coloring vertex", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const line_ids = await dataStore.getLinesGeodeIds(id);
+      const [line_id] = line_ids;
+      await dataStyleStore.setModelLinesVertexAttributeName(id, [line_id], "points");
+      const coloringName = "vertex";
+      const result = dataStyleStore.setModelComponentColorMode(id, line_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelLineColorMode(id, line_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+
+    test("coloring edge", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const line_ids = await dataStore.getLinesGeodeIds(id);
+      const [line_id] = line_ids;
+      await dataStyleStore.setModelLinesEdgeAttributeName(id, [line_id], "test_attribute");
+      const coloringName = "edge";
+      const result = dataStyleStore.setModelComponentColorMode(id, line_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelLineColorMode(id, line_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+  });
 });

package/tests/integration/stores/data_style/model/surfaces.nuxt.test.js

@@ -174,4 +174,50 @@ describe("model surfaces", () => {
       expect(viewerStore.status).toBe(Status.CONNECTED);
     });
   });
+
+  describe("surface component active coloring", () => {
+    test("coloring color", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+      const [surface_id] = surface_ids;
+      const coloringName = "color";
+      const result = dataStyleStore.setModelComponentColorMode(id, surface_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelSurfaceColorMode(id, surface_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+
+    test("coloring vertex", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+      const [surface_id] = surface_ids;
+      await dataStyleStore.setModelSurfacesVertexAttributeName(id, [surface_id], "points");
+      const coloringName = "vertex";
+      const result = dataStyleStore.setModelComponentColorMode(id, surface_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelSurfaceColorMode(id, surface_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+
+    test("coloring polygon", async () => {
+      const dataStyleStore = useDataStyleStore();
+      const viewerStore = useViewerStore();
+      const dataStore = useDataStore();
+      const surface_ids = await dataStore.getSurfacesGeodeIds(id);
+      const [surface_id] = surface_ids;
+      await dataStyleStore.setModelSurfacesPolygonAttributeName(id, [surface_id], "test_attribute");
+      const coloringName = "polygon";
+      const result = dataStyleStore.setModelComponentColorMode(id, surface_id, coloringName);
+      expect(result).toBeInstanceOf(Promise);
+      await result;
+      expect(dataStyleStore.modelSurfaceColorMode(id, surface_id)).toBe(coloringName);
+      expect(viewerStore.status).toBe(Status.CONNECTED);
+    });
+  });
 });