fix(editor): Update SourceControlPullModal to look and feel the same as SourceControlPushModal (#18129)

Co-authored-by: r00gm <raul00gm@gmail.com>
2025-12-17 01:56:46 +00:00 · 2025-08-12 14:22:35 +02:00
parent 19946c3f72
commit d06581ef3f
9 changed files with 621 additions and 250 deletions
--- a/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
+++ b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
@@ -514,7 +514,7 @@
 	--color-configurable-node-name: var(--color-text-dark);
 	--color-secondary-link: var(--p-color-secondary-270);
 	--color-secondary-link-hover: var(--p-color-secondary-370);
-	//Params
+	// Params
 	--color-icon-base: var(--color-text-light);
 	--color-icon-hover: var(--p-color-primary-320);

--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -3407,7 +3407,10 @@
 	"workflowDiff.local": "Local",
 	"workflowDiff.remote": "Remote ({branchName})",
 	"workflowDiff.noChanges": "No changes",
-	"workflowDiff.deletedWorkflow": "Deleted workflow",
-	"workflowDiff.deletedWorkflow.database": "The workflow was deleted on the database",
-	"workflowDiff.deletedWorkflow.remote": "The workflow was deleted on remote"
+	"workflowDiff.deletedWorkflow": "Missing workflow",
+	"workflowDiff.deletedWorkflow.database": "The workflow doesn't exist in the database",
+	"workflowDiff.deletedWorkflow.remote": "The workflow doesn't exist on remote",
+	"workflowDiff.newWorkflow": "New workflow",
+	"workflowDiff.newWorkflow.database": "The workflow will be created in the database",
+	"workflowDiff.newWorkflow.remote": "The workflow will be created on remote"
 }
--- a/packages/frontend/editor-ui/src/components/SourceControlPullModal.ee.test.ts
+++ b/packages/frontend/editor-ui/src/components/SourceControlPullModal.ee.test.ts
@@ -114,7 +114,7 @@ const sampleFiles = [
 	},
 ];

