Fix 3381 (#3408)

* Update CHANGELOG.md * fix #3381 * fallback * rm qiimp from test
qiita-spots · May 16, 2024 · c0cdb4b · c0cdb4b
1 parent 6ac8ee8
commit c0cdb4b
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 24 deletions.
diff --git 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', fallback=None)
diff --git 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
@@ -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:
@@ -471,7 +471,6 @@ def test_get_portal_latlong(self):
 
 # ----------------------------- iframes settings ---------------------------
 [iframe]
-QIIMP = https://localhost:8898/
 """
 
 if __name__ == '__main__':

diff --git 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
diff --git 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
@@ -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">