From f3a53dfd8cb41d52b53edd86ab523bc79632a827 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 28 Feb 2024 01:25:36 +0100
Subject: [PATCH] Axivion: Use more dashboard url instead of server url

Change-Id: I1fbc1dad779e9198206cb8ef4a4029a99af6861f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/axivion/axivionplugin.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/axivion/axivionplugin.cpp b/src/plugins/axivion/axivionplugin.cpp
index be9e0be3118..06c0d72aac4 100644
--- a/src/plugins/axivion/axivionplugin.cpp
+++ b/src/plugins/axivion/axivionplugin.cpp
@@ -345,7 +345,9 @@ void AxivionPluginPrivate::onStartupProjectChanged(Project *project)
 
 static QUrl urlForProject(const QString &projectName)
 {
-    return QUrl(settings().server.dashboard).resolved(QString("api/projects/")).resolved(projectName);
+    if (!dd->m_dashboardInfo)
+        return {};
+    return dd->m_dashboardInfo->source.resolved(QString("api/projects/")).resolved(projectName);
 }
 
 static constexpr int httpStatusCodeOk = 200;
@@ -582,7 +584,7 @@ static Group authorizationRecipe()
 
         apiTokenStorage->credential = dashboardStorage->credential;
         apiTokenStorage->url
-            = QUrl(settings().server.dashboard).resolved(*dashboardDto.userApiTokenUrl);
+            = dd->m_dashboardInfo->source.resolved(*dashboardDto.userApiTokenUrl);
         apiTokenStorage->csrfToken = dashboardDto.csrfToken.toUtf8();
         const Dto::ApiTokenCreationRequestDto requestDto{*passwordStorage, "IdePlugin",
                                                          apiTokenDescription(), 0};
@@ -790,8 +792,8 @@ void AxivionPluginPrivate::fetchProjectInfo(const QString &projectName)
             handleOpenedDocs();
         };
 
-        const QUrl url(settings().server.dashboard);
-        taskTree.setRecipe(fetchDataRecipe<Dto::ProjectInfoDto>(url.resolved(*it), handler));
+        taskTree.setRecipe(
+            fetchDataRecipe<Dto::ProjectInfoDto>(m_dashboardInfo->source.resolved(*it), handler));
         return SetupResult::Continue;
     };