From dbc515523fb9f215493a6298eb4ec1add7812fdb Mon Sep 17 00:00:00 2001
From: Anthony Lukach <anthonylukach@gmail.com>
Date: Mon, 24 Feb 2025 15:40:06 -0800
Subject: [PATCH] Rm iface from forms

---
 ee_plugin/ee_plugin.py                       |  8 ++------
 ee_plugin/ui/forms/add_ee_image.py           |  7 ++-----
 ee_plugin/ui/forms/add_feature_collection.py |  2 --
 test/test_form_add_ee_image.py               | 10 +++++-----
 test/test_ui.py                              |  4 ++--
 5 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/ee_plugin/ee_plugin.py b/ee_plugin/ee_plugin.py
index 52b91db..e4fe257 100644
--- a/ee_plugin/ee_plugin.py
+++ b/ee_plugin/ee_plugin.py
@@ -121,17 +121,13 @@ def initGui(self):
             text=self.tr("Add Feature Collection"),
             parent=self.iface.mainWindow(),
             triggered=lambda: add_feature_collection.form(
-                self.iface,
-                accepted=add_feature_collection.callback,
+                accepted=add_feature_collection.callback
             ),
         )
         add_ee_image_button = QtWidgets.QAction(
             text=self.tr("Add Image"),
             parent=self.iface.mainWindow(),
-            triggered=lambda: add_ee_image.form(
-                self.iface,
-                accepted=add_ee_image.callback,
-            ),
+            triggered=lambda: add_ee_image.form(accepted=add_ee_image.callback),
         )
 
         # Initialize plugin menu
diff --git a/ee_plugin/ui/forms/add_ee_image.py b/ee_plugin/ui/forms/add_ee_image.py
index a61d0bc..96360e2 100644
--- a/ee_plugin/ui/forms/add_ee_image.py
+++ b/ee_plugin/ui/forms/add_ee_image.py
@@ -2,7 +2,6 @@
 from typing import Callable, Optional
 
 import ee
-from qgis import gui
 from qgis.PyQt import QtWidgets
 from qgis.core import QgsMessageLog, Qgis
 
@@ -11,10 +10,7 @@
 from ..utils import call_func_with_values
 
 
-# TODO: iface is not used
-def form(
-    iface: gui.QgisInterface, accepted: Optional[Callable] = None, **dialog_kwargs
-) -> QtWidgets.QDialog:
+def form(accepted: Optional[Callable] = None, **dialog_kwargs) -> QtWidgets.QDialog:
     """Display a dialog to add a GEE dataset to the QGIS map."""
     dialog = build_vbox_dialog(
         windowTitle="Add Google Earth Engine Image",
@@ -49,6 +45,7 @@ def form(
                 ],
             ),
         ],
+        **dialog_kwargs,
     )
 
     if accepted:
diff --git a/ee_plugin/ui/forms/add_feature_collection.py b/ee_plugin/ui/forms/add_feature_collection.py
index 9df5044..bca608a 100644
--- a/ee_plugin/ui/forms/add_feature_collection.py
+++ b/ee_plugin/ui/forms/add_feature_collection.py
@@ -9,7 +9,6 @@
 
 
 def form(
-    iface: gui.QgisInterface,
     accepted: Optional[Callable] = None,
     **dialog_kwargs,
 ) -> QtWidgets.QDialog:
@@ -100,7 +99,6 @@ def form(
                 ],
             ),
         ],
-        parent=iface.mainWindow(),
         **dialog_kwargs,
     )
 
diff --git a/test/test_form_add_ee_image.py b/test/test_form_add_ee_image.py
index ba517eb..d389742 100644
--- a/test/test_form_add_ee_image.py
+++ b/test/test_form_add_ee_image.py
@@ -5,7 +5,7 @@
 
 
 def test_add_gee_layer_dialog(clean_qgis_iface):
-    dialog = form(clean_qgis_iface)
+    dialog = form()
     dialog.findChild(QtWidgets.QLineEdit, "image_id").setText("COPERNICUS/S2")
 
     dialog.findChild(QtWidgets.QTextEdit, "viz_params").setText(
@@ -19,7 +19,7 @@ def test_add_gee_layer_dialog(clean_qgis_iface):
 
 
 def test_load_gee_layer_srtm(clean_qgis_iface):
-    dialog = form(clean_qgis_iface)
+    dialog = form()
     dialog.findChild(QtWidgets.QLineEdit, "image_id").setText("USGS/SRTMGL1_003")
 
     dialog.findChild(QtWidgets.QTextEdit, "viz_params").setText(
@@ -39,7 +39,7 @@ def test_load_gee_layer_srtm(clean_qgis_iface):
 
 
 def test_converting_viz_params_json(clean_qgis_iface):
-    dialog = form(clean_qgis_iface)
+    dialog = form()
     dialog.findChild(QtWidgets.QLineEdit, "image_id").setText("USGS/SRTMGL1_003")
 
     # single quotes should get replaced to double quotes
@@ -56,7 +56,7 @@ def test_converting_viz_params_json(clean_qgis_iface):
 
 
 def test_invalid_viz_params(clean_qgis_iface):
-    dialog = form(clean_qgis_iface)
+    dialog = form()
     dialog.findChild(QtWidgets.QLineEdit, "image_id").setText("USGS/SRTMGL1_003")
 
     dialog.findChild(QtWidgets.QTextEdit, "viz_params").setText(
@@ -69,7 +69,7 @@ def test_invalid_viz_params(clean_qgis_iface):
 
 
 def test_empty_viz_params(clean_qgis_iface):
-    dialog = form(clean_qgis_iface)
+    dialog = form()
     dialog.findChild(QtWidgets.QLineEdit, "image_id").setText("USGS/SRTMGL1_003")
 
     dialog.findChild(QtWidgets.QTextEdit, "viz_params").setText("")
diff --git a/test/test_ui.py b/test/test_ui.py
index 2f4036d..fc7e5dc 100644
--- a/test/test_ui.py
+++ b/test/test_ui.py
@@ -84,9 +84,9 @@ def test_get_values():
         ),
     ],
 )
-def test_add_feature_collection_form(qgis_iface, form_input, expected_form_output):
+def test_add_feature_collection_form(form_input, expected_form_output):
     mock_callback = create_autospec(add_feature_collection.callback)
-    dialog = add_feature_collection.form(iface=qgis_iface, accepted=mock_callback)
+    dialog = add_feature_collection.form(accepted=mock_callback)
 
     # Populate dialog with form_input
     for key, value in form_input.items():