Skip to content

SED-4496 plan environment selection can never be disabled #1326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neogucky merged 4 commits into from
Feb 5, 2026
+67 −50
Merged

SED-4496 plan environment selection can never be disabled #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19d5450
SED-4496 Correctly disable plan editor environment when unset
neogucky Jan 28, 2026
0779439
SED-4496 improved target execution parameters button
neogucky Jan 28, 2026
9fc2c6f
Merge branch '29' into SED-4496-plan-environment-selection-can-never-…
neogucky Feb 5, 2026
de4103a
Update projects/step-frontend/src/lib/modules/plan-editor/components/…
neogucky Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions projects/step-core/src/lib/modules/basics/components/popover/popover.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
}
}
&.bottom-left {
margin-bottom: 0.5rem;
margin-bottom: 1rem;
margin-right: -2.5rem;

.step-popover__arrow {
Expand All @@ -107,7 +107,7 @@
}
}
&.bottom-right {
margin-bottom: 0.5rem;
margin-bottom: 1rem;
margin-left: -2.5rem;

.step-popover__arrow {
Expand Down
69 changes: 42 additions & 27 deletions projects/step-core/src/lib/modules/basics/components/popover/popover.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class PopoverComponent implements PopoverService, AfterViewInit, OnDestro
@ViewChild('popoverTemplate', { static: true }) popoverTemplate!: TemplateRef<unknown>;

readonly xPosition = input<'before' | 'after'>('after');
readonly yPosition = input<'above' | 'below'>('above');
readonly yPosition = input<'above' | 'below'>('below');
readonly noPadding = input(false);
readonly withBorder = input(false);
readonly whiteBackground = input(false);
Expand Down Expand Up @@ -114,35 +114,12 @@ export class PopoverComponent implements PopoverService, AfterViewInit, OnDestro
private createOverlay(): void {
if (this.overlayRef) return;

const positions = this.buildPositions();

this.positionStrategy = this.overlay
.position()
.flexibleConnectedTo(this._el)
.withPositions([
{
originX: 'center',
originY: 'bottom',
overlayX: 'start',
overlayY: 'top',
},
{
originX: 'center',
originY: 'bottom',
overlayX: 'end',
overlayY: 'top',
},
{
originX: 'center',
originY: 'top',
overlayX: 'end',
overlayY: 'bottom',
},
{
originX: 'center',
originY: 'top',
overlayX: 'end',
overlayY: 'bottom',
},
])
.withPositions(positions)
.withViewportMargin(8)
.withPush(false);

Expand All @@ -167,6 +144,44 @@ export class PopoverComponent implements PopoverService, AfterViewInit, OnDestro
});
}

private buildPositions(): ConnectedPosition[] {
const isBelow = this.yPosition() === 'below';
const preferLeft = this.xPosition() === 'before';

const buildPosition = (
originY: 'top' | 'bottom',
overlayY: 'top' | 'bottom',
overlayX: 'start' | 'end',
): ConnectedPosition => ({
originX: 'center',
originY,
overlayX,
overlayY,
});

const primary = buildPosition(isBelow ? 'bottom' : 'top', isBelow ? 'top' : 'bottom', preferLeft ? 'end' : 'start');

const secondary = buildPosition(
isBelow ? 'bottom' : 'top',
isBelow ? 'top' : 'bottom',
preferLeft ? 'start' : 'end',
);

const fallbackPrimary = buildPosition(
isBelow ? 'top' : 'bottom',
isBelow ? 'bottom' : 'top',
preferLeft ? 'end' : 'start',
);

const fallbackSecondary = buildPosition(
isBelow ? 'top' : 'bottom',
isBelow ? 'bottom' : 'top',
preferLeft ? 'start' : 'end',
);

return [primary, secondary, fallbackPrimary, fallbackSecondary];
}
Comment on lines +147 to +183
Copy link

