Fa206 multi select

fapolicy_analyzer/glade/searchable_list.glade

@@ -84,8 +84,11 @@
                   <object class="GtkTreeView" id="treeView">
                     <property name="visible">True</property>
                     <property name="can-focus">True</property>
+                    <property name="rubber-banding">True</property>
                     <child internal-child="selection">
-                      <object class="GtkTreeSelection"/>
+                      <object class="GtkTreeSelection" id="treeSelection">
+                        <property name="mode">multiple</property>
+                      </object>
                     </child>
                   </object>
                 </child>

fapolicy_analyzer/tests/test_ancillary_trust_database_admin.py

@@ -67,7 +67,7 @@ def test_updates_trust_details(widget, mocker):
     mocker.patch(
         "ui.ancillary_trust_database_admin.fs.stat", return_value="stat for foo file"
     )
-    trust = MagicMock(status="T", path="/tmp/foo", size=1, hash="abc", spec=Trust)
+    trust = [MagicMock(status="T", path="/tmp/foo", size=1, hash="abc", spec=Trust)]
     widget.on_trust_selection_changed(trust)
     widget.trustFileDetails.set_in_database_view.assert_called_with(
         "File: /tmp/foo\nSize: 1\nSHA256: abc"
@@ -87,7 +87,7 @@ def test_updates_trust_details_for_deleted_files(widget, mocker):
     mocker.patch(
         "ui.ancillary_trust_database_admin.fs.stat", return_value="stat for foo file"
     )
-    trust = MagicMock(path="/tmp/foo")
+    trust = [MagicMock(path="/tmp/foo")]
     widget.on_trust_selection_changed(trust)
     widget.trustFileDetails.set_in_database_view.assert_not_called()
     widget.trustFileDetails.set_on_file_system_view.assert_called_with(
@@ -136,7 +136,7 @@ def test_on_trustBtn_clicked(widget, mock_dispatch, mocker):
     mocker.patch(
         "ui.ancillary_trust_database_admin.fs.stat", return_value="stat for foo file"
     )
-    trust = MagicMock(path="/tmp/foo")
+    trust = [MagicMock(path="/tmp/foo")]
     widget.on_trust_selection_changed(trust)
     widget.get_object("trustBtn").clicked()
     mock_dispatch.assert_called_with(
@@ -166,7 +166,7 @@ def test_on_untrustBtn_clicked(widget, mock_dispatch, mocker):
     mocker.patch(
         "ui.ancillary_trust_database_admin.fs.stat", return_value="stat for foo file"
     )
-    trust = MagicMock(path="/tmp/foo")
+    trust = [MagicMock(path="/tmp/foo")]
     widget.on_trust_selection_changed(trust)
     widget.get_object("untrustBtn").clicked()
     mock_dispatch.assert_called_with(

fapolicy_analyzer/tests/test_object_list.py

@@ -186,4 +186,4 @@ def test_fires_file_selection_changed_event(widget):
     widget.load_store([mockData])
     view = widget.get_object("treeView")
     view.get_selection().select_path(Gtk.TreePath.new_first())
-    mockHandler.assert_called_with(mockData)
+    mockHandler.assert_called_with([mockData])

fapolicy_analyzer/tests/test_searchable_list.py

@@ -79,7 +79,7 @@ def test_fires_selection_changed_event(widget):
     widget.load_store(store)
     view = widget.get_object("treeView")
     view.get_selection().select_path(Gtk.TreePath.new_first())
-    mockHandler.assert_called_with(Contains("baz"))
+    mockHandler.assert_called_with([Contains("baz")])
 
 
 def test_sorting(widget):

fapolicy_analyzer/tests/test_subject_list.py

@@ -160,7 +160,7 @@ def test_fires_file_selection_changed_event(widget):
     widget.load_store([mockData])
     view = widget.get_object("treeView")
     view.get_selection().select_path(Gtk.TreePath.new_first())
-    mockHandler.assert_called_with(mockData)
+    mockHandler.assert_called_with([mockData])
 
 
 @pytest.mark.parametrize(

fapolicy_analyzer/tests/test_system_trust_database_admin.py

@@ -77,7 +77,7 @@ def test_updates_trust_details(widget, mocker):
     mocker.patch.object(widget.trustFileDetails, "set_on_file_system_view")
     mocker.patch.object(widget.trustFileDetails, "set_trust_status")
     mocker.patch("ui.ancillary_trust_database_admin.fs.sha", return_value="abc")
-    trust = MagicMock(status="T", path="/tmp/foo", size=1, hash="abc")
+    trust = [MagicMock(status="T", path="/tmp/foo", size=1, hash="abc")]
     widget.on_trust_selection_changed(trust)
     widget.trustFileDetails.set_in_database_view.assert_called_with(
         "File: /tmp/foo\nSize: 1\nSHA256: abc"
@@ -101,7 +101,7 @@ def test_disables_add_button(widget):
 def test_fires_file_added_to_ancillary_trust(widget):
     handler = MagicMock()
     widget.file_added_to_ancillary_trust += handler
-    widget.selectedFile = MagicMock(path="foo")
+    widget.selectedFile = [MagicMock(path="foo")]
     addBtn = widget.get_object("addBtn")
     addBtn.clicked()
     handler.assert_called_with("foo")

fapolicy_analyzer/tests/test_trust_file_list.py

@@ -96,7 +96,7 @@ def test_fires_trust_selection_changed(widget):
     widget.trust_selection_changed += mockHandler
     view = widget.get_object("treeView")
     view.get_selection().select_path(Gtk.TreePath.new_first())
-    mockHandler.assert_called_with(_trust[0])
+    mockHandler.assert_called_with([_trust[0]])
 
 
 def test_epoch_to_string():

fapolicy_analyzer/ui/ancillary_trust_database_admin.py

@@ -73,11 +73,12 @@ def delete_trusted_files(self, *files):
             changeset.del_trust(file)
         self.__apply_changeset(changeset)
 
-    def on_trust_selection_changed(self, trust):
-        self.selectedFile = trust.path if trust else None
+    def on_trust_selection_changed(self, trusts):
+        self.selectedFile = [t.path for t in trusts] if trusts else None
         trustBtn = self.get_object("trustBtn")
         untrustBtn = self.get_object("untrustBtn")
-        if trust:
+        if trusts:
+            trust = trusts[-1]
             status = getattr(trust, "status", "").lower()
             trusted = status == "t"
             trustBtn.set_sensitive(not trusted)
@@ -125,11 +126,13 @@ def on_files_added(self, files):
 
     def on_trustBtn_clicked(self, *args):
         if self.selectedFile:
-            self.add_trusted_files(self.selectedFile)
+            for sfile in self.selectedFile:
+                self.add_trusted_files(sfile)
 
     def on_untrustBtn_clicked(self, *args):
         if self.selectedFile:
-            self.delete_trusted_files(self.selectedFile)
+            for sfile in self.selectedFile:
+                self.delete_trusted_files(sfile)
 
     def on_next_system(self, system):
         changesets = system.get("changesets")

fapolicy_analyzer/ui/policy_rules_admin_page.py

@@ -324,34 +324,35 @@ def on_next_system(self, system):
         )
 
     def on_user_selection_changed(self, secondaryAction, data):
-        uid = data[1] if data else None
-        if uid != self.selectedUser:
-            self.selectedUser = uid
-            self.selectedGroup = None
-            self.__populate_acl_details(uid, acl.getUserDetails)
-            secondaryAction()
+        uids = [datum[1] for datum in data] if data else [None]
+        for uid in uids:
+            if uid != self.selectedUser:
+                self.selectedUser = uid
+                self.selectedGroup = None
+                self.__populate_acl_details(uid, acl.getUserDetails)
+                secondaryAction()
 
     def on_group_selection_changed(self, secondaryAction, data):
-        gid = data[1] if data else None
-        if gid != self.selectedGroup:
-            self.selectedGroup = gid
-            self.selectedUser = None
-            self.__populate_acl_details(gid, acl.getGroupDetails)
-            secondaryAction()
+        gids = [datum[1] for datum in data] if data else [None]
+        for gid in gids:
+            if gid != self.selectedGroup:
+                self.selectedGroup = gid
+                self.selectedUser = None
+                self.__populate_acl_details(gid, acl.getGroupDetails)
+                secondaryAction()
 
     def on_subject_selection_changed(self, secondaryAction, data):
-        subject = data.file if data else None
-        if subject == self.selectedSubject:
+        fileObj = data[-1].file if data else None
+        if fileObj == self.selectedSubject:
             return
-
-        self.selectedSubject = subject
+        self.selectedSubject = fileObj
         subjectDetails = self.get_object("subjectDetails")
-        subjectDetails.get_buffer().set_text(fs.stat(subject) if subject else "")
+        subjectDetails.get_buffer().set_text(fs.stat(fileObj) if fileObj else "")
         secondaryAction()
 
     def on_object_selection_changed(self, data):
         objectDetails = self.get_object("objectDetails")
-        objectDetails.get_buffer().set_text(fs.stat(data.file) if data else "")
+        objectDetails.get_buffer().set_text(fs.stat(data) if data else "")
 
     def on_switcher_button_clicked(self, switcher):
         switcher.set_as_secondary()

fapolicy_analyzer/ui/searchable_list.py

@@ -80,7 +80,6 @@ def apply_prev_sort(model):
 
         sortableModel = apply_prev_sort(Gtk.TreeModelSort(model=self.treeViewFilter))
         self.treeView.set_model(sortableModel)
-
         self.treeView.get_selection().connect("changed", self.on_view_selection_changed)
         self._update_tree_count(self.__get_tree_count())
         self.set_loading(False)
@@ -114,8 +113,8 @@ def get_action_buttons(self):
         return self.get_object("actionButtons").get_children()
 
     def on_view_selection_changed(self, selection):
-        model, treeiter = selection.get_selected()
-        data = model[treeiter] if model and treeiter else []
+        model, treeiter = selection.get_selected_rows()
+        data = [model[i] for i in treeiter] if model and treeiter else []
         self.selection_changed(data)
 
     def on_search_changed(self, search):

fapolicy_analyzer/ui/subject_list.py

@@ -108,8 +108,8 @@ def __color(self, access):
         )
 
     def __handle_selection_changed(self, data):
-        fileObj = data[3] if data else None
-        self.file_selection_changed(fileObj)
+        fileObjs = [datum[3] for datum in data] if data else None
+        self.file_selection_changed(fileObjs)
 
     def __show_reconciliation_dialog(self, subject):
         def find_db_trust(subject):

fapolicy_analyzer/ui/system_trust_database_admin.py

@@ -86,10 +86,11 @@ def on_next_system(self, system):
             self._trust = trustState.trust
             self.trustFileList.load_trust(self._trust)
 
-    def on_trust_selection_changed(self, trust):
-        self.selectedFile = trust
+    def on_trust_selection_changed(self, trusts):
+        self.selectedFile = trusts
         addBtn = self.get_object("addBtn")
-        if trust:
+        if trusts:
+            trust = trusts[-1]
             status = trust.status.lower()
             trusted = status == "t"
             addBtn.set_sensitive(not trusted)
@@ -123,4 +124,5 @@ def on_trust_selection_changed(self, trust):
 
     def on_addBtn_clicked(self, *args):
         if self.selectedFile:
-            self.file_added_to_ancillary_trust(self.selectedFile.path)
+            for sfile in self.selectedFile:
+                self.file_added_to_ancillary_trust(sfile.path)

fapolicy_analyzer/ui/trust_file_list.py

@@ -68,7 +68,7 @@ def __init__(self, trust_func, markup_func=None, *args):
         self.get_ref().connect("destroy", self.on_destroy)
 
     def __handle_selection_changed(self, data):
-        trust = data[3] if data else None
+        trust = [datum[3] for datum in data] if data else None
         self.trust_selection_changed(trust)
 
     def _columns(self):