From 80152fe5dc2dbe9aef86b63a58fb343e4310aa75 Mon Sep 17 00:00:00 2001
From: robert-bryson <robert.bryson@gsa.gov>
Date: Fri, 6 Sep 2024 09:06:13 -0700
Subject: [PATCH 1/3] add c.group_dict.description

---
 ckanext/datagovtheme/templates/snippets/link_preview.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ckanext/datagovtheme/templates/snippets/link_preview.html b/ckanext/datagovtheme/templates/snippets/link_preview.html
index 0b012abc..bb7ac12f 100644
--- a/ckanext/datagovtheme/templates/snippets/link_preview.html
+++ b/ckanext/datagovtheme/templates/snippets/link_preview.html
@@ -6,7 +6,10 @@
   {% if pkg %}
     {% set dataset = pkg.title or pkg.name or "Data.gov Dataset" %}
     {% set organization = pkg.organization.title or pkg.organization.name or "Data.gov" %}
-    {% set notes = h.markdown_extract(pkg.notes, 180) or "The Home of the U.S. Government's Open Data" %}
+    {% set notes = h.markdown_extract(pkg.notes, 180) or 
+      h.markdown_extract(c.group_dict.description) or 
+      "The Home of the U.S. Government's Open Data"
+    %}
 
     <!-- Facebook Meta Tags -->
     <meta property="og:url" content="https://data.gov">

From 29fd9bbb66493abcdb51e83682c96c8d33d990c3 Mon Sep 17 00:00:00 2001
From: robert-bryson <robert.bryson@gsa.gov>
Date: Fri, 6 Sep 2024 09:08:08 -0700
Subject: [PATCH 2/3] bump version

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 3a3d0dc8..6d041764 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name="ckanext-datagovtheme",
-    version="0.2.33",
+    version="0.2.34",
     description="CKAN Extension to manage data.gov theme",
     long_description=long_description,
     classifiers=[

From b7946181c0ea8b0d44e53e491ebe7be66f1cd34e Mon Sep 17 00:00:00 2001
From: robert-bryson <robert.bryson@gsa.gov>
Date: Fri, 6 Sep 2024 09:47:23 -0700
Subject: [PATCH 3/3] refactor for org

---
 .../templates/snippets/link_preview.html      | 66 +++++++++----------
 1 file changed, 30 insertions(+), 36 deletions(-)

diff --git a/ckanext/datagovtheme/templates/snippets/link_preview.html b/ckanext/datagovtheme/templates/snippets/link_preview.html
index bb7ac12f..c59c29d0 100644
--- a/ckanext/datagovtheme/templates/snippets/link_preview.html
+++ b/ckanext/datagovtheme/templates/snippets/link_preview.html
@@ -1,45 +1,39 @@
 
 {% block open_graph_previews %}
-  {% set pkg = c.pkg_dict %}
+  <!-- Set defaults -->
+  {% set dataset = "Data.gov Dataset" %}
+  {% set organization = "Data.gov" %}
+  {% set notes = "The Home of the U.S. Government's Open Data" %}
   {% set img = "https://s3-us-gov-west-1.amazonaws.com/cg-0817d6e3-93c4-4de8-8b32-da6919464e61/hero-image-bg.png" %}
 
+  <!-- Set if pkg -->
+  {% set pkg = c.pkg_dict %}
   {% if pkg %}
-    {% set dataset = pkg.title or pkg.name or "Data.gov Dataset" %}
-    {% set organization = pkg.organization.title or pkg.organization.name or "Data.gov" %}
-    {% set notes = h.markdown_extract(pkg.notes, 180) or 
-      h.markdown_extract(c.group_dict.description) or 
-      "The Home of the U.S. Government's Open Data"
-    %}
-
-    <!-- Facebook Meta Tags -->
-    <meta property="og:url" content="https://data.gov">
-    <meta property="og:type" content="website">
-    <meta property="og:title" content="{{ organization | forceescape }} - {{ dataset | forceescape }}">
-    <meta property="og:description" content="{{ notes | forceescape }}">
-    <meta property="og:image" content="{{ img }}">
+    {% set dataset = pkg.title or pkg.name %}
+    {% set organization = pkg.organization.title or pkg.organization.name %}
+    {% set notes = h.markdown_extract(pkg.notes, 180) %}
+  {% endif %}
 
-    <!-- Twitter Meta Tags -->
-    <meta name="twitter:card" content="summary_large_image">
-    <meta property="twitter:domain" content="data.gov">
-    <meta property="twitter:url" content="https://data.gov">
-    <meta name="twitter:title" content="{{ organization | forceescape }} - {{ dataset | forceescape }}">
-    <meta name="twitter:description" content="{{ notes | forceescape }}">
-    <meta name="twitter:image" content="{{ img }}">
-  {% else %}
-    <!-- Facebook Meta Tags -->
-    <meta property="og:url" content="https://data.gov">
-    <meta property="og:type" content="website">
-    <meta property="og:title" content="Data.gov Home - Data.gov">
-    <meta property="og:description" content="The Home of the U.S. Government's Open Data">
-    <meta property="og:image" content="{{ img }}">
+  <!-- Set if org -->
+  {% set org = c.group_dict %}
+  {% if org %}
+    {% set dataset = "Data.gov Organization" %}
+    {% set organization = org.title or org.name %}
+    {% set notes = h.markdown_extract(org.description, 180) %}
+  {% endif %}
 
-    <!-- Twitter Meta Tags -->
-    <meta name="twitter:card" content="summary_large_image">
-    <meta property="twitter:domain" content="data.gov">
-    <meta property="twitter:url" content="https://data.gov">
-    <meta name="twitter:title" content="Data.gov Home - Data.gov">
-    <meta name="twitter:description" content="The Home of the U.S. Government's Open Data">
-    <meta name="twitter:image" content="{{ img }}">
+  <!-- Facebook Meta Tags -->
+  <meta property="og:url" content="https://data.gov">
+  <meta property="og:type" content="website">
+  <meta property="og:title" content="{{ organization | forceescape }} - {{ dataset | forceescape }}">
+  <meta property="og:description" content="{{ notes | forceescape }}">
+  <meta property="og:image" content="{{ img }}">
 
-  {% endif %}
+  <!-- Twitter Meta Tags -->
+  <meta name="twitter:card" content="summary_large_image">
+  <meta property="twitter:domain" content="data.gov">
+  <meta property="twitter:url" content="https://data.gov">
+  <meta name="twitter:title" content="{{ organization | forceescape }} - {{ dataset | forceescape }}">
+  <meta name="twitter:description" content="{{ notes | forceescape }}">
+  <meta name="twitter:image" content="{{ img }}">
 {% endblock %}