Fix behaviour for projects with dash "-" in name. (#1043)

Fix #1036

Co-authored-by: ReimarBauer <[email protected]>

Author: joernu76

mslib/msui/_tests/test_mscolab.py

@@ -224,6 +224,12 @@ def test_add_project(self):
         assert self.window.loginWidget.isVisible() is False
         self._create_project("Alpha", "Description Alpha")
         assert self.window.listProjects.model().rowCount() == 1
+        self._create_project("reproduce-test", "Description Test")
+        assert self.window.listProjects.model().rowCount() == 2
+        self._activate_project_at_index(0)
+        assert self.window.active_project_name == "Alpha"
+        self._activate_project_at_index(1)
+        assert self.window.active_project_name == "reproduce-test"
 
     def test_add_user(self):
         self._connect_to_mscolab()

mslib/msui/mscolab.py

@@ -816,6 +816,7 @@ def add_projects_to_ui(self, projects):
             widgetItem = QtWidgets.QListWidgetItem(project_desc, parent=self.listProjects)
             widgetItem.p_id = project["p_id"]
             widgetItem.access_level = project["access_level"]
+            widgetItem.project_path = project["path"]
             if widgetItem.p_id == self.active_pid:
                 selectedProject = widgetItem
             self.listProjects.addItem(widgetItem)
@@ -845,7 +846,7 @@ def set_active_pid(self, item):
             # set active_pid here
             self.active_pid = item.p_id
             self.access_level = item.access_level
-            self.active_project_name = item.text().split("-")[0].strip()
+            self.active_project_name = item.project_path
             self.waypoints_model = None
             # set active flightpath here
             self.load_wps_from_server()
@@ -1165,12 +1166,9 @@ def handle_update_permission(self, p_id, u_id, access_level):
             for i in range(self.listProjects.count()):
                 item = self.listProjects.item(i)
                 if item.p_id == p_id:
-                    desc = item.text().split(' - ')
-                    project_name = desc[0]
-                    desc[-1] = access_level
-                    desc = ' - '.join(desc)
-                    item.setText(desc)
+                    project_name = item.project_path
                     item.access_level = access_level
+                    item.setText('{project_name} - {item.access_level}')
                     break
             if project_name is not None:
                 show_popup(self, "Permission Updated",
@@ -1212,10 +1210,11 @@ def delete_project_from_list(self, p_id):
             item = self.listProjects.item(i)
             if item.p_id == p_id:
                 remove_item = item
+                break
         if remove_item is not None:
-            logging.debug("remove_item: %s" % remove_item)
+            logging.debug("remove_item: %s", remove_item)
             self.listProjects.takeItem(self.listProjects.row(remove_item))
-            return remove_item.text().split(' - ')[0]
+            return remove_item.project_path
 
     @QtCore.Slot(int, int)
     def handle_revoke_permission(self, p_id, u_id):