Add Akka-Streams to Assess

common/model.js

@@ -1,43 +1,50 @@
+export const featuredOnly = items => items.filter(item => item.isFeatured);
 
-export const groupByQuadrants = (items) => (
+export const groupByQuadrants = items =>
-  items.reduce((quadrants, item) => ({
+  items.reduce(
+    (quadrants, item) => ({
       ...quadrants,
       [item.quadrant]: addItemToQuadrant(quadrants[item.quadrant], item),
-  }), {})
+    }),
-);
+    {},
+  );
 
-export const groupByRing = (items) => (
+export const groupByRing = items =>
-  items.reduce((rings, item) => ({
+  items.reduce(
+    (rings, item) => ({
       ...rings,
       [item.ring]: addItemToList(rings[item.ring], item),
-  }), {})
+    }),
-);
+    {},
+  );
 
-export const groupByFirstLetter = (items) => {
+export const groupByFirstLetter = items => {
-  const index = items.reduce((letterIndex, item) => ({
+  const index = items.reduce(
+    (letterIndex, item) => ({
       ...letterIndex,
-    [getFirstLetter(item)]: addItemToList(letterIndex[getFirstLetter(item)], item),
+      [getFirstLetter(item)]: addItemToList(
-  }), {});
+        letterIndex[getFirstLetter(item)],
+        item,
+      ),
+    }),
+    {},
+  );
 
-  return Object.keys(index).sort().map((letter) => ({
+  return Object.keys(index)
+    .sort()
+    .map(letter => ({
       letter,
       items: index[letter],
     }));
-}
+};
 
 const addItemToQuadrant = (quadrant = {}, item) => ({
   ...quadrant,
   [item.ring]: addItemToRing(quadrant[item.ring], item),
 });
 
-const addItemToList = (list = [], item) => ([
+const addItemToList = (list = [], item) => [...list, item];
-  ...list,
-  item,
-]);
 
-const addItemToRing = (ring = [], item) => ([
+const addItemToRing = (ring = [], item) => [...ring, item];
-  ...ring,
-  item,
-]);
 
-export const getFirstLetter = (item) => item.title.substr(0,1).toUpperCase();
+export const getFirstLetter = item => item.title.substr(0, 1).toUpperCase();

common/radar.js

@@ -3,17 +3,14 @@ import path from 'path';
 import frontmatter from 'front-matter';
 import marked from 'marked';
 import hljs from 'highlight.js';
-import {
+import { radarPath, getAllMarkdownFiles } from './file';
-  radarPath,
-  getAllMarkdownFiles,
-} from './file';
 
 marked.setOptions({
-  highlight: (code) => hljs.highlightAuto(code).value,
+  highlight: code => hljs.highlightAuto(code).value,
 });
 
-export const createRadar = async (tree) => {
+export const createRadar = async tree => {
-  const fileNames = (await getAllMarkdownFiles(radarPath()));
+  const fileNames = await getAllMarkdownFiles(radarPath());
   const revisions = await createRevisionsFromFiles(fileNames);
   const allReleases = getAllReleases(revisions);
   const items = createItems(revisions);
@@ -28,83 +25,80 @@ export const createRadar = async (tree) => {
 const checkAttributes = (fileName, attributes) => {
   const rings = ['adopt', 'trial', 'assess', 'hold'];
   if (attributes.ring && !rings.includes(attributes.ring)) {
-    throw new Error(`Error: ${fileName} has an illegal value for 'ring' - must be one of ${rings}`);
+    throw new Error(
+      `Error: ${fileName} has an illegal value for 'ring' - must be one of ${rings}`,
+    );
   }
 
-  const quadrants = ['languages-and-frameworks', 'methods-and-patterns', 'platforms-and-aoe-services', 'tools'];
+  const quadrants = [
+    'languages-and-frameworks',
+    'methods-and-patterns',
+    'platforms-and-aoe-services',
+    'tools',
+  ];
   if (attributes.quadrant && !quadrants.includes(attributes.quadrant)) {
-    throw new Error(`Error: ${fileName} has an illegal value for 'quadrant' - must be one of ${quadrants}`);
+    throw new Error(
+      `Error: ${fileName} has an illegal value for 'quadrant' - must be one of ${quadrants}`,
+    );
   }
 };
 
-const createRevisionsFromFiles = (fileNames) => (
+const createRevisionsFromFiles = fileNames =>
-  Promise.all(fileNames.map((fileName) => {
+  Promise.all(
+    fileNames.map(fileName => {
       return new Promise((resolve, reject) => {
         readFile(fileName, 'utf8', (err, data) => {
-        if(err) {
+          if (err) {
             reject(err);
           } else {
             const fm = frontmatter(data);
             // prepend subfolder to links
-          fm.body = fm.body.replace(/\]\(\//g, '](/techradar/')
+            fm.body = fm.body.replace(/\]\(\//g, '](/techradar/');
 
             // add target attribute to external links
             let html = marked(fm.body);
-          html = html.replace(/a href="http/g, 'a target="_blank" href="http')
+            html = html.replace(
+              /a href="http/g,
+              'a target="_blank" href="http',
+            );
 
             checkAttributes(fileName, fm.attributes);
             resolve({
               ...itemInfoFromFilename(fileName),
               ...fm.attributes,
               fileName,
-            body: html
+              body: html,
             });
           }
         });
-    })
+      });
-  }))
+    }),
-);
+  );
 
-const itemInfoFromFilename = (fileName) => {
+const itemInfoFromFilename = fileName => {
-  const [
+  const [release, nameWithSuffix] = fileName.split(path.sep).slice(-2);
-    release,
-    nameWithSuffix,
-  ] = fileName.split(path.sep).slice(-2);
   return {
     name: nameWithSuffix.substr(0, nameWithSuffix.length - 3),
     release,
-  }
+  };
 };
 
-const getAllReleases = (revisions) => (
+const getAllReleases = revisions =>
-  revisions.reduce((allReleases, { release }) => {
+  revisions
-    if(!allReleases.includes(release)) {
+    .reduce((allReleases, { release }) => {
+      if (!allReleases.includes(release)) {
         return [...allReleases, release];
       }
       return allReleases;
-  }, []).sort()
+    }, [])
-);
+    .sort();
-
-// const createQuadrants = (revisions) => (
-//   revisions.reduce((quadrants, revision) => {
-//     return {
-//       ...quadrants,
-//       [revision.quadrant]: addRevisionToQuadrant(quadrants[revision.quadrant], revision),
-//     };
-//   }, {})
-// );
-
-// const addRevisionToQuadrant = (quadrant = {}, revision) => ({
-//   ...quadrant,
-//   [revision.name]: addRevisionToItem(quadrant[revision.name], revision),
-// });
 
 const addRevisionToQuadrant = (quadrant = {}, revision) => ({
   ...quadrant,
   [revision.ring]: addRevisionToRing(quadrant[revision.ring], revision),
 });
 
-const createItems = (revisions) => {
+const createItems = revisions => {
   const itemMap = revisions.reduce((items, revision) => {
     return {
       ...items,
@@ -112,21 +106,18 @@ const createItems = (revisions) => {
     };
   }, {});
 
-  return Object
+  return Object.values(itemMap).sort((x, y) => (x.name > y.name ? 1 : -1));
-    .values(itemMap)
-    .sort((x, y) => (x.name > y.name ? 1 : -1));
 };
 
-const addRevisionToItem = (item = {
+const addRevisionToItem = (
-  attributes: {
+  item = {
+    isNew: false,
     isFeatured: true,
-  },
     revisions: [],
-}, revision) => {
+  },
-  const {
+  revision,
-    fileName,
+) => {
-    ...rest,
+  const { fileName, ...rest } = revision;
-  } = revision;
   let newItem = {
     ...item,
     ...rest,
@@ -139,28 +130,29 @@ const addRevisionToItem = (item = {
   if (revisionCreatesNewHistoryEntry(revision)) {
     newItem = {
       ...newItem,
-      revisions: [
+      revisions: [rest, ...newItem.revisions],
-        rest,
+    };
-        ...newItem.revisions,
-      ],
-    }
   }
 
   return newItem;
 };
 
-const revisionCreatesNewHistoryEntry = (revision) => {
+const revisionCreatesNewHistoryEntry = revision => {
-  return revision.body.trim() !== '' ||
+  return revision.body.trim() !== '' || typeof revision.ring !== 'undefined';
-         typeof revision.ring !== 'undefined';
 };
 
-const flagWithIsNew = (items, allReleases) => (
+const flagWithIsNew = (items, allReleases) =>
-  items.map((item) => ({
+  items.map(
+    item => ({
       ...item,
       isNew: isNewItem(item, allReleases),
-  }), [])
+    }),
-);
+    [],
+  );
 
 const isNewItem = (item, allReleases) => {
-  return item.revisions.length > 1 && item.revisions[0].release === allReleases[allReleases.length-1]
+  return (
+    item.revisions.length === 0 ||
+    item.revisions[0].release === allReleases[allReleases.length - 1]
+  );
 };

js/components/PageIndex.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { formatRelease } from '../date';
 
+import { featuredOnly } from '../../common/model';
 import HeroHeadline from './HeroHeadline';
 import QuadrantGrid from './QuadrantGrid';
 import Fadeable from './Fadeable';
@@ -22,7 +23,7 @@ export default function PageIndex({
           AOE Technology Radar
         </HeroHeadline>
       </div>
-      <QuadrantGrid items={items} />
+      <QuadrantGrid items={featuredOnly(items)} />
     </Fadeable>
   );
 }

radar/2017-09-01/react.md

@@ -1,5 +0,0 @@
----
-ring:       adopt
----
-
-TODO: Updated text here!

radar/2017-10-01/akka-streams.md

@@ -31,4 +31,3 @@ more complex services with it.
 We will continue looking into it together with the
 [Alpakka](/languages-and-frameworks/alpakka.html) Connectors for integration
 work.
-