@geode/opengeodeweb-front 10.3.0 → 10.3.1

package/app/utils/default_styles.js

@@ -22,18 +22,18 @@ const blocks_defaultVisibility = true
 const blocks_defaultColor = { r: 255, g: 255, b: 255 }
 
 // Mesh functions
-const meshPointsDefaultStyle = (
+function meshPointsDefaultStyle(
   visibility = points_defaultVisibility,
   size = points_defaultSize,
   color = points_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
       active: "color",
       color,
       vertex: {
-        name: null,
+        name: undefined,
         storedConfigs: {},
       },
     },
@@ -41,22 +41,22 @@ const meshPointsDefaultStyle = (
   }
 }
 
-const meshEdgesDefaultStyle = (
+function meshEdgesDefaultStyle(
   visibility = edges_defaultVisibility,
   width = edges_defaultWidth,
   color = edges_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
       active: "color",
       color,
       edge: {
-        name: null,
+        name: undefined,
         storedConfigs: {},
       },
       vertex: {
-        name: null,
+        name: undefined,
         storedConfigs: {},
       },
     },
@@ -64,79 +64,79 @@ const meshEdgesDefaultStyle = (
   }
 }
 
-const meshCellsDefaultStyle = (
+function meshCellsDefaultStyle(
   visibility = cells_defaultVisibility,
   color = cells_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
       active: "color",
       cell: {
-        name: null,
+        name: undefined,
         storedConfigs: {},
       },
       color,
-      textures: null,
+      textures: undefined,
       vertex: {
-        name: null,
+        name: undefined,
         storedConfigs: {},
       },
     },
   }
 }
 
-const meshPolygonsDefaultStyle = (
+function meshPolygonsDefaultStyle(
   visibility = polygons_defaultVisibility,
   color = polygons_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
       active: "color",
       color,
-      textures: null,
+      textures: undefined,
       polygon: {
-        name: null,
+        name: undefined,
         storedConfigs: {},
       },
       vertex: {
-        name: null,
+        name: undefined,
         storedConfigs: {},
       },
     },
   }
 }
 
-const meshPolyhedraDefaultStyle = (
+function meshPolyhedraDefaultStyle(
   visibility = polyhedra_defaultVisibility,
   color = polyhedra_defaultColor,
-) => {
+) {
   return {
     visibility,
     coloring: {
       active: "color",
       color,
       polyhedron: {
-        name: null,
+        name: undefined,
         storedConfigs: {},
       },
       vertex: {
-        name: null,
+        name: undefined,
         storedConfigs: {},
       },
     },
   }
 }
 
-const pointSet_defaultStyle = () => {
+function pointSet_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(),
   }
 }
 
-const edgedCurve_defaultStyle = () => {
+function edgedCurve_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(),
@@ -144,7 +144,7 @@ const edgedCurve_defaultStyle = () => {
   }
 }
 
-const grid2d_defaultStyle = () => {
+function grid2d_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -153,7 +153,7 @@ const grid2d_defaultStyle = () => {
   }
 }
 
-const grid3d_defaultStyle = () => {
+function grid3d_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -162,7 +162,7 @@ const grid3d_defaultStyle = () => {
     polyhedra: meshPolyhedraDefaultStyle(),
   }
 }
-const surface_defaultStyle = () => {
+function surface_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -171,7 +171,7 @@ const surface_defaultStyle = () => {
   }
 }
 
