Merge branch 'PaperCutSoftware-opt-show-empty-rings' into main

This commit is contained in:
Bastian Ike
2021-01-11 15:50:33 +01:00
2 changed files with 5 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
import React from 'react';
import { translate, rings, Ring } from '../../config';
import { translate, rings, Ring, showEmptyRings } from '../../config';
import Badge from '../Badge/Badge';
import Link from '../Link/Link';
import ItemList from '../ItemList/ItemList';
@@ -7,7 +7,7 @@ import Flag from '../Flag/Flag';
import { Group } from '../../model';
import './quadrant-section.scss';
const renderList = (ringName: Ring, quadrantName: string, groups: Group, big: boolean) => {
const itemsInRing = groups[quadrantName][ringName];
const itemsInRing = groups[quadrantName][ringName] || [];
if (big) {
return (
@@ -37,7 +37,7 @@ const renderList = (ringName: Ring, quadrantName: string, groups: Group, big: bo
};
const renderRing = (ringName: Ring, quadrantName: string, groups: Group, big: boolean) => {
if (!groups[quadrantName] || !groups[quadrantName][ringName] || groups[quadrantName][ringName].length === 0) {
if (!showEmptyRings && (!groups[quadrantName] || !groups[quadrantName][ringName] || groups[quadrantName][ringName].length === 0)) {
return null;
}
return (

View File

@@ -20,14 +20,10 @@ export const rings = [
export type Ring = typeof rings[number]
// todo: fix
export function assetUrl(file: string) {
return process.env.PUBLIC_URL + '/' + file;
// return `/techradar/assets/${file}`
}
export const getItemPageNames = (items: Item[]) => items.map(item => `${item.quadrant}/${item.name}`);
export const showEmptyRings = false;
const messages:{[k: string]: string} = {
'languages-and-frameworks': 'Languages & Frameworks',
'methods-and-patterns': 'Methods & Patterns',