Merge pull request #435 from 30-seconds/collection-parents

Resolves #377

Author: Chalarangelo

src/blocks/application.js

@@ -420,30 +420,20 @@ export class Application {
         lastUpdated: new Date(lastUpdated),
       });
     });
-    // Populate collections and link to snippets
-    collections.forEach(collection => {
-      const { snippetIds, typeMatcher, ...rest } = collection;
-      const collectionRec = Collection.createRecord(rest);
-      if (snippetIds && snippetIds.length) collectionRec.snippets = snippetIds;
-      if (typeMatcher)
-        collectionRec.snippets = Snippet.records
-          .where(snippet => snippet.type === typeMatcher)
-          .flatPluck('id');
-    });
     // Populate listings and create relationships
     Repository.records.forEach(repo => {
       const type = repo.isBlog ? 'blog' : 'language';
       const slugPrefix = `/${repo.slug}`;
       const repoListingId = `${type}${slugPrefix}`;
-      const repoListing = Listing.createRecord({
+      Listing.createRecord({
         id: repoListingId,
         relatedRecordId: repo.id,
         type,
         slugPrefix,
         featuredIndex: featuredListings.indexOf(repoListingId),
       });
       // Populate tag listings from repositories
-      const tagListingIds = repo.tags.flatMap(tag => {
+      repo.tags.forEach(tag => {
         const tagSlugPrefix = tag.slugPrefix;
         const tagId = `tag${tagSlugPrefix}`;
         Listing.createRecord({
@@ -452,10 +442,29 @@ export class Application {
           type: 'tag',
           slugPrefix: tagSlugPrefix,
           featuredIndex: featuredListings.indexOf(tagId),
+          parent: repoListingId,
         });
-        return tagId;
       });
-      repoListing.children = tagListingIds;
+    });
+    // Populate collections, collection listings and link to snippets and parent listings
+    collections.forEach(collection => {
+      const { snippetIds, typeMatcher, parent, ...rest } = collection;
+      const collectionRec = Collection.createRecord(rest);
+      if (snippetIds && snippetIds.length) collectionRec.snippets = snippetIds;
+      if (typeMatcher)
+        collectionRec.snippets = Snippet.records
+          .where(snippet => snippet.type === typeMatcher)
+          .flatPluck('id');
+      const slugPrefix = `/${collection.slug}`;
+      const listingId = `collection${slugPrefix}`;
+      Listing.createRecord({
+        id: listingId,
+        relatedRecordId: collection.id,
+        type: 'collection',
+        slugPrefix,
+        featuredIndex: featuredListings.indexOf(listingId),
+        parent,
+      });
     });
     // Populate the main listing
     Listing.createRecord({
@@ -473,18 +482,6 @@ export class Application {
       featuredIndex: -1,
       ...collectionListingConfig,
     });
-    // Populate listings for custom collections
-    Collection.records.forEach(collection => {
-      const slugPrefix = `/${collection.slug}`;
-      const listingId = `collection${slugPrefix}`;
-      Listing.createRecord({
-        id: listingId,
-        relatedRecordId: collection.id,
-        type: 'collection',
-        slugPrefix,
-        featuredIndex: featuredListings.indexOf(listingId),
-      });
-    });
     // Populate snipet pages
     Snippet.records.forEach(snippet => {
       const { id } = snippet;

src/blocks/models/collection.js

@@ -2,6 +2,7 @@ export const collection = {
   name: 'Collection',
   fields: [
     { name: 'name', type: 'stringRequired' },
+    { name: 'shortName', type: 'stringRequired' },
     { name: 'slug', type: 'stringRequired' },
     { name: 'featured', type: 'booleanRequired' },
     { name: 'icon', type: 'stringRequired' },

src/blocks/models/listing.js

@@ -187,7 +187,7 @@ export const listing = {
       return [];
     },
     sublinks: ({ models: { Listing } }) => listing => {
-      if (listing.isCollection) return [];
+      if (listing.isCollection && !listing.parent) return [];
       if (listing.isCollections) return [];
       if (listing.isMain) {
         return [
@@ -212,11 +212,22 @@ export const listing = {
           url: `${listing.rootUrl}/p/1`,
           selected: listing.isParent,
         },
-        ...links.flatMap(link => ({
-          name: literals.tag(link.data.shortId),
-          url: `${link.data.slugPrefix}/p/1`,
-          selected: listing.isTag && listing.data.shortId === link.data.shortId,
-        })),
+        ...links
+          .flatMap(link =>
+            link.isCollection
+              ? {
+                  name: link.data.shortName,
+                  url: `/${link.data.slug}/p/1`,
+                  selected: listing.isCollection && link.id === listing.id,
+                }
+              : {
+                  name: literals.tag(link.data.shortId),
+                  url: `${link.data.slugPrefix}/p/1`,
+                  selected:
+                    listing.isTag && listing.data.shortId === link.data.shortId,
+                }
+          )
+          .sort((a, b) => a.name.localeCompare(b.name)),
       ];
     },
   },

src/blocks/models/snippet.js

@@ -152,6 +152,15 @@ export const snippet = {
           }/t/${snippet.primaryTag.toLowerCase()}/p/1`,
           name: literals.tag(snippet.primaryTag),
         };
+      } else if (
+        snippet.hasCollection &&
+        snippet.collections.first.listing.parent
+      ) {
+        // TODO: Make this smarter to account for multiple collections
+        tagCrumb = {
+          url: `/${snippet.collections.first.slug}/p/1`,
+          name: snippet.collections.first.shortName,
+        };
       } else if (
         snippet.language &&
         snippet.truePrimaryTag &&
@@ -220,7 +229,9 @@ export const snippet = {
     hasCollection: snippet =>
       Boolean(snippet.collections && snippet.collections.length),
     recommendedCollection: snippet =>
-      snippet.hasCollection ? snippet.collections.first : null,
+      snippet.hasCollection && !snippet.collections.first.listing.parent
+        ? snippet.collections.first
+        : null,
   },
   lazyProperties: {
     icon: ({ models: { Language } }) => snippet => {

src/blocks/schema.js

@@ -32,9 +32,9 @@ export const schema = {
       type: 'manyToOne',
     },
     {
-      from: { model: 'Listing', name: 'children' },
-      to: { model: 'Listing', name: 'parent' },
-      type: 'oneToMany',
+      from: { model: 'Listing', name: 'parent' },
+      to: { model: 'Listing', name: 'children' },
+      type: 'manyToOne',
     },
     {
       from: { model: 'Page', name: 'snippets' },