-const solid_defaultStyle = () => {
+function solid_defaultStyle() {
   return {
     visibility: true,
     points: meshPointsDefaultStyle(false),
@@ -182,41 +182,49 @@ const solid_defaultStyle = () => {
 }
 
 // Model functions
-const modelCornersDefaultStyle = (
+function modelCornersDefaultStyle(
   visibility = corners_defaultVisibility,
   color = corners_defaultColor,
-) => {
+) {
   return { visibility, color }
 }
-const modelLinesDefaultStyle = (
+
+function modelLinesDefaultStyle(
   visibility = lines_defaultVisibility,
   color = lines_defaultColor,
-) => {
+) {
   return { visibility, color }
 }
-const modelSurfacesDefaultStyle = (
+
+function modelSurfacesDefaultStyle(
   visibility = surfaces_defaultVisibility,
   color = surfaces_defaultColor,
-) => {
+) {
   return { visibility, color }
 }
-const modelBlocksDefaultStyle = (
+
+function modelBlocksDefaultStyle(
   visibility = blocks_defaultVisibility,
   color = blocks_defaultColor,
-) => {
+) {
   return { visibility, color }
 }
-const modelPointsDefaultStyle = (
+
+function modelPointsDefaultStyle(
   visibility = points_defaultVisibility,
-  size,
-) => {
+  size = points_defaultSize,
+) {
   return { visibility, size }
 }
-const modelEdgesDefaultStyle = (visibility = edges_defaultVisibility) => {
-  return { visibility }
+
+function modelEdgesDefaultStyle(
+  visibility = edges_defaultVisibility,
+  width = edges_defaultWidth,
+) {
+  return { visibility, width }
 }
 
-const brep_defaultStyle = () => {
+function brep_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -228,7 +236,7 @@ const brep_defaultStyle = () => {
   }
 }
 
-const crossSection_defaultStyle = () => {
+function crossSection_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -239,7 +247,7 @@ const crossSection_defaultStyle = () => {
   }
 }
 
-const structuralModel_defaultStyle = () => {
+function structuralModel_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -251,7 +259,7 @@ const structuralModel_defaultStyle = () => {
   }
 }
 
-const section_defaultStyle = () => {
+function section_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -262,7 +270,7 @@ const section_defaultStyle = () => {
   }
 }
 
-const implicitCrossSection_defaultStyle = () => {
+function implicitCrossSection_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -273,7 +281,7 @@ const implicitCrossSection_defaultStyle = () => {
   }
 }
 
-const implicitStructuralModel_defaultStyle = () => {
+function implicitStructuralModel_defaultStyle() {
   return {
     visibility: true,
     corners: modelCornersDefaultStyle(),
@@ -285,7 +293,7 @@ const implicitStructuralModel_defaultStyle = () => {
   }
 }
 
-const default_styles = () => {
+function default_styles() {
   return {
     BRep: brep_defaultStyle(),
     CrossSection: crossSection_defaultStyle(),

package/app/utils/file_import_workflow.js

@@ -2,10 +2,10 @@
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
 
 // Local imports
-import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
-import { useGeodeStore } from "@ogw_front/stores/geode"
-import { useDataStyleStore } from "@ogw_front/stores/data_style"
 import { useDataStore } from "@ogw_front/stores/data"
+import { useDataStyleStore } from "@ogw_front/stores/data_style"
+import { useGeodeStore } from "@ogw_front/stores/geode"
+import { useHybridViewerStore } from "@ogw_front/stores/hybrid_viewer"
 import { useTreeviewStore } from "@ogw_front/stores/treeview"
 
 async function importWorkflow(files) {
@@ -73,22 +73,9 @@ async function importFile(filename, geode_object_type) {
 
 async function importWorkflowFromSnapshot(items) {
   console.log("[importWorkflowFromSnapshot] start", { count: items?.length })
-  const dataStore = useDataStore()
-  const treeviewStore = useTreeviewStore()
-  const dataStyleStore = useDataStyleStore()
   const hybridViewerStore = useHybridViewerStore()
 
-  const ids = []
-  for (const item of items) {
-    const id = await importItem(
-      item,
-      dataStore,
-      treeviewStore,
-      dataStyleStore,
-      hybridViewerStore,
-    )
-    ids.push(id)
-  }
+  const ids = await Promise.all(items.map((item) => importItem(item)))
   hybridViewerStore.remoteRender()
   console.log("[importWorkflowFromSnapshot] done", { ids })
   return ids