Skip to content

Commit

Permalink
fix(editor): Change executions title to match menu (#5349)
Browse files Browse the repository at this point in the history
* fix(editor): Prevent content moving between pages

* fix(editor): Change execution page title
  • Loading branch information
cstuncsik authored Feb 3, 2023
1 parent 50cb757 commit 338b354
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 16 deletions.
20 changes: 12 additions & 8 deletions packages/editor-ui/src/components/ExecutionsList.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<template>
<div :class="$style.execListWrapper">
<div :class="$style.execList">
<n8n-heading tag="h1" size="2xlarge">
{{
`${$locale.baseText('executionsList.workflowExecutions')} ${combinedExecutions.length}/${
finishedExecutionsCountEstimated === true ? '~' : ''
}${combinedExecutionsCount}`
}}
</n8n-heading>
<n8n-heading tag="h1" size="2xlarge">{{ this.pageTitle }}</n8n-heading>
<div :class="$style.filters">
<span :class="$style.filterItem">{{ $locale.baseText('executionsList.filters') }}:</span>
<n8n-select
Expand Down Expand Up @@ -276,6 +270,7 @@ import mixins from 'vue-typed-mixins';
import { mapStores } from 'pinia';
import { useUIStore } from '@/stores/ui';
import { useWorkflowsStore } from '@/stores/workflows';
import { setPageTitle } from '@/utils';
type ExecutionStatus = 'failed' | 'success' | 'waiting' | 'running' | 'unknown';
Expand Down Expand Up @@ -311,6 +306,9 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
workflows: [] as IWorkflowShortResponse[],
};
},
mounted() {
setPageTitle(`n8n - ${this.pageTitle}`);
},
async created() {
await this.loadWorkflows();
await this.refreshData();
Expand Down Expand Up @@ -404,6 +402,9 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
}
return filter;
},
pageTitle() {
return this.$locale.baseText('executionsList.workflowExecutions');
},
},
methods: {
closeDialog() {
Expand Down Expand Up @@ -935,7 +936,10 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
position: relative;
height: 100%;
overflow: auto;
padding: var(--spacing-3xl) var(--spacing-xl) var(--spacing-3xl) var(--spacing-xl);
padding: var(--spacing-l) var(--spacing-l) 0;
@media (min-width: 1200px) {
padding: var(--spacing-2xl) var(--spacing-2xl) 0;
}
}
.selectionOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/editor-ui/src/plugins/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
"executionsList.unknown": "Unknown",
"executionsList.unsavedWorkflow": "[UNSAVED WORKFLOW]",
"executionsList.waiting": "Waiting",
"executionsList.workflowExecutions": "Workflow Executions",
"executionsList.workflowExecutions": "All Executions",
"executionsList.view": "View",
"executionsList.stop": "Stop",
"executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely": "The workflow is waiting indefinitely for an incoming webhook call.",
Expand Down
14 changes: 7 additions & 7 deletions packages/editor-ui/src/views/TemplatesView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ export default Vue.extend({
<style lang="scss" module>
.template {
display: flex;
padding: var(--spacing-3xl) var(--spacing-xl) var(--spacing-4xl) var(--spacing-xl);
width: 100%;
max-width: 1280px;
padding: var(--spacing-l) var(--spacing-l) 0;
justify-content: center;
@media (min-width: 1200px) {
padding: var(--spacing-2xl) var(--spacing-2xl) 0;
}
}
.container {
width: 100%;
max-width: 1024px;
margin: 0 auto;
@media (max-width: $breakpoint-md) {
width: 900px;
}
}
.header {
Expand Down

0 comments on commit 338b354

Please sign in to comment.