Merge branch 'main' into pierremtb/issue5101-Allow-feature-tree-selection-for-point-and-click-Sweep

Relates to #5101

src/lib/commandBarConfigs/modelingCommandConfig.ts

@@ -313,7 +313,7 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
     args: {
       target: {
         inputType: 'selection',
-        selectionTypes: ['solid2d'],
+        selectionTypes: ['solid2d', 'plane'],
         required: true,
         skip: true,
         multiple: false,
@@ -322,7 +322,7 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
       },
       trajectory: {
         inputType: 'selection',
-        selectionTypes: ['segment', 'path'],
+        selectionTypes: ['segment', 'plane'],
         required: true,
         skip: false,
         multiple: false,

src/lib/commandBarConfigs/validators.ts

@@ -222,24 +222,31 @@ export const sweepValidator = async ({
 
   // Retrieve the parent path from the segment selection directly
   const trajectoryArtifact = data.trajectory.graphSelections[0].artifact
-  if (!trajectoryArtifact) {
+  let trajectory: string | undefined = undefined
+  if (trajectoryArtifact && trajectoryArtifact.type === 'segment') {
+    trajectory = trajectoryArtifact.pathId
+  } else if (trajectoryArtifact && trajectoryArtifact.type === 'plane') {
+    // TODO: check again after multi profile
+    trajectory = trajectoryArtifact.pathIds[0]
+  }
+
+  if (!trajectory) {
     return "Unable to sweep, couldn't find the trajectory artifact"
   }
-  if (trajectoryArtifact.type !== 'segment') {
-    return "Unable to sweep, couldn't find the target from a non-segment selection"
-  }
-  const trajectory = trajectoryArtifact.pathId
 
   // Get the former arg in the command bar flow, and retrieve the path from the solid2d directly
   const targetArg = context.argumentsToSubmit['target'] as Selections
   const targetArtifact = targetArg.graphSelections[0].artifact
-  if (!targetArtifact) {
+  let target: string | undefined = undefined
+  if (targetArtifact && targetArtifact.type === 'solid2D') {
+    target = targetArtifact.pathId
+  } else if (targetArtifact && targetArtifact.type === 'plane') {
+    target = targetArtifact.pathIds[0]
+  }
+
+  if (!target) {
     return "Unable to sweep, couldn't find the profile artifact"
   }
-  if (targetArtifact.type !== 'solid2d') {
-    return "Unable to sweep, couldn't find the target from a non-solid2d selection"
-  }
-  const target = targetArtifact.pathId
 
   const sweepCommand = async () => {
     // TODO: second look on defaults here