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

Jump to bottom

fix(editor): Fix for executions preview scroll load and wrong execution displayed #4994

Merged
merged 6 commits into from
Dec 22, 2022
Merged

fix(editor): Fix for executions preview scroll load and wrong execution displayed #4994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21e046d
🐛 Only add current workflow executions to to store when loading execu…
MiloradFilipovic Dec 21, 2022
d9bee4f
🐛 Fixing infinite scroll on executions list
MiloradFilipovic Dec 21, 2022
d0fe3c0
🐛 Fixing global and current executions list sync
MiloradFilipovic Dec 21, 2022
6f0e2f8
⚡ Resetting executions list when opening new workflow
MiloradFilipovic Dec 21, 2022
fd2d316
🐛 Handling opening execution from global list before opening a workflow
MiloradFilipovic Dec 21, 2022
d6e648d
⚡ Scrolling to active execution card if out of view, keeping selected…
MiloradFilipovic Dec 22, 2022
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
10 changes: 8 additions & 2 deletions packages/editor-ui/src/components/ExecutionsList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ import WorkflowActivator from '@/components/WorkflowActivator.vue';
import Modal from '@/components/Modal.vue';

import { externalHooks } from '@/mixins/externalHooks';
import { WAIT_TIME_UNLIMITED, EXECUTIONS_MODAL_KEY, VIEWS } from '@/constants';
import { WAIT_TIME_UNLIMITED, EXECUTIONS_MODAL_KEY, VIEWS, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';

import { restApi } from '@/mixins/restApi';
import { genericHelpers } from '@/mixins/genericHelpers';
Expand Down Expand Up @@ -434,7 +434,13 @@ export default mixins(externalHooks, genericHelpers, restApi, showMessage).exten
this.modalBus.$emit('close');
},
convertToDisplayDate,
displayExecution(execution: IExecutionShortResponse, e: PointerEvent) {
displayExecution(execution: IExecutionsSummary, e: PointerEvent) {
if (!this.workflowsStore.workflowId || this.workflowsStore.workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID || execution.workflowId !== this.workflowsStore.workflowId) {
const workflowExecutions: IExecutionsSummary[] = this.combinedExecutions.filter(ex => ex.workflowId === execution.workflowId);
this.workflowsStore.currentWorkflowExecutions = workflowExecutions;
this.workflowsStore.activeWorkflowExecution = execution;
}

if (e.metaKey || e.ctrlKey) {
const route = this.$router.resolve({
name: VIEWS.EXECUTION_PREVIEW,
Expand Down
17 changes: 16 additions & 1 deletion packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
v-for="execution in executions"
:key="execution.id"
:execution="execution"
:ref="`execution-${execution.id}`"
@refresh="onRefresh"
@retryExecution="onRetryExecution"
/>
Expand All @@ -95,6 +96,7 @@ import Vue from 'vue';
import { PropType } from 'vue';
import { mapStores } from 'pinia';
import { useUIStore } from '@/stores/ui';
import { useWorkflowsStore } from '@/stores/workflows';

export default Vue.extend({
name: 'executions-sidebar',
Expand Down Expand Up @@ -127,7 +129,7 @@ export default Vue.extend({
};
},
computed: {
...mapStores(useUIStore),
...mapStores(useUIStore, useWorkflowsStore),
statusFilterApplied(): boolean {
return this.filter.status !== '';
},
Expand All @@ -153,6 +155,7 @@ export default Vue.extend({
if (this.autoRefresh) {
this.autoRefreshInterval = setInterval(() => this.onRefresh(), 4000);
}
this.scrollToActiveCard();
Copy link
Contributor

Choose a reason for hiding this comment

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

I like this :)

},
beforeDestroy() {
if (this.autoRefreshInterval) {
Expand Down Expand Up @@ -206,6 +209,18 @@ export default Vue.extend({
status: this.filter.status,
};
},
scrollToActiveCard(): void {
const executionsList = this.$refs.executionList as HTMLElement;
const currentExecutionCard = this.$refs[`execution-${this.workflowsStore.activeWorkflowExecution?.id}`] as Vue[];

if (executionsList && currentExecutionCard && this.workflowsStore.activeWorkflowExecution) {
const cardElement = currentExecutionCard[0].$el as HTMLElement;
const cardRect = cardElement.getBoundingClientRect();
if (cardRect.top > executionsList.offsetHeight) {
executionsList.scrollTo({ top: cardRect.top });
}
}
},
},
});
</script>
Expand Down
12 changes: 10 additions & 2 deletions packages/editor-ui/src/components/ExecutionsView/ExecutionsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,13 @@ export default mixins(
const shouldUpdate = workflowUpdated && !onNewWorkflow;
await this.initView(shouldUpdate);
if (!shouldUpdate) {
await this.setExecutions();
if (this.workflowsStore.currentWorkflowExecutions.length > 0) {
const workflowExecutions = await this.loadExecutions();
this.workflowsStore.addToCurrentExecutions(workflowExecutions);
this.setActiveExecution();
} else {
await this.setExecutions();
}
}
this.loading = false;
},
Expand All @@ -186,7 +192,9 @@ export default mixins(
}
await this.openWorkflow(this.$route.params.name);
this.uiStore.nodeViewInitialized = false;
this.setExecutions();
if(this.workflowsStore.currentWorkflowExecutions.length === 0) {
this.setExecutions();
}
if (this.activeExecution) {
this.$router
.push({
Expand Down
4 changes: 2 additions & 2 deletions packages/editor-ui/src/stores/workflows.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
requestFilter,
);
}
// context.commit('setTotalFinishedExecutionsCount', finishedExecutions.count);
this.finishedExecutionsCount = finishedExecutions.count;
return [...activeExecutions, ...(finishedExecutions.results || [])];
} catch (error) {
throw error;
Expand All @@ -947,7 +947,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
addToCurrentExecutions(executions: IExecutionsSummary[]): void {
executions.forEach(execution => {
const exists = this.currentWorkflowExecutions.find(ex => ex.id === execution.id);
if (!exists) {
if (!exists && execution.workflowId === this.workflowId) {
this.currentWorkflowExecutions.push(execution);
}
});
Expand Down
10 changes: 9 additions & 1 deletion packages/editor-ui/src/views/NodeView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,9 @@ export default mixins(
},
async openWorkflow(workflowId: string) {
this.startLoading();

const selectedExecution = this.workflowsStore.activeWorkflowExecution;

this.resetWorkspace();
let data: IWorkflowDb | undefined;
try {
Expand Down Expand Up @@ -939,7 +942,12 @@ export default mixins(
}
this.canvasStore.zoomToFit();
this.$externalHooks().run('workflow.open', { workflowId, workflowName: data.name });
this.workflowsStore.activeWorkflowExecution = null;
if (selectedExecution?.workflowId !== workflowId) {
this.workflowsStore.activeWorkflowExecution = null;
this.workflowsStore.currentWorkflowExecutions = [];
} else {
this.workflowsStore.activeWorkflowExecution = selectedExecution;
}
this.stopLoading();
return data;
},
Expand Down