@gemini-code-assist gemini-code-assist bot Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The buildPositions method can be simplified by extracting the repeated conditional logic into variables. This improves readability and maintainability by making the construction of the different position strategies more explicit and less repetitive.

  private buildPositions(): ConnectedPosition[] {
    const isBelow = this.yPosition() === 'below';
    const preferLeft = this.xPosition() === 'before';

    const primaryOriginY = isBelow ? 'bottom' : 'top';
    const primaryOverlayY = isBelow ? 'top' : 'bottom';

    const primaryOverlayX = preferLeft ? 'end' : 'start';
    const secondaryOverlayX = preferLeft ? 'start' : 'end';

    const buildPosition = (
      originY: 'top' | 'bottom',
      overlayY: 'top' | 'bottom',
      overlayX: 'start' | 'end'
    ): ConnectedPosition => ({
      originX: 'center',
      originY,
      overlayX,
      overlayY,
    });

    return [
      buildPosition(primaryOriginY, primaryOverlayY, primaryOverlayX),
      buildPosition(primaryOriginY, primaryOverlayY, secondaryOverlayX),
      buildPosition(primaryOverlayY, primaryOriginY, primaryOverlayX),
      buildPosition(primaryOverlayY, primaryOriginY, secondaryOverlayX),
    ];
  }


private setBackdropActive(active: boolean): void {
const backdrop = this.overlayRef?.backdropElement;
if (!backdrop) return;
Expand Down
36 changes: 17 additions & 19 deletions ...lib/modules/plan-editor/components/plan-editor-actions/plan-editor-actions.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,15 @@

@if (_interactiveSession.hasExecutionParameters()) {
<step-btn-group class="with-borders">
<step-popover [mode]="PopoverMode.HOVER">
<button
type="button"
mat-stroked-button
[class.active]="targetExecutionParameters && Object.keys(targetExecutionParameters).length > 0"
(click)="toggleTargetParameterSelection()"
matTooltipPosition="below"
>
<step-icon name="sliders" />
</button>
<step-popover-content>
Advanced: Set target execution parameters so the editor can display the right Keyword or Plan version (See
<a
href="https://step.dev/knowledgebase/devops/automation-packages-overview/#deploy-multiple-versions-of-the-same-automation-package"
target="_blank"
>Automation Packages: Versions</a
>).
</step-popover-content>
</step-popover>
<button
type="button"
mat-stroked-button
matTooltip="Set target execution parameters"
[class.active]="targetExecutionParameters && Object.keys(targetExecutionParameters).length > 0"
(click)="toggleTargetParameterSelection()"
>
<step-icon name="sliders" />
</button>
<span
class="interactive-trigger"
#targetExecutionParameterTrigger
Expand Down Expand Up @@ -169,6 +159,14 @@
<mat-menu #targetExecutionParameterMenu="matMenu" class="execution-menu">
<span class="execution-menu" mat-menu-item [disableRipple]="true" (click)="$event.stopImmediatePropagation()">
<div class="interactive-parameters">
<span
><b>Target Execution Parameters (advanced)</b><br />Display the right Keyword or Plan version in the editor<br />(See
<a
href="https://step.dev/knowledgebase/devops/automation-packages-overview/#deploy-multiple-versions-of-the-same-automation-package"
target="_blank"
>Automation Packages: Versions</a
>).</span
>
@if (_interactiveSession.hasExecutionParameters()) {
<step-custom-forms
#interactiveSessionCustomForm
Expand Down
8 changes: 6 additions & 2 deletions ...c/lib/modules/plan-editor/components/plan-editor-actions/plan-editor-actions.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,12 @@ export class PlanEditorActionsComponent {
}

setTargetExecutionParameters(parameters?: Record<string, unknown>) {
this.targetExecutionParameters = parameters;
this.targetExecutionParametersChange.emit(parameters as Record<string, string>);
const nonEmptyParameters = Object.fromEntries(
Object.entries(parameters ?? {}).filter(([, value]) => value !== undefined),
) as Record<string, unknown>;

this.targetExecutionParameters = nonEmptyParameters;
this.targetExecutionParametersChange.emit(nonEmptyParameters as Record<string, string>);
}

protected readonly Object = Object;
Expand Down