Address PR review feedback on unified dialog

Author: SaurabhCodesAI

src/vorta/views/repo_add_dialog.py

@@ -151,6 +151,9 @@ def __init__(self, parent=None):
         self.display_backend_warning()
         self.init_encryption()
 
+        # start in "connect" mode: hide init only widgets
+        self._set_init_widgets_visible(False)
+
     def set_password(self, URL):
         '''Autofill password from keyring only if current entry is empty'''
         password = VortaKeyring.get_keyring().get_password('vorta-repo', URL)
@@ -211,11 +214,22 @@ def display_backend_warning(self):
         if self.encryptionComboBox.currentData() != 'none':
             self.passwordInput.set_error_label(VortaKeyring.get_keyring().get_backend_warning())
 
+    def _set_init_widgets_visible(self, visible):
+        self.passwordInput.confirmLineEdit.setVisible(visible)
+        self.passwordInput._label_confirm.setVisible(visible)
+        self.encryptionLabel.setVisible(visible)
+        self.encryptionComboBox.setVisible(visible)
+        if not visible:
+            self.passwordInput.set_validation_enabled(False)
+
+    def _validate_repo_fields(self):
+        return super().validate()
+
     def validate(self):
-        return super().validate() and self.passwordInput.validate()
+        return self._validate_repo_fields() and self.passwordInput.validate()
 
     def run(self):
-        if not RepoWindow.validate(self):
+        if not self._validate_repo_fields():
             return
 
         self.saveButton.setEnabled(False)
@@ -246,6 +260,9 @@ def _probe_result(self, result):
                     QMessageBox.StandardButton.No,
                 )
                 if reply == QMessageBox.StandardButton.Yes:
+                    self._set_init_widgets_visible(True)
+                    self.passwordInput.set_validation_enabled(True)
+                    self._set_status(self.tr('Please confirm your password and choose encryption to initialize.'))
                     if not self.passwordInput.validate():
                         self.saveButton.setEnabled(True)
                         return
@@ -255,7 +272,7 @@ def _probe_result(self, result):
                     self._set_status(self.tr('Unable to add your repository.'))
             else:
                 self.saveButton.setEnabled(True)
-                self._set_status(self.tr('Unable to add your repository.'))
+                self._set_status(error_msgs if error_msgs else self.tr('Unable to add your repository.'))
 
     def _init_repo(self):
         self._set_status(self.tr('Initializing new repository…'))

tests/unit/test_repo.py

@@ -27,28 +27,32 @@
     ],
 )
 def test_new_repo_password_validation(qapp, qtbot, borg_json_output, first_password, second_password, validation_error):
-    # Add new repo window
+    # add new repo window
     main = qapp.main_window
     tab = main.repoTab
     tab.add_repo()
     add_repo_window = tab._window
     qtbot.addWidget(add_repo_window)
 
+    # reveal init only widgets so password validation is active
+    add_repo_window._set_init_widgets_visible(True)
+    add_repo_window.passwordInput.set_validation_enabled(True)
+
     qtbot.keyClicks(add_repo_window.passwordInput.passwordLineEdit, first_password)
     qtbot.keyClicks(add_repo_window.passwordInput.confirmLineEdit, second_password)
-    qtbot.mouseClick(add_repo_window.saveButton, QtCore.Qt.MouseButton.LeftButton)
+    add_repo_window.passwordInput.validate()
     assert add_repo_window.passwordInput.validation_label.text() == validation_error
 
 
 @pytest.mark.parametrize(
-    "repo_name, error_text",
+    "repo_name, status_text",
     [
-        ('test_repo_name', 'Checking repository\u2026'),  # valid repo name
+        ('test_repo_name', 'Checking repository\u2026'),  # valid repo name, probe starts
         ('a' * 64, 'Checking repository\u2026'),  # also valid (<=64 characters)
         ('a' * 65, 'Repository name must be less than 65 characters.'),  # not valid (>64 characters)
     ],
 )
-def test_repo_add_name_validation(qapp, qtbot, borg_json_output, repo_name, error_text):
+def test_repo_add_name_validation(qapp, qtbot, borg_json_output, repo_name, status_text):
     main = qapp.main_window
     tab = main.repoTab
     tab.add_repo()