-describe('SourceControlPushModal', () => {
+describe('SourceControlPullModal', () => {
 	let sourceControlStore: ReturnType<typeof mockedStore<typeof useSourceControlStore>>;

 	beforeEach(() => {
@@ -144,8 +144,9 @@ describe('SourceControlPushModal', () => {
 			},
 		});

-		expect(getAllByTestId('pull-modal-item-header').length).toBe(2);
-		expect(getAllByTestId('pull-modal-item').length).toBe(2);
+		// The new structure renders items in a tabbed interface
+		// Both items should be rendered (one workflow, one credential)
+		expect(getAllByTestId('pull-modal-item').length).toBe(1); // Only workflow tab items are shown initially
 	});

 	it('should force pull', async () => {
@@ -183,13 +184,13 @@ describe('SourceControlPushModal', () => {
 		expect(diffButton).toBeInTheDocument();
 	});

-	it('should not render diff button for non-workflow items', () => {
+	it('should not render diff button for non-workflow items', async () => {
 		const credentialFile = {
 			...sampleFiles[1], // credential file
 			type: 'credential',
 		};

-		const { container } = renderModal({
+		const { container, getByText } = renderModal({
 			props: {
 				data: {
 					eventBus,
@@ -198,10 +199,13 @@ describe('SourceControlPushModal', () => {
 			},
 		});

-		// For credential files, there should be no additional buttons in the item actions
-		const itemActions = container.querySelector('[class*="itemActions"]');
-		const buttons = itemActions?.querySelectorAll('button');
-		expect(buttons).toHaveLength(0);
+		// Click on credentials tab to show credential items
+		await userEvent.click(getByText('Credentials'));
+
+		// For credential files, there should be no diff buttons (only badges in the badges container)
+		const badges = container.querySelector('[class*="badges"]');
+		const buttons = badges?.querySelectorAll('button');
+		expect(buttons?.length || 0).toBe(0);
 	});

 	it('should render item names with ellipsis for long text', () => {
@@ -219,13 +223,14 @@ describe('SourceControlPushModal', () => {
 			},
 		});

-		// Check if the itemName container exists and has the proper structure
-		const nameContainer = container.querySelector('[class*="itemName"]');
+		// Check if the listItemName container exists
+		const nameContainer = container.querySelector('[class*="listItemName"]');
 		expect(nameContainer).toBeInTheDocument();

 		// Check if the RouterLink stub is rendered (since the name is rendered inside it)
 		const routerLink = nameContainer?.querySelector('a');
 		expect(routerLink).toBeInTheDocument();
+		expect(routerLink?.textContent).toContain(longNameFile.name);
 	});

 	it('should render badges and actions in separate container', () => {
@@ -240,14 +245,10 @@ describe('SourceControlPushModal', () => {

 		const listItems = getAllByTestId('pull-modal-item');

-		// Each list item should have the new structure with itemActions container
+		// Each list item should have the new structure with badges container
 		listItems.forEach((item) => {
-			const actionsContainer = item.querySelector('[class*="itemActions"]');
-			expect(actionsContainer).toBeInTheDocument();
-
-			// Badge should be inside actions container
-			const badge = actionsContainer?.querySelector('[class*="listBadge"]');
-			expect(badge).toBeInTheDocument();
+			const badgesContainer = item.querySelector('[class*="badges"]');
+			expect(badgesContainer).toBeInTheDocument();
 		});
 	});

--- a/packages/frontend/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/frontend/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -5,8 +5,10 @@ import { useToast } from '@/composables/useToast';
 import { SOURCE_CONTROL_PULL_MODAL_KEY, VIEWS, WORKFLOW_DIFF_MODAL_KEY } from '@/constants';
 import { sourceControlEventBus } from '@/event-bus/source-control';
 import EnvFeatureFlag from '@/features/env-feature-flag/EnvFeatureFlag.vue';
+import { useProjectsStore } from '@/stores/projects.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
+import type { ProjectListItem } from '@/types/projects.types';
 import {
 	getPullPriorityByStatus,
 	getStatusText,
@@ -14,19 +16,20 @@ import {
 	notifyUserAboutPullWorkFolderOutcome,
 } from '@/utils/sourceControlUtils';
 import { type SourceControlledFile, SOURCE_CONTROL_FILE_TYPE } from '@n8n/api-types';
-import { N8nBadge, N8nButton, N8nLink, N8nText } from '@n8n/design-system';
+import { N8nBadge, N8nButton, N8nHeading, N8nInfoTip, N8nLink, N8nText } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
 import type { EventBus } from '@n8n/utils/event-bus';
 import { createEventBus } from '@n8n/utils/event-bus';
-import groupBy from 'lodash/groupBy';
+import dateformat from 'dateformat';
 import orderBy from 'lodash/orderBy';
-import { computed } from 'vue';
+import { computed, onBeforeMount, ref } from 'vue';
 import { RouterLink } from 'vue-router';
 import { DynamicScroller, DynamicScrollerItem } from 'vue-virtual-scroller';
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
 import Modal from './Modal.vue';

 type SourceControlledFileType = SourceControlledFile['type'];
+type SourceControlledFileWithProject = SourceControlledFile & { project?: ProjectListItem };

 const props = defineProps<{
 	data: { eventBus: EventBus; status: SourceControlledFile[] };
@@ -38,53 +41,119 @@ const uiStore = useUIStore();
 const toast = useToast();
 const i18n = useI18n();
 const sourceControlStore = useSourceControlStore();
+const projectsStore = useProjectsStore();

-const sortedFiles = computed(() =>
+onBeforeMount(() => {
+	void projectsStore.getAvailableProjects();
+});
+
+// Tab state
+const activeTab = ref<
+	typeof SOURCE_CONTROL_FILE_TYPE.workflow | typeof SOURCE_CONTROL_FILE_TYPE.credential
+>(SOURCE_CONTROL_FILE_TYPE.workflow);
+
+// Group files by type with project information
+const filesWithProjects = computed(() =>
+	props.data.status.map((file) => {
+		const project = projectsStore.availableProjects.find(({ id }) => id === file.owner?.projectId);
+		return { ...file, project };
+	}),
+);
+
+const groupedFilesByType = computed(() => {
+	const grouped: Partial<Record<SourceControlledFileType, SourceControlledFileWithProject[]>> = {};
+
+	filesWithProjects.value.forEach((file) => {
+		if (!grouped[file.type]) {
+			grouped[file.type] = [];
+		}
+		grouped[file.type]!.push(file);
+	});
+
+	return grouped;
+});
+
+// Filtered workflows
+const filteredWorkflows = computed(() => {
+	const workflows = groupedFilesByType.value[SOURCE_CONTROL_FILE_TYPE.workflow] || [];
+	return workflows;
+});
+
+const sortedWorkflows = computed(() =>
 	orderBy(
-		props.data.status,
-		[({ status }) => getPullPriorityByStatus(status), ({ name }) => name.toLowerCase()],
-		['desc', 'asc'],
+		filteredWorkflows.value,
+		[({ status }) => getPullPriorityByStatus(status), 'updatedAt'],
+		['asc', 'desc'],
 	),
 );

-const groupedFilesByType = computed<
-	Partial<Record<SourceControlledFileType, SourceControlledFile[]>>
->(() => groupBy(sortedFiles.value, 'type'));
+// Filtered credentials
+const filteredCredentials = computed(() => {
+	const credentials = groupedFilesByType.value[SOURCE_CONTROL_FILE_TYPE.credential] || [];
+	return credentials;
+});

-type ItemsList = Array<
-	{ type: 'render-title'; title: string; id: SourceControlledFileType } | SourceControlledFile
->;
+const sortedCredentials = computed(() =>
+	orderBy(
+		filteredCredentials.value,
+		[({ status }) => getPullPriorityByStatus(status), 'updatedAt'],
+		['asc', 'desc'],
+	),
+);

-const ITEM_TITLES: Record<Exclude<SourceControlledFileType, 'file'>, string> = {
-	[SOURCE_CONTROL_FILE_TYPE.workflow]: 'Workflows',
-	[SOURCE_CONTROL_FILE_TYPE.credential]: 'Credentials',
-	[SOURCE_CONTROL_FILE_TYPE.variables]: 'Variables',
-	[SOURCE_CONTROL_FILE_TYPE.tags]: 'Tags',
-	[SOURCE_CONTROL_FILE_TYPE.folders]: 'Folders',
-} as const;
+// Active data source based on tab
+const activeDataSourceFiltered = computed(() => {
+	if (activeTab.value === SOURCE_CONTROL_FILE_TYPE.workflow) {
+		return sortedWorkflows.value;
+	}
+	if (activeTab.value === SOURCE_CONTROL_FILE_TYPE.credential) {
+		return sortedCredentials.value;
+	}
+	return [];
+});

-const files = computed<ItemsList>(() =>
-	[
-		SOURCE_CONTROL_FILE_TYPE.workflow,
-		SOURCE_CONTROL_FILE_TYPE.credential,
-		SOURCE_CONTROL_FILE_TYPE.variables,
-		SOURCE_CONTROL_FILE_TYPE.tags,
-		SOURCE_CONTROL_FILE_TYPE.folders,
-	].reduce<ItemsList>((acc, fileType) => {
-		if (!groupedFilesByType.value[fileType]) {
-			return acc;
+const filtersNoResultText = computed(() => {
+	if (activeTab.value === SOURCE_CONTROL_FILE_TYPE.workflow) {
+		return i18n.baseText('workflows.noResults');
+	}
+	return i18n.baseText('credentials.noResults');
+});
+
+// Tab data
+const tabs = computed(() => {
+	return [
+		{
+			label: 'Workflows',
+			value: SOURCE_CONTROL_FILE_TYPE.workflow,
+			total: groupedFilesByType.value[SOURCE_CONTROL_FILE_TYPE.workflow]?.length || 0,
+		},
+		{
+			label: 'Credentials',
+			value: SOURCE_CONTROL_FILE_TYPE.credential,
+			total: groupedFilesByType.value[SOURCE_CONTROL_FILE_TYPE.credential]?.length || 0,
+		},
+	];
+});
+
+// Other files (variables, tags, folders) that are always pulled
+const otherFiles = computed(() => {
+	const others: SourceControlledFileWithProject[] = [];
+
+	const variables = groupedFilesByType.value[SOURCE_CONTROL_FILE_TYPE.variables];
+	if (variables) {
+		others.push.apply(others, variables);
+	}
+	const tags = groupedFilesByType.value[SOURCE_CONTROL_FILE_TYPE.tags];
+	if (tags) {
+		others.push.apply(others, tags);
+	}
+	const folders = groupedFilesByType.value[SOURCE_CONTROL_FILE_TYPE.folders];
+	if (folders) {
+		others.push.apply(others, folders);
 	}

-		acc.push({
-			type: 'render-title',
-			title: ITEM_TITLES[fileType],
-			id: fileType,
-		});
-
-		acc.push(...groupedFilesByType.value[fileType]);
-		return acc;
-	}, []),
-);
+	return others;
+});

 function close() {
 	uiStore.closeModal(SOURCE_CONTROL_PULL_MODAL_KEY);
@@ -107,6 +176,20 @@ async function pullWorkfolder() {
 	}
 }

+function renderUpdatedAt(file: SourceControlledFile) {
+	const currentYear = new Date().getFullYear().toString();
+
+	return i18n.baseText('settings.sourceControl.lastUpdated', {
+		interpolate: {
+			date: dateformat(
+				file.updatedAt,
+				`d mmm${file.updatedAt?.startsWith(currentYear) ? '' : ', yyyy'}`,
+			),
+			time: dateformat(file.updatedAt, 'HH:MM'),
+		},
+	});
+}
+
 const workflowDiffEventBus = createEventBus();

 function openDiffModal(id: string) {
@@ -119,16 +202,29 @@ function openDiffModal(id: string) {
 		data: { eventBus: workflowDiffEventBus, workflowId: id, direction: 'pull' },
 	});
 }
+
+const modalHeight = computed(() =>
+	groupedFilesByType.value[SOURCE_CONTROL_FILE_TYPE.workflow]?.length ||
+	groupedFilesByType.value[SOURCE_CONTROL_FILE_TYPE.credential]?.length
+		? 'min(80vh, 850px)'
+		: 'auto',
+);
 </script>

 <template>
 	<Modal
-		width="500px"
-		:title="i18n.baseText('settings.sourceControl.modals.pull.title')"
+		width="812px"
 		:event-bus="data.eventBus"
 		:name="SOURCE_CONTROL_PULL_MODAL_KEY"
+		:height="modalHeight"
+		:custom-class="$style.sourceControlPull"
 	>
-		<template #content>
+		<template #header>
+			<N8nHeading tag="h1" size="xlarge">
+				{{ i18n.baseText('settings.sourceControl.modals.pull.title') }}
+			</N8nHeading>
+
+			<div :class="[$style.filtersRow]" class="mt-l">
 				<N8nText tag="div" class="mb-xs">
 					{{ i18n.baseText('settings.sourceControl.modals.pull.description') }}
 					<br />
@@ -136,69 +232,126 @@ function openDiffModal(id: string) {
 						{{ i18n.baseText('settings.sourceControl.modals.push.description.learnMore') }}
 					</N8nLink>
 				</N8nText>
-			<div :class="$style.container">
-				<DynamicScroller
-					ref="scroller"
-					:items="files"
-					:min-item-size="47"
-					:class="$style.scroller"
-					style="max-height: 440px"
-				>
-					<template #default="{ item, index, active }">
-						<div
-							v-if="item.type === 'render-title'"
-							:class="$style.listHeader"
-							data-test-id="pull-modal-item-header"
-						>
-							<N8nText bold>{{ item.title }}</N8nText>
 			</div>
+		</template>
+		<template #content>
+			<div v-if="!tabs.some((tab) => tab.total > 0)">
+				<N8nText tag="div" class="mb-xs">
+					{{ i18n.baseText('settings.sourceControl.modals.pull.description') }}
+					<br />
+					<N8nLink :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
+						{{ i18n.baseText('settings.sourceControl.modals.push.description.learnMore') }}
+					</N8nLink>
+				</N8nText>
+			</div>
+			<div v-else style="display: flex; height: 100%">
+				<div :class="$style.tabs">
+					<template v-for="tab in tabs" :key="tab.value">
+						<button
+							type="button"
+							:class="[$style.tab, { [$style.tabActive]: activeTab === tab.value }]"
+							data-test-id="source-control-pull-modal-tab"
+							@click="activeTab = tab.value"
+						>
+							<div>{{ tab.label }}</div>
+							<N8nText tag="div" color="text-light">
+								{{ tab.total }} {{ tab.total === 1 ? 'item' : 'items' }}
+							</N8nText>
+						</button>
+					</template>
+				</div>
+				<div style="flex: 1">
+					<div :class="[$style.table]">
+						<div :class="[$style.tableHeader]">
+							<div :class="$style.headerTitle">
+								<N8nText>Title</N8nText>
+							</div>
+						</div>
+						<div style="flex: 1; overflow: hidden">
+							<N8nInfoTip v-if="!activeDataSourceFiltered.length" class="p-xs" :bold="false">
+								{{ filtersNoResultText }}
+							</N8nInfoTip>
+							<DynamicScroller
+								v-if="activeDataSourceFiltered.length"
+								:class="[$style.scroller]"
+								:items="activeDataSourceFiltered"
+								:min-item-size="57"
+								item-class="scrollerItem"
+							>
+								<template #default="{ item: file, active, index }">
 									<DynamicScrollerItem
-							v-else
-							:item="item"
+										:item="file"
 										:active="active"
-							:size-dependencies="[item.name]"
+										:size-dependencies="[file.name, file.id]"
 										:data-index="index"
 									>
-							<div :class="$style.listItem" data-test-id="pull-modal-item">
-								<div :class="$style.itemName">
+										<div :class="[$style.listItem]" data-test-id="pull-modal-item">
+											<div :class="[$style.itemContent]">
+												<N8nText tag="div" bold color="text-dark" :class="[$style.listItemName]">
 													<RouterLink
-										v-if="item.type === 'credential'"
+														v-if="file.type === SOURCE_CONTROL_FILE_TYPE.credential"
 														target="_blank"
-										:to="{ name: VIEWS.CREDENTIALS, params: { credentialId: item.id } }"
+														:to="{ name: VIEWS.CREDENTIALS, params: { credentialId: file.id } }"
 													>
-										<N8nText>{{ item.name }}</N8nText>
+														{{ file.name }}
 													</RouterLink>
 													<RouterLink
-										v-else-if="item.type === 'workflow'"
+														v-else-if="file.type === SOURCE_CONTROL_FILE_TYPE.workflow"
 														target="_blank"
-										:to="{ name: VIEWS.WORKFLOW, params: { name: item.id } }"
+														:to="{ name: VIEWS.WORKFLOW, params: { name: file.id } }"
 													>
-										<N8nText>{{ item.name }}</N8nText>
+														{{ file.name }}
 													</RouterLink>
-									<N8nText v-else>{{ item.name }}</N8nText>
+													<span v-else>{{ file.name }}</span>
+												</N8nText>
+												<N8nText
+													v-if="file.updatedAt"
+													tag="p"
+													class="mt-0"
+													color="text-light"
+													size="small"
+												>
+													{{ renderUpdatedAt(file) }}
+												</N8nText>
 											</div>
-								<div :class="$style.itemActions">
-									<N8nBadge :theme="getStatusTheme(item.status)" :class="$style.listBadge">
-										{{ getStatusText(item.status) }}
+											<span :class="[$style.badges]">
+												<N8nBadge :theme="getStatusTheme(file.status)" style="height: 25px">
+													{{ getStatusText(file.status) }}
 												</N8nBadge>
 												<EnvFeatureFlag name="SOURCE_CONTROL_WORKFLOW_DIFF">
 													<N8nIconButton
-											v-if="item.type === SOURCE_CONTROL_FILE_TYPE.workflow"
+														v-if="file.type === SOURCE_CONTROL_FILE_TYPE.workflow"
 														icon="file-diff"
 														type="secondary"
-											:class="$style.diffButton"
-											@click="openDiffModal(item.id)"
+														@click="openDiffModal(file.id)"
 													/>
 												</EnvFeatureFlag>
-								</div>
+											</span>
 										</div>
 									</DynamicScrollerItem>
 								</template>
 							</DynamicScroller>
 						</div>
+					</div>
+				</div>
+			</div>
 		</template>

 		<template #footer>
+			<div v-if="otherFiles.length" class="mb-xs">
+				<N8nText bold size="medium">Additional changes to be pulled:</N8nText>
+				<N8nText size="small">
+					<template v-if="groupedFilesByType[SOURCE_CONTROL_FILE_TYPE.variables]?.length">
+						Variables ({{ groupedFilesByType[SOURCE_CONTROL_FILE_TYPE.variables]?.length || 0 }}),
+					</template>
+					<template v-if="groupedFilesByType[SOURCE_CONTROL_FILE_TYPE.tags]?.length">
+						Tags ({{ groupedFilesByType[SOURCE_CONTROL_FILE_TYPE.tags]?.length || 0 }}),
+					</template>
+					<template v-if="groupedFilesByType[SOURCE_CONTROL_FILE_TYPE.folders]?.length">
+						Folders ({{ groupedFilesByType[SOURCE_CONTROL_FILE_TYPE.folders]?.length || 0 }})
+					</template>
+				</N8nText>
+			</div>
 			<div :class="$style.footer">
 				<N8nButton type="tertiary" class="mr-2xs" @click="close">
 					{{ i18n.baseText('settings.sourceControl.modals.pull.buttons.cancel') }}
@@ -212,78 +365,90 @@ function openDiffModal(id: string) {
 </template>

 <style module lang="scss">
-.container {
-	overflow-wrap: break-word;
-	padding-right: 8px;
-}
+.sourceControlPull {
+	&:global(.el-dialog) {
+		margin: 0;
+	}

-.scroller {
-	margin-right: -8px;
-}
-
-.filesList {
-	list-style: inside;
-	margin-top: var(--spacing-3xs);
-	padding-left: var(--spacing-2xs);
-
-	li {
-		margin-top: var(--spacing-3xs);
+	:global(.el-dialog__header) {
+		padding-bottom: var(--spacing-xs);
 	}
 }

-.listHeader {
-	padding-top: 16px;
-	padding-bottom: 12px;
-	height: 47px;
-	margin-right: 8px;
+.filtersRow {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	justify-content: space-between;
+}
+
+.filters {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.headerTitle {
+	flex-shrink: 0;
+	margin-bottom: 0;
+	padding: 10px 16px;
+}
+
+.filtersApplied {
+	border-top: var(--border-base);
+}
+
+.scroller {
+	max-height: 100%;
+	scrollbar-color: var(--color-foreground-base) transparent;
+	outline: var(--border-base);
+
+	:global(.scrollerItem) {
+		&:last-child {
+			.listItem {
+				border-bottom: 0;
+			}
+		}
+	}
 }

 .listItem {
 	display: flex;
 	align-items: center;
-	padding-bottom: 8px;
-	margin-right: 8px;
-
-	&::before {
-		display: block;
-		content: '';
-		width: 5px;
-		height: 5px;
-		background-color: var(--color-foreground-xdark);
-		border-radius: 100%;
-		margin: 7px 8px 6px 2px;
-		flex-shrink: 0;
-	}
+	justify-content: space-between;
+	padding: 10px 16px;
+	margin: 0;
+	border-bottom: var(--border-base);
+	gap: 30px;
 }

-.itemName {
+.itemContent {
 	flex: 1;
 	min-width: 0;
-	margin-right: 8px;
+}

-	a,
-	span {
-		white-space: nowrap;
-		overflow: hidden;
+.listItemName {
+	line-clamp: 2;
+	-webkit-line-clamp: 2;
 	text-overflow: ellipsis;
-		display: block;
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	word-wrap: break-word;
+
+	a {
+		color: inherit;
+		text-decoration: none;
+		&:hover {
+			text-decoration: underline;
+		}
 	}
 }

-.itemActions {
+.badges {
 	display: flex;
+	gap: 10px;
 	align-items: center;
-	gap: 8px;
-	flex-shrink: 0;
-}
-
-.listBadge {
-	align-self: center;
-	white-space: nowrap;
-	height: 30px;
-}
-
-.diffButton {
 	flex-shrink: 0;
 }

@@ -291,5 +456,55 @@ function openDiffModal(id: string) {
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-end;
+	margin-top: 8px;
+}
+
+.table {
+	height: 100%;
+	overflow: hidden;
+	display: flex;
+	flex-direction: column;
+	border: var(--border-base);
+	border-top-right-radius: 8px;
+	border-bottom-right-radius: 8px;
+}
+
+.tableHeader {
+	border-bottom: var(--border-base);
+	display: flex;
+	flex-direction: column;
+}
+
+.tabs {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+	width: 165px;
+	padding: var(--spacing-2xs);
+	border: var(--border-base);
+	border-right: 0;
+	border-top-left-radius: 8px;
+	border-bottom-left-radius: 8px;
+}
+
+.tab {
+	color: var(--color-text-base);
+	background-color: transparent;
+	border: 1px solid transparent;
+	padding: var(--spacing-2xs);
+	cursor: pointer;
+	border-radius: 4px;
+	text-align: left;
+	display: flex;
+	flex-direction: column;
+	gap: 2px;
+	&:hover {
+		border-color: var(--color-background-base);
+	}
+}
+
+.tabActive {
+	background-color: var(--color-background-base);
+	color: var(--color-text-dark);
 }
 </style>
--- a/packages/frontend/editor-ui/src/components/SourceControlPushModal.ee.test.ts
+++ b/packages/frontend/editor-ui/src/components/SourceControlPushModal.ee.test.ts
@@ -1,6 +1,5 @@
 import { within, waitFor } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
-import { useRoute } from 'vue-router';
 import { createComponentRenderer } from '@/__tests__/render';
 import SourceControlPushModal from '@/components/SourceControlPushModal.ee.vue';
 import { createTestingPinia } from '@pinia/testing';
@@ -12,15 +11,19 @@ import { VIEWS } from '@/constants';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useProjectsStore } from '@/stores/projects.store';
 import type { ProjectListItem } from '@/types/projects.types';
+import { reactive } from 'vue';

 const eventBus = createEventBus();

+// Create a reactive route mock to avoid Vue warnings
+const mockRoute = reactive({
+	name: '',
+	params: {},
+	fullPath: '',
+});
+
 vi.mock('vue-router', () => ({
-	useRoute: vi.fn().mockReturnValue({
-		name: vi.fn(),
-		params: vi.fn(),
-		fullPath: vi.fn(),
-	}),
+	useRoute: () => mockRoute,
 	RouterLink: vi.fn(),
 	useRouter: vi.fn(),
 }));
@@ -36,21 +39,48 @@ vi.mock('@/composables/useTelemetry', () => {
 	};
 });

-let route: ReturnType<typeof useRoute>;
+vi.mock('@/composables/useToast', () => ({
+	useToast: () => ({
+		showMessage: vi.fn(),
+		showError: vi.fn(),
+		showSuccess: vi.fn(),
+		showToast: vi.fn(),
+		clear: vi.fn(),
+	}),
+}));
+
+vi.mock('@/composables/useLoadingService', () => ({
+	useLoadingService: () => ({
+		startLoading: vi.fn(),
+		stopLoading: vi.fn(),
+		setLoading: vi.fn(),
+	}),
+}));
+
 let telemetry: ReturnType<typeof useTelemetry>;

 const DynamicScrollerStub = {
 	props: {
 		items: Array,
+		minItemSize: Number,
+		class: String,
+		itemClass: String,
 	},
-	template: '<div><template v-for="item in items"><slot v-bind="{ item }"></slot></template></div>',
+	template:
+		'<div><template v-for="(item, index) in items" :key="index"><slot v-bind="{ item, index, active: false }"></slot></template></div>',
 	methods: {
 		scrollToItem: vi.fn(),
 	},
 };

 const DynamicScrollerItemStub = {
-	template: '<slot></slot>',
+	props: {
+		item: Object,
+		active: Boolean,
+		sizeDependencies: Array,
+		dataIndex: Number,
+	},
+	template: '<div><slot></slot></div>',
 };

 const projects = [
@@ -88,14 +118,16 @@ const renderModal = createComponentRenderer(SourceControlPushModal, {
 describe('SourceControlPushModal', () => {
 	beforeEach(() => {
 		vi.clearAllMocks();
-		route = useRoute();
+		// Reset route mock to default values
+		mockRoute.name = '';
+		mockRoute.params = {};
+		mockRoute.fullPath = '';
+
 		telemetry = useTelemetry();
 		createTestingPinia();
 	});

 	it('mounts', () => {
-		vi.spyOn(route, 'fullPath', 'get').mockReturnValue('');
-
 		const { getByText } = renderModal({
 			pinia: createTestingPinia(),
 			props: {
@@ -303,8 +335,8 @@ describe('SourceControlPushModal', () => {
 			},
 		];

-		vi.spyOn(route, 'name', 'get').mockReturnValue(VIEWS.WORKFLOW);
-		vi.spyOn(route, 'params', 'get').mockReturnValue({ name: 'gTbbBkkYTnNyX1jD' });
+		mockRoute.name = VIEWS.WORKFLOW;
+		mockRoute.params = { name: 'gTbbBkkYTnNyX1jD' };

 		const { getByTestId, getAllByTestId } = renderModal({
 			props: {
@@ -710,8 +742,8 @@ describe('SourceControlPushModal', () => {

 			const sourceControlStore = mockedStore(useSourceControlStore);

-			vi.spyOn(route, 'name', 'get').mockReturnValue('SOME_OTHER_VIEW');
-			vi.spyOn(route, 'params', 'get').mockReturnValue({ name: 'differentId' });
+			mockRoute.name = 'SOME_OTHER_VIEW';
+			mockRoute.params = { name: 'differentId' };

 			const { getByTestId, getAllByTestId } = renderModal({
 				props: {
--- a/packages/frontend/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/frontend/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -252,11 +252,18 @@ const filteredWorkflows = computed(() => {
 			return false;
 		}

-		if (workflow.project && filters.value.project) {
-			return workflow.project.id === filters.value.project.id;
+		// Project filter logic: if a project filter is set, only show items from that project
+		if (filters.value.project) {
+			// Item must have a project and it must match the filter
+			return workflow.project?.id === filters.value.project.id;
 		}

-		return !(filters.value.status && filters.value.status !== workflow.status);
+		// Status filter (only applied when no project filter is active)
+		if (filters.value.status && filters.value.status !== workflow.status) {
+			return false;
+		}
+
+		return true;
 	});
 });

@@ -283,11 +290,18 @@ const filteredCredentials = computed(() => {
 			return false;
 		}

-		if (credential.project && filters.value.project) {
-			return credential.project.id === filters.value.project.id;
+		// Project filter logic: if a project filter is set, only show items from that project
+		if (filters.value.project) {
+			// Item must have a project and it must match the filter
+			return credential.project?.id === filters.value.project.id;
 		}

-		return !(filters.value.status && filters.value.status !== credential.status);
+		// Status filter (only applied when no project filter is active)
+		if (filters.value.status && filters.value.status !== credential.status) {
+			return false;
+		}
+
+		return true;
 	});
 });

@@ -559,8 +573,22 @@ function castType(type: string): ResourceType {
 	return ResourceType.Credential;
 }

-function castProject(project: ProjectListItem) {
-	return { homeProject: project } as unknown as WorkflowResource;
+function castProject(project: ProjectListItem): WorkflowResource {
+	// Create a properly typed object that satisfies WorkflowResource
+	// This is a workaround for the ProjectCardBadge component expecting WorkflowResource
+	const resource: WorkflowResource = {
+		homeProject: project,
+		id: '',
+		name: '',
+		active: false,
+		createdAt: '',
+		updatedAt: '',
+		isArchived: false,
+		readOnly: false,
+		resourceType: 'workflow',
+		sharedWithProjects: [],
+	};
+	return resource;
 }

 const workflowDiffEventBus = createEventBus();
@@ -761,29 +789,8 @@ function openDiffModal(id: string) {
 											@update:model-value="toggleSelected(file.id)"
 										>
 											<span>
-												<N8nText
-													v-if="file.status === SOURCE_CONTROL_FILE_STATUS.deleted"
-													color="text-light"
-												>
-													<span v-if="file.type === SOURCE_CONTROL_FILE_TYPE.workflow">
-														Deleted Workflow:
-													</span>
-													<span v-if="file.type === SOURCE_CONTROL_FILE_TYPE.credential">
-														Deleted Credential:
-													</span>
-													<span v-if="file.type === SOURCE_CONTROL_FILE_TYPE.folders">
-														Deleted Folders:
-													</span>
-													<strong>{{ file.name || file.id }}</strong>
-												</N8nText>
-												<N8nText
-													v-else
-													tag="div"
-													bold
-													color="text-dark"
-													:class="[$style.listItemName]"
-												>
-													{{ file.name }}
+												<N8nText tag="div" bold color="text-dark" :class="[$style.listItemName]">
+													{{ file.name || file.id }}
 												</N8nText>
 												<N8nText
 													v-if="file.updatedAt"
@@ -820,13 +827,13 @@ function openDiffModal(id: string) {
 														:show-badge-border="false"
 													/>
 												</template>
-												<N8nBadge :theme="getStatusTheme(file.status)">
+												<N8nBadge :theme="getStatusTheme(file.status)" style="height: 25px">
 													{{ getStatusText(file.status) }}
 												</N8nBadge>
 												<EnvFeatureFlag name="SOURCE_CONTROL_WORKFLOW_DIFF">
 													<N8nIconButton
 														v-if="file.type === SOURCE_CONTROL_FILE_TYPE.workflow"
-														icon="git-branch"
+														icon="file-diff"
 														type="secondary"
 														@click="openDiffModal(file.id)"
 													/>
@@ -951,6 +958,7 @@ function openDiffModal(id: string) {
 .badges {
 	display: flex;
 	gap: 10px;
+	align-items: center;
 }

 .footer {
--- a/packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.test.ts
@@ -8,11 +8,23 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { mockedStore, type MockedStore } from '@/__tests__/utils';
-import { ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { createTestWorkflow } from '@/__tests__/mocks';

 const eventBus = createEventBus();

+const mockRoute = reactive({
+	name: '',
+	params: {},
+	fullPath: '',
+});
+
+vi.mock('vue-router', () => ({
+	useRoute: () => mockRoute,
+	RouterLink: vi.fn(),
+	useRouter: vi.fn(),
+}));
+
 vi.mock('@/features/workflow-diff/useViewportSync', () => ({
 	useProvideViewportSync: () => ({
 		selectedDetailId: vi.fn(),
@@ -390,4 +402,85 @@ describe('WorkflowDiffModal', () => {
 			expect(getByText('No changes')).toBeInTheDocument();
 		});
 	});
+
+	describe('missing workflow scenarios', () => {
+		it('should handle missing source workflow without crashing', async () => {
+			sourceControlStore.getRemoteWorkflow.mockResolvedValue({
+				content: mockWorkflow,
+				type: 'workflow',
+			});
+			workflowsStore.fetchWorkflow.mockRejectedValue(new Error('Workflow not found'));
+
+			const { getByText } = renderModal({
+				pinia: createTestingPinia(),
+				props: {
+					data: {
+						eventBus,
+						workflowId: 'new-workflow-id',
+						direction: 'pull',
+					},
+				},
+			});
+
+			// Component should render successfully even with missing workflow
+			await waitFor(() => {
+				expect(getByText('Changes')).toBeInTheDocument();
+			});
+		});
+
+		it('should handle missing target workflow without crashing', async () => {
+			sourceControlStore.getRemoteWorkflow.mockRejectedValue(new Error('Workflow not found'));
+			workflowsStore.fetchWorkflow.mockResolvedValue(mockWorkflow);
+
+			const { getByText } = renderModal({
+				pinia: createTestingPinia(),
+				props: {
+					data: {
+						eventBus,
+						workflowId: 'missing-workflow-id',
+						direction: 'push',
+					},
+				},
+			});
+
+			// Component should render successfully even with missing workflow
+			await waitFor(() => {
+				expect(getByText('Changes')).toBeInTheDocument();
+			});
+		});
+
+		it('should handle push direction without crashing', async () => {
+			const { getByText } = renderModal({
+				pinia: createTestingPinia(),
+				props: {
+					data: {
+						eventBus,
+						workflowId: 'test-workflow-id',
+						direction: 'push',
+					},
+				},
+			});
+
+			await waitFor(() => {
+				expect(getByText('Changes')).toBeInTheDocument();
+			});
+		});
+
+		it('should handle pull direction without crashing', async () => {
+			const { getByText } = renderModal({
+				pinia: createTestingPinia(),
+				props: {
+					data: {
+						eventBus,
+						workflowId: 'test-workflow-id',
+						direction: 'pull',
+					},
+				},
+			});
+
+			await waitFor(() => {
+				expect(getByText('Changes')).toBeInTheDocument();
+			});
+		});
+	});
 });
--- a/packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.vue
+++ b/packages/frontend/editor-ui/src/features/workflow-diff/WorkflowDiffModal.vue
@@ -266,6 +266,17 @@ const changesCount = computed(
 	() => nodeChanges.value.length + connectionsDiff.value.size + settingsDiff.value.length,
 );

+const isSourceWorkflowNew = computed(() => {
+	const sourceExists = !!sourceWorkFlow.value.state.value?.workflow;
+	const targetExists = !!targetWorkFlow.value.state.value?.workflow;
+
+	// Source is "new" only when it doesn't exist but target does AND
+	// we're in a context where the target is being pushed/pulled to create the source
+	// Push: remote (source) doesn't exist, local (target) does -> creating new on remote
+	// Pull: local (source) doesn't exist, remote (target) does -> creating new on local
+	return !sourceExists && targetExists;
+});
+
 onNodeClick((nodeId) => {
 	const node = nodesDiff.value.get(nodeId);
 	if (!node) {
@@ -543,13 +554,19 @@ const modifiers = [
 							<template v-else>
 								<div :class="$style.emptyWorkflow">
 									<N8nHeading size="large">{{
-										i18n.baseText('workflowDiff.deletedWorkflow')
+										isSourceWorkflowNew
+											? i18n.baseText('workflowDiff.newWorkflow')
+											: i18n.baseText('workflowDiff.deletedWorkflow')
 									}}</N8nHeading>
-									<N8nText v-if="targetWorkFlow.state.value?.remote" color="text-base">{{
-										i18n.baseText('workflowDiff.deletedWorkflow.database')
+									<N8nText v-if="sourceWorkFlow.state.value?.remote" color="text-base">{{
+										isSourceWorkflowNew
+											? i18n.baseText('workflowDiff.newWorkflow.remote')
+											: i18n.baseText('workflowDiff.deletedWorkflow.remote')
 									}}</N8nText>
 									<N8nText v-else color="text-base">{{
-										i18n.baseText('workflowDiff.deletedWorkflow.remote')
+										isSourceWorkflowNew
+											? i18n.baseText('workflowDiff.newWorkflow.database')
+											: i18n.baseText('workflowDiff.deletedWorkflow.database')
 									}}</N8nText>
 								</div>
 							</template>
@@ -629,7 +646,6 @@ const modifiers = [
 	}
 	:global(.el-dialog__header) {
 		padding: 11px 16px;
-		border-bottom: 1px solid var(--color-foreground-base);
 	}
 	:global(.el-dialog__headerbtn) {
 		display: none;
@@ -896,6 +912,7 @@ const modifiers = [
 .workflowDiffPanel {
 	flex: 1;
 	position: relative;
+	border-top: 1px solid var(--color-foreground-base);
 }

 .emptyWorkflow {
--- a/packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.ts
+++ b/packages/frontend/editor-ui/src/features/workflow-diff/useWorkflowDiff.ts
@@ -174,15 +174,16 @@ export const useWorkflowDiff = (
 	);

 	const nodesDiff = computed(() => {
-		// Don't compute diff until both workflows are loaded to prevent initial flashing
-		if (!source.value?.workflow?.value || !target.value?.workflow?.value) {
+		// Handle case where one or both workflows don't exist
+		const sourceNodes = source.value?.workflow?.value?.nodes ?? [];
+		const targetNodes = target.value?.workflow?.value?.nodes ?? [];
+
+		// If neither workflow exists, return empty diff
+		if (sourceNodes.length === 0 && targetNodes.length === 0) {
 			return new Map<string, NodeDiff<INodeUi>>();
 		}

-		return compareWorkflowsNodes(
-			source.value.workflow?.value?.nodes ?? [],
-			target.value.workflow?.value?.nodes ?? [],
-		);
+		return compareWorkflowsNodes(sourceNodes, targetNodes);
 	});

 	type Connection = {
@@ -222,14 +223,15 @@ export const useWorkflowDiff = (
 	}

 	const connectionsDiff = computed(() => {
-		// Don't compute diff until both workflows are loaded to prevent initial flashing
-		if (!source.value?.workflow?.value || !target.value?.workflow?.value) {
-			return new Map<string, { status: NodeDiffStatus; connection: Connection }>();
-		}
-
+		// Handle case where one or both workflows don't exist
 		const sourceConnections = mapConnections(source.value?.connections ?? []);
 		const targetConnections = mapConnections(target.value?.connections ?? []);

+		// If neither workflow has connections, return empty diff
+		if (sourceConnections.set.size === 0 && targetConnections.set.size === 0) {
+			return new Map<string, { status: NodeDiffStatus; connection: Connection }>();
+		}
+
 		const added = targetConnections.set.difference(sourceConnections.set);
 		const removed = sourceConnections.set.difference(targetConnections.set);