From 2f418813b8158ef42c8e7b1d7e3033c4536b6fb2 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Fri, 7 Jun 2024 13:07:18 +0300
Subject: [PATCH] QmlDesigner: Confirm overwrite when importing a bundle

Change-Id: Ifdafb7d607d1ce5c4d2f0eac401588b691e25410
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
---
 .../contentlibrary/contentlibraryview.cpp     | 51 +++++++++++++------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
index 600fa181f5b..1264ae57ff0 100644
--- a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
+++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
@@ -1002,33 +1002,52 @@ void ContentLibraryView::importBundle()
     const QJsonArray importedItemsArr = importedJsonObj.value("items").toArray();
     QTC_ASSERT(!importedItemsArr.isEmpty(), return);
 
-    // copy files to bundle folder
-    const QList<ZipReader::FileInfo> fiList = zipReader.fileInfoList();
-    for (const ZipReader::FileInfo &fi : fiList) {
-        if (fi.filePath == Constants::BUNDLE_JSON_FILENAME)
-            continue;
-
-        Utils::FilePath fp = bundlePath.pathAppended(fi.filePath);
-        fp.parentDir().ensureWritableDir();
-        fp.writeFileContents(zipReader.fileData(fi.filePath));
-    }
-    zipReader.close();
-
-    // update bundle json file and user model
     QJsonObject &jsonRef = m_widget->userModel()->bundleJson3DObjectRef();
     QJsonArray itemsArr = jsonRef.value("items").toArray();
+
+    QStringList existingQmls;
+    for (const QJsonValueConstRef &itemRef : std::as_const(itemsArr))
+        existingQmls.append(itemRef.toObject().value("qml").toString());
+
     for (const QJsonValueConstRef &itemRef : importedItemsArr) {
+        QJsonObject itemObj = itemRef.toObject();
+        QString qml = itemObj.value("qml").toString();
+
+        // confirm overwrite if an item with same name exists
+        if (existingQmls.contains(qml)) {
+            QMessageBox::StandardButton reply = QMessageBox::question(m_widget, tr("Component Exists"),
+                                                tr("A component with the same name '%1' already "
+                                                   "exists in the Content Library, are you sure "
+                                                   "you want to overwrite it?")
+                                            .arg(qml), QMessageBox::Yes | QMessageBox::No);
+            if (reply == QMessageBox::No)
+                continue;
+
+            // before overwriting remove old item (to avoid partial items and dangling assets)
+            m_widget->userModel()->remove3DFromContentLibByName(qml);
+        }
+
         // add entry to json
         itemsArr.append(itemRef);
 
         // add entry to model
-        const QJsonObject itemObj = itemRef.toObject();
         QString name = itemObj.value("name").toString();
-        QString qml = itemObj.value("qml").toString();
         QStringList files = itemObj.value("files").toVariant().toStringList();
-        QUrl iconUrl = bundlePath.pathAppended(itemObj.value("icon").toString()).toUrl();
+        QString icon = itemObj.value("icon").toString();
+        QUrl iconUrl = bundlePath.pathAppended(icon).toUrl();
         m_widget->userModel()->add3DItem(name, qml, iconUrl, files);
+
+        // copy files
+        files << qml << icon; // all files
+        for (const QString &file : std::as_const(files)) {
+            Utils::FilePath filePath = bundlePath.pathAppended(file);
+            filePath.parentDir().ensureWritableDir();
+            QTC_ASSERT_EXPECTED(filePath.writeFileContents(zipReader.fileData(file)),);
+        }
     }
+
+    zipReader.close();
+
     jsonRef["items"] = itemsArr;
 
     auto result = bundlePath.pathAppended(Constants::BUNDLE_JSON_FILENAME)