style(integration): rename from declarativeui to integration.

- remove DeclarativeUi files.
- add return default value in switch.
- add const.

Signed-off-by: Camila Ayres <hello@camilasan.com>

Author: camilasan

resources.qrc

@@ -61,6 +61,6 @@
         <file>src/gui/ConflictItemFileInfo.qml</file>
         <file>src/gui/macOS/ui/FileProviderSettings.qml</file>
         <file>src/gui/macOS/ui/FileProviderFileDelegate.qml</file>
-        <file>src/gui/declarativeui/FileActionsWindow.qml</file>
+        <file>src/gui/integration/FileActionsWindow.qml</file>
     </qresource>
 </RCC>

src/gui/CMakeLists.txt

@@ -258,12 +258,8 @@ set(client_SRCS
     wizard/linklabel.cpp
     wizard/wizardproxysettingsdialog.h
     wizard/wizardproxysettingsdialog.cpp
-    declarativeui/declarativeuimodel.h
-    declarativeui/declarativeuimodel.cpp
-    declarativeui/declarativeui.h
-    declarativeui/declarativeui.cpp
-    declarativeui/fileactionsmodel.h
-    declarativeui/fileactionsmodel.cpp
+    integration/fileactionsmodel.h
+    integration/fileactionsmodel.cpp
     )
 
 if (NOT DISABLE_ACCOUNT_MIGRATION)

src/gui/declarativeui/declarativeui.cpp

@@ -160,8 +160,6 @@ ApplicationWindow {
 
                     Image {
                         source: "image://svgimage-custom-color/backup.svg/" + palette.windowText
-                        // Layout.preferredWidth: Style.accountAvatarStateIndicatorSize
-                        // Layout.preferredHeight: Style.accountAvatarStateIndicatorSize
                         Layout.minimumWidth: Style.accountAvatarStateIndicatorSize
                         Layout.minimumHeight: Style.accountAvatarStateIndicatorSize
                         fillMode: Image.PreserveAspectFit

src/gui/declarativeui/declarativeui.h

@@ -31,7 +31,13 @@ QVariant FileActionsModel::data(const QModelIndex &index, int role) const
     case FileActionMethodRole:
         return _fileActions.at(row).method; // GET
     case FileActionParamsRole:
-        return QVariant::fromValue<QList<QueryItem>>(_fileActions.at(row).params);
+        return QVariant::fromValue<QueryList>(_fileActions.at(row).params);
+    case FileActionResponseLabelRole:
+        return _response.label;
+    case FileActionResponseUrlRole:
+        return _response.url;
+    default:
+        return QVariant();
     }
 
     return {};
@@ -54,6 +60,8 @@ QHash<int, QByteArray> FileActionsModel::roleNames() const
     roles[FileActionUrlRole] = "url";
     roles[FileActionMethodRole] = "method";
     roles[FileActionParamsRole] = "params";
+    roles[FileActionResponseLabelRole] = "responseLabel";
+    roles[FileActionResponseUrlRole] = "responseUrl";
 
     return roles;
 }
@@ -83,7 +91,6 @@ QString FileActionsModel::localPath() const
     return _localPath;
 }
 
-
 void FileActionsModel::setLocalPath(const QString &localPath)
 {
     if (localPath.isEmpty()) {
@@ -168,33 +175,41 @@ void FileActionsModel::setResponse(const Response &response)
 void FileActionsModel::parseEndpoints()
 {
     if (!_accountState->isConnected()) {
-        qCWarning(lcFileActions) << "The account is not connected" << _accountUrl;
-        setResponse({ tr("Your account is offline %1.", "account url").arg(_accountUrl), _accountUrl });
+        qCWarning(lcFileActions) << "The account is not connected"
+                                 << _accountUrl;
+        setResponse({ tr("Your account is offline %1.", "account url").arg(_accountUrl),
+                     _accountUrl });
         return;
     }
 
     if (_fileId.isEmpty()) {
-        qCWarning(lcFileActions) << "The file id is empty, not initialized" << _localPath;
-        setResponse({ tr("The file id is empty for %1.", "file name").arg(_localPath), _accountUrl });
+        qCWarning(lcFileActions) << "The file id is empty, not initialized"
+                                 << _localPath;
+        setResponse({ tr("The file id is empty for %1.", "file name").arg(_localPath),
+                     _accountUrl });
         return;
     }
 
     if (!_mimeType.isValid()) {
-        qCWarning(lcFileActions) << "The mime type found for the file is not valid" << _localPath;
-        setResponse({ tr("The file type for %1 is not valid.", "file name").arg(_localPath), _accountUrl });
+        qCWarning(lcFileActions) << "The mime type found for the file is not valid"
+                                 << _localPath;
+        setResponse({ tr("The file type for %1 is not valid.", "file name").arg(_localPath),
+                     _accountUrl });
         return;
     }
 
-    const auto contextMenuList = _accountState->account()->capabilities().contextMenuByMimeType(_mimeType);
-    //const QList<QVariantMap> contextMenuList;
+    const auto contextMenuList = _accountState->account()->capabilities().fileActionsByMimeType(_mimeType);
     if (contextMenuList.isEmpty()) {
-        qCWarning(lcFileActions) << "contextMenuByMimeType is empty, nothing was returned by capabilities" << _localPath;
-        setResponse({ tr("No file actions were returned by the server for %1 files.", "file mymetype").arg(_mimeType.filterString()), _accountUrl });
+        qCWarning(lcFileActions) << "contextMenuByMimeType is empty, nothing was returned by capabilities"
+                                 << _localPath;
+        setResponse({ tr("No file actions were returned by the server for %1 files.", "file mymetype")
+                         .arg(_mimeType.filterString()),
+                     _accountUrl });
         return;
     }
 
     for (const auto &contextMenu : contextMenuList) {
-        ParamsList queryParams;
+        QueryList queryList;
         const auto paramsMap = contextMenu.value("params").toMap();
         for (auto param = paramsMap.cbegin(), end = paramsMap.cend(); param != end; ++param) {
             const auto name = param.key();
@@ -208,18 +223,20 @@ void FileActionsModel::parseEndpoints()
             }
 
             if (!value.isEmpty()) {
-                queryParams.append( QueryItem{ name, value } );
+                queryList.append( QueryItem{ name, value } );
             }
         }
 
         _fileActions.append({ parseIcon(contextMenu.value("icon").toString()),
                              contextMenu.value("name").toString(),
                              contextMenu.value("url").toString(),
                              contextMenu.value("method").toString(),
-                             queryParams });
+                             queryList });
     }
 
