fix: logic to display error/success messages.

Improve text for those messages.

Signed-off-by: Camila Ayres <[email protected]>

Author: camilasan

src/gui/declarativeui/fileactionsmodel.cpp

@@ -249,32 +249,42 @@ void FileActionsModel::createRequest(const int row)
     }
     const auto verb = job->stringToVerb(_fileActions.at(row).method);
     job->setVerb(verb);
+    job->setProperty(rowC, row);
     job->start();
 }
 
 void FileActionsModel::processRequest(const QJsonDocument &json, int statusCode)
 {
-    auto message = tr("File action succeded, access your instance for the result.");
+    const auto row = sender()->property(rowC).toInt();
+    const auto fileAction = _fileActions.at(row).name;
+    const auto errorMessage = tr("%1 did not succeed, please try again later. "
+                                 "If you need help, contact your server administrator.",
+                                 "file action error message").arg(fileAction);
     if (statusCode != 200) {
         qCWarning(lcFileActions) << "File action did not succeed for" << _localPath;
+        setResponse({ errorMessage, _accountUrl });
+        return;
     }
 
     const auto root = json.object().value(QStringLiteral("root")).toObject();
+    const auto folderForPath = FolderMan::instance()->folderForPath(_localPath);
+    const auto remoteFolderPath = _accountUrl + folderForPath->remotePath();
+    const auto successMessage = tr("%1 done.", "file action success message").arg(fileAction);
     if (root.empty()) {
-        const auto folderForPath = FolderMan::instance()->folderForPath(_localPath);
-        setResponse({ message, _accountUrl });
+        setResponse({ successMessage, remoteFolderPath });
         return;
     }
+
     const auto orientation = root.value(QStringLiteral("orientation")).toString();
     const auto rows = root.value(QStringLiteral("rows")).toArray();
     if (rows.empty()) {
+        setResponse({ successMessage, remoteFolderPath });
         return;
     }
 
     for (const auto &rowValue : rows) {
         const auto row = rowValue.toObject();
         const auto children = row.value("children").toArray();
-
         for (const auto &childValue : children) {
             const auto child = childValue.toObject();
             setResponse({ child.value(QStringLiteral("element")).toString(),

src/gui/declarativeui/fileactionsmodel.h

@@ -97,6 +97,7 @@ public slots:
     static constexpr char fileIdUrlC[] = "{fileId}";
     static constexpr char fileIdC[] = "fileId";
     static constexpr char filePathC[] = "filePath";
+    static constexpr char rowC[] = "row";
 };
 
 }