@@ -59,7 +63,7 @@ def test_repo_add_name_validation(qapp, qtbot, borg_json_output, repo_name, erro
     qtbot.keyClicks(add_repo_window.repoURL, test_repo_url)
     qtbot.keyClicks(add_repo_window.repoName, repo_name)
     qtbot.mouseClick(add_repo_window.saveButton, QtCore.Qt.MouseButton.LeftButton)
-    assert add_repo_window.errorText.text() == error_text
+    assert add_repo_window.errorText.text() == status_text
 
 
 def test_repo_unlink(qapp, qtbot, monkeypatch):
@@ -103,7 +107,7 @@ def test_repo_add_failure(qapp, qtbot, borg_json_output):
     add_repo_window = tab._window
     qtbot.addWidget(add_repo_window)
 
-    # Add repo with invalid URL
+    # add repo with invalid URL
     qtbot.keyClicks(add_repo_window.repoURL, 'aaa')
     qtbot.mouseClick(add_repo_window.saveButton, QtCore.Qt.MouseButton.LeftButton)
     assert add_repo_window.errorText.text().startswith('Please enter a valid repo URL')
@@ -114,10 +118,10 @@ def test_repo_add_success(qapp, qtbot, mocker, borg_json_output):
     tab = main.repoTab
     tab.add_repo()
     add_repo_window = tab._window
-    test_repo_url = f'vorta-test-repo.{uuid.uuid4()}.com:repo'  # Random repo URL to avoid macOS keychain
+    test_repo_url = f'vorta-test-repo.{uuid.uuid4()}.com:repo'  # random repo URL to avoid macOS keychain
     test_repo_name = 'Test Repo'
 
-    # Enter valid repo URL, name, and password
+    # enter valid repo URL, name, and password
     qtbot.keyClicks(add_repo_window.repoURL, test_repo_url)
     qtbot.keyClicks(add_repo_window.repoName, test_repo_name)
     qtbot.keyClicks(add_repo_window.passwordInput.passwordLineEdit, LONG_PASSWORD)
@@ -153,16 +157,16 @@ def test_ssh_dialog_success(qapp, qtbot, mocker, tmpdir):
     ssh_dialog.outputFileTextBox.setText(key_tmpfile_full)
     ssh_dialog.generate_key()
 
-    # Ensure new key file was created
+    # Ensures new key file was created
     qtbot.waitUntil(lambda: ssh_dialog_closed.called, **pytest._wait_defaults)
     assert len(ssh_dir.listdir()) == 2
 
-    # Ensure new key is populated in SSH combobox
+    # Ensures new key is populated in SSH combobox
     mocker.patch('os.path.expanduser', return_value=str(tmpdir))
     tab.init_ssh()
     assert tab.sshComboBox.count() == 2
 
-    # Ensure valid keys were created
+    # Ensures valid keys were created
     key_tmpfile_content = key_tmpfile.read()
     assert key_tmpfile_content.startswith('-----BEGIN OPENSSH PRIVATE KEY-----')
     pub_tmpfile_content = pub_tmpfile.read()
@@ -186,10 +190,10 @@ def test_ssh_dialog_failure(qapp, qtbot, mocker, monkeypatch, tmpdir):
     qtbot.waitUntil(lambda: failure_message.called, **pytest._wait_defaults)
     failure_message.assert_called_once()
 
-    # Ensure no new ney file was created
+    # Ensures no new ney file was created
     assert len(ssh_dir.listdir()) == 0
 
-    # Ensure no new key file in combo box
+    # Ensures no new key file in combo box
     mocker.patch('os.path.expanduser', return_value=str(tmpdir))
     tab.init_ssh()
     assert tab.sshComboBox.count() == 1
@@ -288,7 +292,7 @@ def test_create(qapp, borg_json_output, mocker, qtbot):
             "icon": QMessageBox.Icon.Critical,
             "info": "The process running the check job got a kill signal. Try again.",
         },
-        {"return_code": 130, "error": "", "icon": None, "info": None},  # keyboard interrupt
+        {"return_code": 130, "error": "", "icon": None, "info": None},  
     ],
 )
 def test_repo_check_failed_response(qapp, qtbot, mocker, response):
@@ -450,7 +454,7 @@ def test_add_repo_other_error_no_init_offer(qapp, qtbot, mocker):
     window._probe_result(result)
 
     mock_question.assert_not_called()
-    assert window.errorText.text() == 'Unable to add your repository.'
+    assert window.errorText.text() == 'Connection refused'
 
 
 def test_add_repo_probe_succeeds_connects(qapp, qtbot):