gallery vs carousel

1 files changed, 8 insertions, 5 deletions

diff --git a/animism-align/frontend/app/views/viewer/viewer.actions.js b/animism-align/frontend/app/views/viewer/viewer.actions.js
index ae2bf5b..6efe644 100644
--- a/animism-align/frontend/app/views/viewer/viewer.actions.js
+++ b/animism-align/frontend/app/views/viewer/viewer.actions.js
@@ -34,6 +34,7 @@ export const loadSections = () => dispatch => {
 
   // dedupe the labels that we see in each section
   let currentMediaLabels = {}
+  let seenMedia = {}
 
   // keep track of all annotations that constitute the "text" of the essay
   // these include sentences, headings, and inline media. used to build paragraphs, then reset.
@@ -58,7 +59,7 @@ export const loadSections = () => dispatch => {
     if (annotation.type === 'section_heading') {
       // finish off the previous section.
       if (currentSection) {
-        currentSection.mediaLabels = Object.keys(currentMediaLabels).join(', ')
+        currentSection.mediaLabels = Object.keys(currentMediaLabels).sort().join(', ')
         currentSection.paragraphs = buildParagraphs(sectionTextAnnotationOrder, currentSection.index)
         currentSection.end_ts = currentSection.paragraphs[currentSection.paragraphs.length - 1].end_ts
       }
@@ -80,16 +81,18 @@ export const loadSections = () => dispatch => {
     if (MEDIA_ANNOTATION_TYPES.has(annotation.type)) {
       // fetch the media and add it to the list of media (TODO: handle carousels)
       const media = mediaLookup[annotation.settings.media_id]
-      if (!media.settings.hide_in_bibliography) {
+      if (!media.settings.hide_in_bibliography && !(media.id in seenMedia)) {
         currentSection.media.push({
           start_ts: annotation.start_ts,
           media
         })
+        seenMedia[media.id] = true
       }
 
       // get the display string for this media type
-      if (media.type in MEDIA_LABEL_TYPES) {
-        currentMediaLabels[MEDIA_LABEL_TYPES[media.type]] = true
+      // console.log(annotation.type, media.type)
+      if (annotation.type in MEDIA_LABEL_TYPES) {
+        currentMediaLabels[MEDIA_LABEL_TYPES[annotation.type]] = true
       }
 
       // increment the media tally
@@ -120,7 +123,7 @@ export const loadSections = () => dispatch => {
 
   // finished processing all annotations. finish off the last section.
   if (currentSection) {
-    currentSection.mediaLabels = Object.keys(currentMediaLabels).join(', ')
+    currentSection.mediaLabels = Object.keys(currentMediaLabels).sort().join(', ')
     currentSection.paragraphs = buildParagraphs(sectionTextAnnotationOrder, currentSection.index)
     currentSection.end_ts = timeline.duration
   }