AJR/TechRadarAJR
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use correct name, fixes #77

Browse Source
This commit is contained in:
Bastian Ike
2021-05-28 10:39:21 +02:00
parent 4bde00debf
commit 630e03a92d
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/tasks/radar.js
View File

@@ -41,12 +41,6 @@ const checkAttributes = (fileName, attributes) => {
if (attributes.quadrant && !config_1.quadrants.includes(attributes.quadrant)) {
throw new Error(`Error: ${fileName} has an illegal value for 'quadrant' - must be one of ${config_1.quadrants}`);
}
if (!attributes.quadrant || attributes.quadrant === '') {
// throw new Error(`Error: ${fileName} has no 'quadrant' set`);
}
if (!attributes.title || attributes.title === '') {
attributes.title = path_1.default.basename(fileName);
}
return attributes;
};
const createRevisionsFromFiles = (fileNames) => Promise.all(fileNames.map(fileName => {
@@ -67,9 +61,9 @@ const createRevisionsFromFiles = (fileNames) => Promise.all(fileNames.map(fileNa
});
}));
const itemInfoFromFilename = (fileName) => {
const [release, nameWithSuffix] = fileName.split(path_1.default.sep).slice(-2);
const [release, name] = fileName.split(path_1.default.sep).slice(-2);
return {
name: nameWithSuffix.substr(0, nameWithSuffix.length - 3),
name: path_1.default.basename(name, '.md'),
release,
};
};
@@ -85,7 +79,7 @@ const createItems = (revisions) => {
const itemMap = revisions.reduce((items, revision) => {
return Object.assign(Object.assign({}, items), { [revision.name]: addRevisionToItem(items[revision.name], revision) });
}, {});
return Object.values(itemMap).sort((x, y) => (x.name > y.name ? 1 : -1));
return Object.values(itemMap).map(item => (Object.assign(Object.assign({}, item), { ['title']: item.title || item.name }))).sort((x, y) => (x.name > y.name ? 1 : -1));
};
const ignoreEmptyRevisionBody = (revision, item) => {
if (!revision.body || revision.body.trim() === '') {

14
tasks/radar.ts
View File

@@ -35,14 +35,6 @@ const checkAttributes = (fileName: string, attributes: FMAttributes) => {
throw new Error(`Error: ${fileName} has an illegal value for 'quadrant' - must be one of ${quadrants}`);
}
if (!attributes.quadrant || attributes.quadrant === '') {
// throw new Error(`Error: ${fileName} has no 'quadrant' set`);
}
if (!attributes.title || attributes.title === '') {
attributes.title = path.basename(fileName);
}
return attributes
};
@@ -76,9 +68,9 @@ const createRevisionsFromFiles = (fileNames: string[]) =>
);
const itemInfoFromFilename = (fileName: string) => {
const [release, nameWithSuffix] = fileName.split(path.sep).slice(-2);
const [release, name] = fileName.split(path.sep).slice(-2);
return {
name: nameWithSuffix.substr(0, nameWithSuffix.length - 3),
name: path.basename(name, '.md'),
release,
};
};
@@ -101,7 +93,7 @@ const createItems = (revisions: Revision[]) => {
};
}, {});
return Object.values(itemMap).sort((x, y) => (x.name > y.name ? 1 : -1));
return Object.values(itemMap).map(item => ({...item, ['title']: item.title || item.name})).sort((x, y) => (x.name > y.name ? 1 : -1));
};
const ignoreEmptyRevisionBody = (revision: Revision, item: Item) => {