Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix(frontend): normalize schema diff line endings (#19650)

p0ny40fdff225a18
diff --git a/frontend/src/components/SyncDatabaseSchemaV1/SchemaDiffViewer.vue b/frontend/src/components/SyncDatabaseSchemaV1/SchemaDiffViewer.vue
index f8df662078..d771e4a187 100644
--- a/frontend/src/components/SyncDatabaseSchemaV1/SchemaDiffViewer.vue
+++ b/frontend/src/components/SyncDatabaseSchemaV1/SchemaDiffViewer.vue
@@ -28,8 +28,9 @@
<DiffEditor
ref="diffEditorRef"
class="h-full"
- :original="original"
- :modified="modified"
+ :original="normalizedOriginal"
+ :modified="normalizedModified"
+ :options="{ ignoreTrimWhitespace: true }"
:readonly="true"
/>
</div>
@@ -38,8 +39,8 @@
<SchemaDiffViewerModal
v-if="showFullscreenModal"
:title="title"
- :original="original"
- :modified="modified"
+ :original="normalizedOriginal"
+ :modified="normalizedModified"
@close="showFullscreenModal = false"
/>
</template>
@@ -47,17 +48,23 @@
<script lang="ts" setup>
import { ArrowDownIcon, ArrowUpIcon, Maximize2Icon } from "lucide-vue-next";
import { NButton } from "naive-ui";
-import { ref } from "vue";
+import { computed, ref } from "vue";
import { DiffEditor } from "@/components/MonacoEditor";
import SchemaDiffViewerModal from "./SchemaDiffViewerModal.vue";
-defineProps<{
+const props = defineProps<{
title: string;
original: string;
modified: string;
showFullscreen?: boolean;
}>();
+const normalizeLineEndings = (content: string) =>
+ content.replace(/\r\n?/g, "\n");
+
+const normalizedOriginal = computed(() => normalizeLineEndings(props.original));
+const normalizedModified = computed(() => normalizeLineEndings(props.modified));
+
const showFullscreenModal = ref(false);
const diffEditorRef = ref<InstanceType<typeof DiffEditor>>();