Skip to content

Commit 543558a

Browse files
committed
fix(viewall): fix viewall generation
courtesy @julrich
1 parent 437680a commit 543558a

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

packages/core/src/lib/ui_builder.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -558,20 +558,26 @@ const ui_builder = function() {
558558
const allPatternTypePromises = _.map(
559559
styleguidePatterns.patternGroups,
560560
(patternGroup, patternType) => {
561-
let p;
562561
let typePatterns = [];
563562
let styleguideTypePatterns = [];
564563
const styleGuideExcludes =
565564
patternlab.config.styleGuideExcludes ||
566565
patternlab.config.styleguideExcludes;
567-
568566
const subTypePromises = _.map(
569567
_.values(patternGroup),
570-
(patternSubtypes, patternSubtype) => {
571-
const patternPartial = patternType + '-' + patternSubtype;
568+
(patternSubtypes, patternSubtype, originalPatternGroup) => {
569+
let p;
570+
const samplePattern = _.find(patternSubtypes, st => {
571+
return !st.patternPartial.startsWith('viewall-');
572+
});
573+
const patternName = Object.keys(
574+
_.values(originalPatternGroup)[patternSubtype]
575+
)[1];
576+
const patternPartial =
577+
patternType + '-' + samplePattern.patternSubType;
572578

573579
//do not create a viewall page for flat patterns
574-
if (patternType === patternSubtype) {
580+
if (patternType === patternName) {
575581
writeViewAllFile = false;
576582
logger.debug(
577583
`skipping ${patternType} as flat patterns do not have view all pages`
@@ -595,11 +601,11 @@ const ui_builder = function() {
595601
styleGuideExcludes &&
596602
styleGuideExcludes.length &&
597603
_.some(styleGuideExcludes, function(exclude) {
598-
return exclude === patternType + '/' + patternSubtype;
604+
return exclude === patternType + '/' + patternName;
599605
});
600606
if (omitPatternType) {
601607
logger.debug(
602-
`Omitting ${patternType}/${patternSubtype} from building a viewall page because its patternSubGroup is specified in styleguideExcludes.`
608+
`Omitting ${patternType}/${patternName} from building a viewall page because its patternSubGroup is specified in styleguideExcludes.`
603609
);
604610
} else {
605611
styleguideTypePatterns = styleguideTypePatterns.concat(

0 commit comments

Comments
 (0)