Skip to content
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

[24.1] Fix invocation view steps scroll bug #18614

Merged
merged 2 commits into from
Aug 2, 2024
Merged

[24.1] Fix invocation view steps scroll bug #18614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3de5686
[24.1] Fix invocation view steps scroll bug
ahmedhamidawan Jul 29, 2024
d31d0fc
lower z-index for zoom control and minimap in invocation graph
ahmedhamidawan Jul 31, 2024
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
9 changes: 8 additions & 1 deletion client/src/components/Workflow/Invocation/Graph/InvocationGraph.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ function toggleActiveStep(stepId: number) {
<div v-if="!hideGraph" class="position-relative w-100">
<BCard no-body>
<WorkflowGraph
class="invocation-graph"
:steps="steps"
:datatypes-mapper="datatypesMapper"
:initial-position="initialPosition"
Expand Down Expand Up @@ -341,9 +342,15 @@ function toggleActiveStep(stepId: number) {

.graph-steps-aside {
overflow-y: scroll;
scroll-behavior: smooth;
&.steps-fixed-height {
max-height: 60vh;
}
}

.invocation-graph {
&:deep(.workflow-overview),
&:deep(.zoom-control) {
z-index: 100;
}
}
</style>
69 changes: 27 additions & 42 deletions client/src/components/Workflow/Invocation/Graph/WorkflowInvocationSteps.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { library } from "@fortawesome/fontawesome-svg-core";
import { faChevronDown, faChevronUp, faSignInAlt } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
import { computed, ref, watch } from "vue";
import { computed, nextTick, ref, watch } from "vue";

import type { WorkflowInvocationElementView } from "@/api/invocations";
import { isWorkflowInput } from "@/components/Workflow/constants";
Expand Down Expand Up @@ -43,28 +43,28 @@ const props = withDefaults(defineProps<Props>(), {
});

const stepsDiv = ref<HTMLDivElement>();
const expandInvocationInputs = ref(false);

const workflowInputSteps = Object.values(props.workflow.steps).filter((step) => isWorkflowInput(step.type));
const hasSingularInput = computed(() => workflowInputSteps.length === 1);
const workflowRemainingSteps = hasSingularInput.value
? Object.values(props.workflow.steps)
: Object.values(props.workflow.steps).filter((step) => !isWorkflowInput(step.type));
const oneOrNoInput = computed(() => workflowInputSteps.length <= 1);
const expandInvocationInputs = ref(oneOrNoInput.value);

watch(
() => [props.activeNodeId, stepsDiv.value],
async ([nodeId, card]) => {
// if the active node id is an input step, expand the inputs section, else, collapse it
const isAnInput = workflowInputSteps.findIndex((step) => step.id === props.activeNodeId) !== -1;
expandInvocationInputs.value = isAnInput;
// if the active node id is an input step, expand the inputs section if not already expanded
if (!expandInvocationInputs.value) {
const isAnInput = workflowInputSteps.findIndex((step) => step.id === props.activeNodeId) !== -1;
expandInvocationInputs.value = isAnInput;
}

await nextTick();

// on full page view, scroll to the active step card in the steps section
if (props.isFullPage) {
if (nodeId !== undefined && card) {
// scroll to the active step card
const stepCard = stepsDiv.value?.querySelector(`[data-index="${props.activeNodeId}"]`);
const portletHeaderDiv = stepCard?.querySelector(".portlet-header");
stepsDiv.value?.scrollTo({ top: portletHeaderDiv?.getBoundingClientRect().top });
stepCard?.scrollIntoView({ block: "nearest", inline: "start" });
}
}
// clear any job being shown
Expand All @@ -81,7 +81,7 @@ function showJob(jobId: string | undefined) {
<template>
<div ref="stepsDiv" class="d-flex flex-column w-100">
<!-- Input Steps grouped in a separate portlet -->
<div v-if="workflowInputSteps.length > 1" class="ui-portlet-section w-100">
<div v-if="!oneOrNoInput" class="ui-portlet-section w-100">
<div
class="portlet-header portlet-operations"
role="button"
Expand All @@ -96,36 +96,21 @@ function showJob(jobId: string | undefined) {
</span>
<FontAwesomeIcon class="float-right" :icon="expandInvocationInputs ? faChevronUp : faChevronDown" />
</div>

<div v-if="expandInvocationInputs" class="portlet-content m-1">
<WorkflowInvocationStep
v-for="step in workflowInputSteps"
:key="step.id"
:data-index="step.id"
:invocation="props.invocation"
:workflow="props.workflow"
:workflow-step="step"
:in-graph-view="!props.hideGraph"
:graph-step="steps[step.id]"
:expanded="props.hideGraph ? undefined : props.activeNodeId === step.id"
:showing-job-id="props.showingJobId"
@show-job="showJob"
@update:expanded="emit('focus-on-step', step.id)" />
</div>
</div>
<!-- Non-Input (Tool/Subworkflow) Steps -->
<WorkflowInvocationStep
v-for="step in workflowRemainingSteps"
:key="step.id"
:data-index="step.id"
:invocation="props.invocation"
:workflow="props.workflow"
:workflow-step="step"
:in-graph-view="!props.hideGraph"
:graph-step="steps[step.id]"
:expanded="props.hideGraph ? undefined : props.activeNodeId === step.id"
:showing-job-id="props.showingJobId"
@show-job="showJob"
@update:expanded="emit('focus-on-step', step.id)" />
<div v-for="step in props.workflow.steps" :key="step.id">
<WorkflowInvocationStep
v-if="!isWorkflowInput(step.type) || (isWorkflowInput(step.type) && expandInvocationInputs)"
:class="{ 'mx-1': !oneOrNoInput && isWorkflowInput(step.type) }"
:data-index="step.id"
:invocation="props.invocation"
:workflow="props.workflow"
:workflow-step="step"
:in-graph-view="!props.hideGraph"
:graph-step="steps[step.id]"
:expanded="props.hideGraph ? undefined : props.activeNodeId === step.id"
:showing-job-id="props.showingJobId"
@show-job="showJob"
@update:expanded="emit('focus-on-step', step.id)" />
</div>
</div>
</template>
Loading