Set Bname to empty in GetDraftProjects if no board (#1322) (#2225)

Co-authored-by: Evgueni Driouk <[email protected]>

Author: grasci-arm

tools/projmgr/src/ProjMgrRpcServer.cpp

@@ -11,7 +11,8 @@
 #include "ProductInfo.h"
 
 #include "CrossPlatformUtils.h"
-#include <RteFsUtils.h>
+#include "RteFsUtils.h"
+#include "CollectionUtils.h"
 
 #include <fstream>
 #include <iostream>
@@ -606,6 +607,10 @@ RpcArgs::DraftProjectsInfo RpcHandler::GetDraftProjects(const RpcArgs::DraftProj
       applications.message = "Board or device processing failed";
       return applications;
     }
+
+    if(contains_key(context.targetAttributes, "Dname") && !contains_key(context.targetAttributes, "Bname")) {
+      context.targetAttributes["Bname"] = "";
+    }
     m_worker.SetTargetAttributes(context, context.targetAttributes);
   }
 
@@ -631,7 +636,7 @@ RpcArgs::DraftProjectsInfo RpcHandler::GetDraftProjects(const RpcArgs::DraftProj
       env.file = environment.load;
       env.folder = environment.folder;
       e.environments.push_back(env);
-    }  
+    }
     if (!example.components.empty()) {
       e.components = example.components;
     }

tools/projmgr/test/src/ProjMgrRpcTests.cpp

@@ -652,7 +652,7 @@ TEST_F(ProjMgrRpcTests, RpcGetDraftProjects) {
   EXPECT_EQ(examples[1]["name"], "PreIncludeEnvFolder");
   EXPECT_EQ(templates[0]["name"], "Board3");
 
-  // filter 'device'
+  // filter 'device', no board
   requests =
     FormatRequest(1, "LoadPacks") +
     FormatRequest(2, "GetDraftProjects", json{{ "filter", {{ "device", "RteTest_ARMCM0_Dual" }}}});
@@ -661,12 +661,21 @@ TEST_F(ProjMgrRpcTests, RpcGetDraftProjects) {
   examples = responses[1]["result"]["examples"];
   templates = responses[1]["result"]["templates"];
   EXPECT_EQ(2, examples.size());
-  EXPECT_EQ(3, templates.size());
+  EXPECT_EQ(0, templates.size());
   EXPECT_EQ(examples[0]["name"], "PreInclude");
   EXPECT_EQ(examples[1]["name"], "PreIncludeEnvFolder");
+
+  // filter 'device', with board
+  requests =
+    FormatRequest(1, "LoadPacks") +
+    FormatRequest(2, "GetDraftProjects", json{{ "filter", {{ "device", "RteTest_ARMCM0_Dual" },{"board", "RteTest Test board"}}}});
+  responses = RunRpcMethods(requests);
+  EXPECT_TRUE(responses[1]["result"]["success"]);
+  examples = responses[1]["result"]["examples"];
+  templates = responses[1]["result"]["templates"];
+  EXPECT_EQ(0, examples.size());
+  EXPECT_EQ(1, templates.size());
   EXPECT_EQ(templates[0]["name"], "Board1Template");
-  EXPECT_EQ(templates[1]["name"], "Board2");
-  EXPECT_EQ(templates[2]["name"], "Board3");
 
   // filter 'device' that's not mounted on any board
   requests =