Fix Pack filter when changing scope all/solution packs (#1442) (#2394)

Co-authored-by: Evgueni Driouk <edriouk@arm.com>

Author: grasci-arm

libs/rtemodel/src/RtePackage.cpp

@@ -1175,17 +1175,20 @@ bool RtePackageFilter::IsPackageFiltered(const string& packId) const
   }
   if (!IsUseAllPacks()) {
     string commonId = RtePackage::CommonIdFromId(packId);
-    if (m_latestPacks.find(commonId) == m_latestPacks.end())
+    if(IsPackageSelected(commonId) && contains_key(m_latestInstalledPacks, packId)) {
+      return true; // pack is explicitly selected as a common ID
+    }
+    if(!contains_key(m_latestPacks, commonId)) {
       return false;
-
+    }
     for (auto& it : m_selectedPacks) {
       string id = RtePackage::CommonIdFromId(it);
       if (id == commonId) {
         return false; // another pack version is explicitly selected
       }
     }
   }
-  if(m_latestInstalledPacks.find(packId) != m_latestInstalledPacks.end()) {
+  if(contains_key(m_latestInstalledPacks, packId)) {
     return true;
   }
   return false;

tools/projmgr/src/ProjMgrRpcServer.cpp

@@ -307,12 +307,17 @@ void RpcHandler::UpdateFilter(const string& context, RteTarget* rteTarget, bool
   // construct and apply filter
   // use resolved pack ID's from selected references
   set<string> packIds;
+  set<string> latestIds;
   for(auto& ref : GetPackReferences(context)) {
     if(ref.selected && ref.resolvedPack.has_value()) {
-      packIds.insert(ref.resolvedPack.value());
+      auto& packId = ref.resolvedPack.value();
+      packIds.insert(packId);
+      string commonId = RtePackage::CommonIdFromId(packId);
+      latestIds.insert(commonId);
     }
   }
   packFilter.SetSelectedPackages(packIds);
+  packFilter.SetLatestPacks(latestIds);
   packFilter.SetUseAllPacks(all);
 
   // only update filter if differs from current state