-    qCDebug(lcFileActions) << "File" << _localPath << "has" << _fileActions.size() << "actions available.";
+    qCDebug(lcFileActions) << "File" << _localPath << "has"
+                           << _fileActions.size()
+                           << "actions available.";
     Q_EMIT fileActionModelChanged();
 }
 
@@ -242,7 +259,8 @@ QString FileActionsModel::parseIcon(const QString &icon) const
 void FileActionsModel::createRequest(const int row)
 {
     if (!_accountState) {
-        qCWarning(lcFileActions) << "No account state for" << _localPath;
+        qCWarning(lcFileActions) << "No account state for"
+                                 << _localPath;
         return;
     }
 
@@ -252,7 +270,7 @@ void FileActionsModel::createRequest(const int row)
                                 this);
     connect(job, &JsonApiJob::jsonReceived,
             this, &FileActionsModel::processRequest);
-    for (const auto &param : _fileActions.at(row).params) {
+    for (const auto &param : std::as_const(_fileActions.at(row).params)) {
         QUrlQuery query;
         query.addQueryItem(param.name, param.value);
         job->addQueryParams(query);

…/gui/declarativeui/FileActionsWindow.qml src/gui/integration/FileActionsWindow.qmlsrc/gui/declarativeui/FileActionsWindow.qml renamed to src/gui/integration/FileActionsWindow.qml src/gui/declarativeui/FileActionsWindow.qml renamed to src/gui/integration/FileActionsWindow.qml

@@ -34,7 +34,9 @@ class FileActionsModel : public QAbstractListModel {
         FileActionNameRole,
         FileActionUrlRole,
         FileActionMethodRole,
-        FileActionParamsRole
+        FileActionParamsRole,
+        FileActionResponseLabelRole,
+        FileActionResponseUrlRole
     };
     Q_ENUM(DataRole)
 
@@ -47,7 +49,16 @@ class FileActionsModel : public QAbstractListModel {
         QString name;
         QByteArray value;
     };
-    using ParamsList = QList<QueryItem>;
+    using QueryList = QList<QueryItem>;
+
+    struct FileAction {
+        QString icon;
+        QString name;
+        QString url;
+        QString method;
+        QueryList params;
+    };
+    using ActionList = QList<FileAction>;
 
     [[nodiscard]] AccountState *accountState() const;
     void setAccountState(AccountState *accountState);
@@ -84,14 +95,7 @@ public slots:
 
 private:
     Response _response;
-    struct FileAction {
-        QString icon;
-        QString name;
-        QString url;
-        QString method;
-        ParamsList params;
-    };
-    QList<FileAction> _fileActions;
+    ActionList _fileActions;
     AccountState *_accountState;
     QString _localPath;
     QByteArray _fileId;
@@ -107,5 +111,5 @@ public slots:
 };
 }
 
-Q_DECLARE_METATYPE(OCC::FileActionsModel::ParamsList)
-Q_DECLARE_METATYPE(OCC::FileActionsModel::QueryItem)
+Q_DECLARE_METATYPE(OCC::FileActionsModel::QueryList)
+Q_DECLARE_METATYPE(OCC::FileActionsModel::ActionList)

…gui/declarativeui/declarativeuimodel.cpp …c/gui/integration/declarativeuimodel.cppsrc/gui/declarativeui/declarativeuimodel.cpp renamed to src/gui/integration/declarativeuimodel.cpp src/gui/declarativeui/declarativeuimodel.cpp renamed to src/gui/integration/declarativeuimodel.cpp

@@ -33,7 +33,7 @@
 #include "tray/sortedactivitylistmodel.h"
 #include "tray/syncstatussummary.h"
 #include "tray/unifiedsearchresultslistmodel.h"
-#include "declarativeui/fileactionsmodel.h"
+#include "integration/fileactionsmodel.h"
 #include "filesystem.h"
 
 #ifdef WITH_LIBCLOUDPROVIDERS