git_dependencies

app/models/communication/website.rb

@@ -51,47 +51,28 @@ class Communication::Website < ApplicationRecord
     "data/website.yml"
   end
 
-
   def git_dependencies(website)
-    dependencies = (
-      [self, config_permalinks, config_base_url] +
-      pages + pages.map(&:active_storage_blobs).flatten +
-      posts + posts.map(&:active_storage_blobs).flatten +
-      [index_for(:home)] + index_for(:home).active_storage_blobs +
-      [index_for(:communication_posts)] + index_for(:communication_posts).active_storage_blobs +
-      [index_for(:persons)] + index_for(:persons).active_storage_blobs +
-      [index_for(:authors)] + index_for(:authors).active_storage_blobs +
-      people_with_facets + people.map(&:active_storage_blobs).flatten +
-      categories + menus + [about]
-    )
+    dependencies = [self, config_permalinks, config_base_url] + menus
+    dependencies += pages + pages.map(&:active_storage_blobs).flatten
+    dependencies += posts + posts.map(&:active_storage_blobs).flatten if has_communication_posts?
+    dependencies += people_with_facets + people.map(&:active_storage_blobs).flatten if has_people?
+    dependencies += [categories] if has_communication_categories?
+    dependencies += about.git_dependencies
 
-    if about.is_a? Education::School
-      dependencies << index_for(:education_programs)
-      dependencies += index_for(:education_programs).active_storage_blobs
-      dependencies += about.programs
-      dependencies += about.programs.map(&:active_storage_blobs).flatten
-      dependencies << index_for(:administrators)
-      dependencies += index_for(:administrators).active_storage_blobs
-      dependencies << index_for(:teachers)
-      dependencies += index_for(:teachers).active_storage_blobs
-    elsif about.is_a? Research::Journal
-      dependencies << index_for(:research_volumes)
-      dependencies += index_for(:research_volumes).active_storage_blobs
-      dependencies += about.volumes
-      dependencies += about.volumes.map(&:active_storage_blobs).flatten
-      dependencies << index_for(:research_articles)
-      dependencies += index_for(:research_articles).active_storage_blobs
-      dependencies += about.articles
-      dependencies += about.articles.map(&:active_storage_blobs).flatten
-      dependencies << index_for(:researchers)
-      dependencies += index_for(:researchers).active_storage_blobs
-    end
+    # TMP: add index_pages
+    dependencies += [index_for(:home)] + index_for(:home).active_storage_blobs
+    dependencies += [index_for(:communication_posts)] + index_for(:communication_posts).active_storage_blobs if has_communication_posts?
+    dependencies += [index_for(:education_programs)] + index_for(:education_programs).active_storage_blobs if has_education_programs?
+    dependencies += [index_for(:persons)] + index_for(:persons).active_storage_blobs if has_people?
+    dependencies += [index_for(:authors)] + index_for(:authors).active_storage_blobs if has_authors?
+    dependencies += [index_for(:administrators)] + index_for(:administrators).active_storage_blobs if has_administrators?
+    dependencies += [index_for(:teachers)] + index_for(:teachers).active_storage_blobs if has_teachers?
+    dependencies += [index_for(:research_volumes)] + index_for(:research_volumes).active_storage_blobs if has_research_volumes?
+    dependencies += [index_for(:research_articles)] + index_for(:research_articles).active_storage_blobs if has_research_articles?
+    dependencies += [index_for(:researchers)] + index_for(:researchers).active_storage_blobs if has_researchers?
+    # END TMP
 
     dependencies
   end
 
-
-
-
-
 end

app/models/research/journal.rb

@@ -45,9 +45,7 @@ class Research::Journal < ApplicationRecord
     dependencies = [self]
     dependencies += articles + articles.map(&:active_storage_blobs).flatten if has_research_articles?
     dependencies += volumes + volumes.map(&:active_storage_blobs).flatten if has_research_volumes?
-    if has_researchers?
-      dependencies += people + people.map(&:researcher) + people.map(&:active_storage_blobs).flatten
-    end
+    dependencies += people + people.map(&:researcher) + people.map(&:active_storage_blobs).flatten if has_researchers?
     dependencies
   end