From 64d8c46b49904d70fa36b323dec79cd098944ac3 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <antgonza@gmail.com>
Date: Wed, 15 May 2024 09:20:34 -0600
Subject: [PATCH] fix #3381

---
 qiita_core/configuration_manager.py            |  2 +-
 qiita_core/support_files/config_test.cfg       |  6 +++---
 qiita_core/tests/test_configuration_manager.py |  2 +-
 qiita_pet/support_files/doc/source/index.rst   |  1 -
 qiita_pet/support_files/doc/source/qiimp.rst   | 10 ----------
 qiita_pet/templates/iframe.html                |  2 --
 qiita_pet/templates/sitebase.html              |  5 -----
 7 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 qiita_pet/support_files/doc/source/qiimp.rst

diff --git a/qiita_core/configuration_manager.py b/qiita_core/configuration_manager.py
index 656ccc521..61bab4ea6 100644
--- a/qiita_core/configuration_manager.py
+++ b/qiita_core/configuration_manager.py
@@ -389,4 +389,4 @@ def _get_portal(self, config):
                 raise ValueError(msg % (name, val, 'larger than 180°'))
 
     def _iframe(self, config):
-        self.iframe_qiimp = config.get('iframe', 'QIIMP')
+        self.iframe_qiimp = config.get('iframe', 'QIIMP', None)
diff --git a/qiita_core/support_files/config_test.cfg b/qiita_core/support_files/config_test.cfg
index 2bcb5bec4..917d49adf 100644
--- a/qiita_core/support_files/config_test.cfg
+++ b/qiita_core/support_files/config_test.cfg
@@ -193,6 +193,6 @@ STATS_MAP_CENTER_LONGITUDE =
 
 # ----------------------------- iframes settings ---------------------------
 [iframe]
-# The real world QIIMP will always need to be accessed with https because Qiita
-# runs on https too
-QIIMP = https://localhost:8898/
+# On May 2024, we removed QIIMP from the code base but we will leave this
+# section in case we need to add access to another iframe in the future; note
+# that the qiita-terms are also accessed via iframe but this is internal
diff --git a/qiita_core/tests/test_configuration_manager.py b/qiita_core/tests/test_configuration_manager.py
index f9c47ee0b..c59776ea2 100644
--- a/qiita_core/tests/test_configuration_manager.py
+++ b/qiita_core/tests/test_configuration_manager.py
@@ -109,7 +109,7 @@ def test_init(self):
         self.assertEqual(obs.portal_dir, "/portal")
 
         # iframe section
-        self.assertEqual(obs.iframe_qiimp, "https://localhost:8898/")
+        self.assertIsNone(obs.iframe_qiimp)
 
     def test_init_error(self):
         with open(self.conf_fp, 'w') as f:
diff --git a/qiita_pet/support_files/doc/source/index.rst b/qiita_pet/support_files/doc/source/index.rst
index d6aec846e..51baece20 100755
--- a/qiita_pet/support_files/doc/source/index.rst
+++ b/qiita_pet/support_files/doc/source/index.rst
@@ -27,7 +27,6 @@ Looking for information about getting started? Please see the document here:
 
    gettingstartedguide/index.rst
    qiita-philosophy/index.rst
-   qiimp.rst
 
 Looking for information about how to process your data? Please see the document here:
 
diff --git a/qiita_pet/support_files/doc/source/qiimp.rst b/qiita_pet/support_files/doc/source/qiimp.rst
deleted file mode 100644
index 61548996a..000000000
--- a/qiita_pet/support_files/doc/source/qiimp.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-.. _Qiimp:
-
-.. index:: Qiimp
-
-Qiimp
-=======
-*  Helps you create Qiita and EBI compatible metadata spreadsheets
-
-For more information and  advanced queries go to the `Qiimp github page <https://github.com/ucsd-ccbb/qiimp>`__.
-For a step by step guide on using Qiimp, visit the `Qiimp tutorial <https://metadata-wizard-tutorial.readthedocs.io/en/latest/>`__.
diff --git a/qiita_pet/templates/iframe.html b/qiita_pet/templates/iframe.html
index 066aa9f23..60dbcc107 100644
--- a/qiita_pet/templates/iframe.html
+++ b/qiita_pet/templates/iframe.html
@@ -3,8 +3,6 @@
 
 {% if iframe == 'qiita-terms' %}
   <iframe style="margin: 0; padding: 0; width: 100%; height: 800px;" src="{% raw qiita_config.portal_dir %}/static/qiita_data_terms_of_use.html"></iframe>
-{% elif iframe == 'qiimp' %}
-  <iframe style="margin: 0; padding: 0; width: 100%; height: 800px;" src="{{qiita_config.iframe_qiimp}}"></iframe>
 {% else %}
   <b>No content</b>
 {% end %}
diff --git a/qiita_pet/templates/sitebase.html b/qiita_pet/templates/sitebase.html
index c6add33bd..5fcc0db12 100644
--- a/qiita_pet/templates/sitebase.html
+++ b/qiita_pet/templates/sitebase.html
@@ -464,11 +464,6 @@
                 <a href="/redbiom/">redbiom</a>
               </li>
             </ul>
-            <ul class="nav navbar-nav">
-              <li>
-                <a href="{% raw qiita_config.portal_dir %}/iframe/?iframe=qiimp">Qiimp</a>
-              </li>
-            </ul>
             <ul class="nav navbar-nav">
               <!-- downloads -->
               <li class="dropdown">