Fix pinning errors (#43)

* Remove date from fields on story-homepage relation * Fix errors * Fix preview after (successful) add or remove
openknowledgebe · Dec 18, 2020 · 4ddfd9e · 4ddfd9e
1 parent f8f7925
commit 4ddfd9e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/cms/previews/Home.jsx b/src/cms/previews/Home.jsx
@@ -26,7 +26,11 @@ const Home = ({ entry, getAsset, fieldsMetaData }) => {
       'activities'
     ]);
 
-    if (activities && activities.size === data.activities.featured_activities.length) {
+    data.activities.featured_activities = [
+      ...new Set(data.activities.featured_activities.filter(Boolean))
+    ];
+
+    if (activities && activities.size >= data.activities.featured_activities.length) {
       data.activities.featured_activities = data.activities.featured_activities.map(activity => {
         const activityData = activities.getIn([activity]).toJS();
         activityData.slug = `${window.location.protocol}//${window.location.host}/activities/${activity}`;
@@ -37,7 +41,10 @@ const Home = ({ entry, getAsset, fieldsMetaData }) => {
 
   if (data.stories?.featured_stories) {
     const stories = fieldsMetaData.getIn(['stories', 'featured_stories', 'story', 'stories']);
-    if (stories && stories.size === data.stories.featured_stories.length) {
+
+    data.stories.featured_stories = [...new Set(data.stories.featured_stories.filter(Boolean))];
+
+    if (stories && stories.size >= data.stories.featured_stories.length) {
       data.stories.featured_stories = data.stories.featured_stories.map(story => {
         const storyData = stories.getIn([story]).toJS();
         storyData.slug = `${window.location.protocol}//${window.location.host}/stories/${story}`;

diff --git a/static/admin/config.yml b/static/admin/config.yml
@@ -196,7 +196,7 @@ collections:
                 allow_add: true
                 add_to_top: true
                 label_singular: 'an activity'
-                summary: '{{field.activity}}'
+                summary: '{{fields.activity}}'
                 field:
                   {
                     label: 'Activity',
@@ -246,16 +246,16 @@ collections:
                 allow_add: true
                 add_to_top: true
                 label_singular: 'a story'
-                summary: '{{field.story}}'
+                summary: '{{fields.story}}'
                 field:
                   {
                     label: 'Story',
                     name: 'story',
                     widget: 'relation',
                     collection: stories,
-                    search_fields: ['title', 'date'],
+                    search_fields: ['title'],
                     value_field: '{{slug}}',
-                    display_fields: ['title', 'date'],
+                    display_fields: ['title'],
                   }
               - label: 'Call to action'
                 name: 'cta'