Merge 40ce5a0039 into 81818a19d1

Currently translated at 100.0% (130 of 130 strings)

Translation: Dockge/dockge
Translate-URL: https://weblate.kuma.pet/projects/dockge/dockge/zh_Hans/

common/util-common.ts

@@ -236,63 +236,42 @@ export function copyYAMLComments(doc : Document, src : Document) {
 
 /**
  * Copy yaml comments from srcItems to items
- * Attempts to preserve comments by matching content rather than just array indices
+ * Typescript is super annoying here, so I have to use any here
+ * TODO: Since comments are belong to the array index, the comments will be lost if the order of the items is changed or removed or added.
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function copyYAMLCommentsItems(items: any, srcItems: any) {
+function copyYAMLCommentsItems(items : any, srcItems : any) {
     if (!items || !srcItems) {
         return;
     }
 
-    // First pass - try to match items by their content
     for (let i = 0; i < items.length; i++) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const item: any = items[i];
+        const item : any = items[i];
 
-        // Try to find matching source item by content
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const srcIndex = srcItems.findIndex((srcItem: any) =>
-            JSON.stringify(srcItem.value) === JSON.stringify(item.value) &&
-            JSON.stringify(srcItem.key) === JSON.stringify(item.key)
-        );
+        const srcItem : any = srcItems[i];
 
-        if (srcIndex !== -1) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const srcItem: any = srcItems[srcIndex];
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const nextSrcItem: any = srcItems[srcIndex + 1];
+        if (!srcItem) {
+            continue;
+        }
 
-            if (item.key && srcItem.key) {
-                item.key.comment = srcItem.key.comment;
-                item.key.commentBefore = srcItem.key.commentBefore;
-            }
+        if (item.key && srcItem.key) {
+            item.key.comment = srcItem.key.comment;
+            item.key.commentBefore = srcItem.key.commentBefore;
+        }
 
-            if (srcItem.comment) {
-                item.comment = srcItem.comment;
-            }
+        if (srcItem.comment) {
+            item.comment = srcItem.comment;
+        }
 
-            // Handle comments between array items
-            if (nextSrcItem && nextSrcItem.commentBefore) {
-                if (items[i + 1]) {
-                    items[i + 1].commentBefore = nextSrcItem.commentBefore;
-                }
-            }
+        if (item.value && srcItem.value) {
+            if (typeof item.value === "object" && typeof srcItem.value === "object") {
+                item.value.comment = srcItem.value.comment;
+                item.value.commentBefore = srcItem.value.commentBefore;
 
-            // Handle trailing comments after array items
-            if (srcItem.value && srcItem.value.comment) {
-                if (item.value) {
-                    item.value.comment = srcItem.value.comment;
-                }
-            }
-
-            if (item.value && srcItem.value) {
-                if (typeof item.value === "object" && typeof srcItem.value === "object") {
-                    item.value.comment = srcItem.value.comment;
-                    item.value.commentBefore = srcItem.value.commentBefore;
-
-                    if (item.value.items && srcItem.value.items) {
-                        copyYAMLCommentsItems(item.value.items, srcItem.value.items);
-                    }
+                if (item.value.items && srcItem.value.items) {
+                    copyYAMLCommentsItems(item.value.items, srcItem.value.items);
                 }
             }
         }

frontend/src/components/Terminal.vue

@@ -247,6 +247,7 @@ export default {
 <style scoped lang="scss">
 .main-terminal {
     height: 100%;
+    overflow-x: scroll;
 }
 </style>