From aeece7367750ad20468e5a83bea4185b6394d2f7 Mon Sep 17 00:00:00 2001
From: Andreas Motl <andreas.motl@panodata.org>
Date: Fri, 11 Oct 2024 00:43:03 +0200
Subject: [PATCH] Folder Import: Fix software tests. Add change log item.

---
 HISTORY.md             |  4 ++++
 grafana_import/util.py | 22 ++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 30d5f73..f84d1a5 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,10 @@
 # History
 
 ## Unreleased
+- Fixed folder argument issue
+- Fixed import dashboards into a folder
+
+Thanks, @vrymar.
 
 ## 0.3.0 (2024-10-03)
 * Permit invocation without configuration file for ad hoc operations.
diff --git a/grafana_import/util.py b/grafana_import/util.py
index 52a9fee..85d0af6 100644
--- a/grafana_import/util.py
+++ b/grafana_import/util.py
@@ -50,19 +50,21 @@ def grafana_settings(
 
     # Grafana connectivity.
     if url or "GRAFANA_URL" in os.environ:
-        params = {"url": url or os.environ["GRAFANA_URL"]}
-        if "GRAFANA_TOKEN" in os.environ:
-            params.update({"token": os.environ["GRAFANA_TOKEN"]})
-    elif config is not None:
+        params.update({"url": url or os.environ["GRAFANA_URL"]})
+    if "GRAFANA_TOKEN" in os.environ:
+        params.update({"token": os.environ["GRAFANA_TOKEN"]})
+
+    if not params and config is not None and label is not None:
         params = grafana_settings_from_config_section(config=config, label=label)
 
     # Additional application parameters.
-    params.update(
-        {
-            "search_api_limit": config.get("grafana", {}).get("search_api_limit", 5000),
-            "folder": config.get("general", {}).get("grafana_folder", "General"),
-        }
-    )
+    if config is not None:
+        params.update(
+            {
+                "search_api_limit": config.get("grafana", {}).get("search_api_limit", 5000),
+                "folder": config.get("general", {}).get("grafana_folder", "General"),
+            }
+        )
     return params