Cmr 9086 9087 implement tool variable landing page (#1951)

* CMR-9086-9087 change the tool and variable preview version. * CMR-9086-9087: Updated the metadata preview version * CMR-9086-9087 testing the new preview version * CMR-9086-9087: removed the hardcoded preview version. --------- Co-authored-by: siwei xu <[email protected]>
nasa · Aug 10, 2023 · 329c73e · 329c73e
1 parent 90d44c4
commit 329c73e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/search-app/resources/templates/tool-base.html b/search-app/resources/templates/tool-base.html
@@ -3,9 +3,8 @@
 {% block title %}CMR Preview{% endblock %}
 
 {% block head-pre-css %}
-//replace {{ preview-version }} with MMT-3263-10 temporarily for testing purpose.
-<script defer src="{{ preview-root }}/plugin/metadata-preview.MMT-3263-10.js"></script>
-<link href="{{ preview-root }}/plugin/metadata-preview.MMT-3263-10.min.css" rel="stylesheet" type="text/css">
+<script defer src="{{ preview-root }}/plugin/metadata-preview.{{ preview-version }}.js"></script>
+<link href="{{ preview-root }}/plugin/metadata-preview.{{ preview-version }}.min.css" rel="stylesheet" type="text/css">
 {% endblock %}
 
 {% block main-content %}

diff --git a/search-app/resources/templates/variable-base.html b/search-app/resources/templates/variable-base.html
@@ -3,9 +3,8 @@
 {% block title %}CMR Preview{% endblock %}
 
 {% block head-pre-css %}
-//replace {{ preview-version }} with MMT-3263-10 temporarily for testing purpose.
-<script defer src="{{ preview-root }}/plugin/metadata-preview.MMT-3263-10.js"></script>
-<link href="{{ preview-root }}/plugin/metadata-preview.MMT-3263-10.min.css" rel="stylesheet" type="text/css">
+<script defer src="{{ preview-root }}/plugin/metadata-preview.{{ preview-version }}.js"></script>
+<link href="{{ preview-root }}/plugin/metadata-preview.{{ preview-version }}.min.css" rel="stylesheet" type="text/css">
 {% endblock %}
 
 {% block main-content %}

diff --git a/search-app/src/cmr/search/api/concepts_lookup.clj b/search-app/src/cmr/search/api/concepts_lookup.clj
@@ -117,16 +117,15 @@
           result-format (if (= result-format :xml) :native result-format)]
       (if (= :html result-format)
         (let [concept-type (concepts/concept-id->type concept-id)]
-          (cond
-            (= concept-type :tool)
+          (condp = concept-type
+            :tool
             (core-api/search-response ctx
                                       {:results (:body (pages/tool-page ctx concept-id))
                                        :result-format :html})
-            (= concept-type :variable)
+            :variable
             (core-api/search-response ctx
                                       {:results (:body (pages/variable-page ctx concept-id))
                                        :result-format :html})
-            :else
             (core-api/search-response ctx
                                       {:results (:body (pages/collection-page ctx concept-id))
                                        :result-format :html})))

diff --git a/search-app/src/cmr/search/site/data.clj b/search-app/src/cmr/search/site/data.clj
@@ -38,7 +38,7 @@
 
 (defconfig metadata-preview-version
   "version of the metadata preview plugin"
-  {:default "0.0.25"})
+  {:default "23.3.2-1"})
 
 (defmulti get-providers
   "Get the providers, based on contextual data.