Skip to content

updated output to include commercial timeperiod and a "< X" line as well #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joeeames wants to merge 2 commits into
base: main
Choose a base branch
from
Open

updated output to include commercial timeperiod and a "< X" line as well #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b94cc58
updated output to include commercial
joeeames Sep 23, 2024
4f800e9
Update lib/index.js to increase contrast and match theme colors
joeeames Nov 5, 2024
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
39 changes: 32 additions & 7 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ const styles = `
.current {
fill: #5fa04e;
}
.commercial {
fill: #ae5f00;
}
.active {
fill: #229ad6;
}
Expand Down Expand Up @@ -38,11 +41,11 @@ const styles = `
text-transform: uppercase;
}`;


///
function parseInput (data, queryStart, queryEnd, excludeMaster, projectName) {
const output = [];

Object.keys(data).forEach((v) => {
Object.keys(data).reverse().forEach((v) => {
const version = data[v];
const name = `${projectName} ${v.replace('v', '')}`;
const current = version.start ? new Date(version.start) : null;
Expand All @@ -58,6 +61,12 @@ function parseInput (data, queryStart, queryEnd, excludeMaster, projectName) {
throw new Error(`missing end in ${version}`);
}

if (active !== null) {
if (maint < queryEnd && end > queryStart) {
output.push({ name, type: 'commercial', start: end, end: queryEnd });
}
}

if (maint !== null) {
if (maint < queryEnd && end > queryStart) {
output.push({ name, type: 'maintenance', start: maint, end });
Expand All @@ -80,18 +89,34 @@ function parseInput (data, queryStart, queryEnd, excludeMaster, projectName) {
});

if (!excludeMaster) {
AddFullLineToTop(output, 'Main', 'unstable',);
}

AddFullLineToBottom(output, '<= v16', 'commercial');
Copy link
Member

@richardlau richardlau Oct 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is Node.js specific (and time sensitive) and should not be encoded into the tooling.

Copy link
Author

@joeeames joeeames Oct 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh. the tool should stay completely technology agnostic? Honestly I had no idea it wasn't just for Node. Got it. ok, I'll have to do some rework.


return output;

function AddFullLineToTop(output, name, type) {
output.unshift({
name: 'Master',
type: 'unstable',
name: name,
type: type,
start: queryStart,
end: queryEnd
});
}
function AddFullLineToBottom(output, name, type, start, end) {
output.push({
name: name,
type: type,
start: queryStart,
end: queryEnd
});
}

return output;
}




function create (options) {
const { queryStart, queryEnd, html, svg: svgFile, png, animate, excludeMaster, projectName, margin: marginInput } = options;
const data = parseInput(options.data, queryStart, queryEnd, excludeMaster, projectName);
Expand All @@ -103,6 +128,7 @@ function create (options) {
.domain([queryStart, queryEnd])
.range([0, width])
.clamp(true);
// console.log(data.map((data) => { return data.type; }));
const yScale = D3.scaleBand()
.domain(data.map((data) => { return data.name; }))
.range([0, height])
Expand All @@ -118,7 +144,6 @@ function create (options) {
.attr('id', 'bar-container')
.attr('transform', `translate(${margin.left}, ${margin.top})`);


function calculateWidth (data) {
return xScale(data.end) - xScale(data.start);
}
Expand Down