Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@quintype/components",
"version": "2.29.0",
"version": "2.29.1-collectionToStories.0",
"description": "Components to help build Quintype Node.js apps",
"main": "dist/cjs/index.js",
"module": "dist/es/index.js",
Expand Down
119 changes: 76 additions & 43 deletions src/components/wrap-collection-layout.js
Original file line number Diff line number Diff line change
@@ -1,39 +1,51 @@
import React from 'react';
import {connect} from 'react-redux';
import React from "react";
import { connect } from "react-redux";
import get from "lodash/get";

import { LoadMoreCollectionStories } from './load-more-collection-stories';
import { LazyLoadImages } from './lazy-load-images';
import { ClientSideOnly } from './client-side-only';

function loadMoreWrapper(Component, data, enableLoadMoreButton, slug, numStoriesToLoad) {
return !enableLoadMoreButton ?
React.createElement(Component, data) :
React.createElement(LoadMoreCollectionStories, {
template: Component,
collectionSlug: slug,
params: { 'item-type': 'story' },
data: data,
numStoriesToLoad,
});
import { LoadMoreCollectionStories } from "./load-more-collection-stories";
import { LazyLoadImages } from "./lazy-load-images";
import { ClientSideOnly } from "./client-side-only";

function loadMoreWrapper(
Component,
data,
enableLoadMoreButton,
slug,
numStoriesToLoad
) {
return !enableLoadMoreButton
? React.createElement(Component, data)
: React.createElement(LoadMoreCollectionStories, {
template: Component,
collectionSlug: slug,
params: { "item-type": "story" },
data: data,
numStoriesToLoad,
});
}

function lazyLoadWrapper(component, {lazy_load_images: lazyLoadImages = false}) {
return !lazyLoadImages ?
component :
React.createElement(LazyLoadImages, {}, component);
function lazyLoadWrapper(
component,
{ lazy_load_images: lazyLoadImages = false }
) {
return !lazyLoadImages
? component
: React.createElement(LazyLoadImages, {}, component);
}

function clientSideLoadWrapper(component, {client_side_only: clientSideOnly = false}) {
return !clientSideOnly ?
component :
React.createElement(ClientSideOnly, {}, component);
function clientSideLoadWrapper(
component,
{ client_side_only: clientSideOnly = false }
) {
return !clientSideOnly
? component
: React.createElement(ClientSideOnly, {}, component);
}

function WrapCollectionComponent(Component) {
return function(props) {
return function (props) {
if (!props.collection) {
return <div></div>
return <div></div>;
}

const associatedMetadata = props.collection["associated-metadata"] || {};
Expand All @@ -47,10 +59,20 @@ function WrapCollectionComponent(Component) {
associatedMetadata: associatedMetadata,
});

const component = loadMoreWrapper(Component, data, associatedMetadata.enable_load_more_button, props.collection.slug, associatedMetadata.subsequent_stories_load_count || 10);
const component = loadMoreWrapper(
Component,
data,
associatedMetadata.enable_load_more_button,
props.collection.slug,
associatedMetadata.subsequent_stories_load_count || 10
);

return [clientSideLoadWrapper, lazyLoadWrapper].reduce((accumulator, currentElement) => currentElement(accumulator, associatedMetadata), component);
}
return [clientSideLoadWrapper, lazyLoadWrapper].reduce(
(accumulator, currentElement) =>
currentElement(accumulator, associatedMetadata),
component
);
};
}

/**
Expand All @@ -71,42 +93,53 @@ function WrapCollectionComponent(Component) {
* @returns {Component} A component which can be passed collection
*/
export function wrapCollectionLayout(component) {
const wrappedComponent = connect((state) => ({config: state.qt.config}))(WrapCollectionComponent(component));
if(component.storyLimit) {
const wrappedComponent = connect((state) => ({ config: state.qt.config }))(
WrapCollectionComponent(component)
);
if (component.storyLimit) {
wrappedComponent.storyLimit = component.storyLimit;
}

if(component.nestedCollectionLimit) {
if (component.nestedCollectionLimit) {
wrappedComponent.nestedCollectionLimit = component.nestedCollectionLimit;
}

return wrappedComponent;
}

/**
* Use this function to get the stories from a collection object
* returns null if collection doesn't have items key
*
* @param {Collection} collection
* @category Collection Page
* @returns {Array} An array of stories
*/
export function collectionToStories(collection) {
if (!collection.items) return null;
return collection.items
.filter(item => item.type === 'story')
.map(item => replaceWithAlternates(item.story));
.filter((item) => item.type === "story")
.map((item) => replaceWithAlternates(item.story));
}

function replaceWithAlternates(story) {
const alternates = get(story, ["alternative", "home", "default"]);

if(!alternates)
return story;
if (!alternates) return story;

return Object.assign({}, story, {
headline : alternates.headline || story.headline,
"hero-image-s3-key" : alternates["hero-image"] ? alternates["hero-image"]["hero-image-s3-key"] : story["hero-image-s3-key"],
"hero-image-metadata" : alternates["hero-image"] ? alternates["hero-image"]["hero-image-metadata"] : story["hero-image-metadata"],
"hero-image-caption" : alternates["hero-image"] ? alternates["hero-image"]["hero-image-caption"] : story["hero-image-caption"],
"hero-image-attribution" : alternates["hero-image"] ? alternates["hero-image"]["hero-image-attribution"] : story["hero-image-attribution"],
})
headline: alternates.headline || story.headline,
"hero-image-s3-key": alternates["hero-image"]
? alternates["hero-image"]["hero-image-s3-key"]
: story["hero-image-s3-key"],
"hero-image-metadata": alternates["hero-image"]
? alternates["hero-image"]["hero-image-metadata"]
: story["hero-image-metadata"],
"hero-image-caption": alternates["hero-image"]
? alternates["hero-image"]["hero-image-caption"]
: story["hero-image-caption"],
"hero-image-attribution": alternates["hero-image"]
? alternates["hero-image"]["hero-image-attribution"]
: story["hero-image-attribution"],
});
}