Skip to content

Recent Changes for Azure DevOps Extension #5

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
BogdanBrat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Recent Changes for Azure DevOps Extension #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file renamed ...irEvo-EvoLabs.HarvestWidgets-1.0.121.vsix → .../EirEvo-EvoLabs.HarvestWidgets-1.1.9.vsix
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions Harvest Billing Widget/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

163 changes: 115 additions & 48 deletions Harvest Billing Widget/scripts/widget-configuration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
document.addEventListener("DOMContentLoaded", function() {
document.addEventListener("DOMContentLoaded", function () {
VSS.init({
explicitNotifyLoaded: true,
usePlatformStyles: true
Expand All @@ -19,6 +19,13 @@ document.addEventListener("DOMContentLoaded", function() {
var $internalColor = document.getElementById("internalColor");
var $rndColor = document.getElementById("rndColor");
var $timePeriod = document.getElementById("timePeriod"); // Time Period Field
var $theme = document.getElementById("themeSelector"); // Theme Selection Field
var $productSupportFilter = document.getElementById("productSupportFilter");
var $productSupportLabel = document.getElementById("productSupportLabel");
var $productSupportColor = document.getElementById("productSupportColor"); // Product Support Filter Field
var $unbilledFilter = document.getElementById("unbilledFilter");
var $unbilledLabel = document.getElementById("unbilledLabel");
var $unbilledColor = document.getElementById("unbilledColor");

function validateField(field) {
if (field) {
Expand All @@ -32,58 +39,108 @@ document.addEventListener("DOMContentLoaded", function() {
}

function notifyConfigurationChange(context) {
var customSettings = {
data: JSON.stringify({
harvestAccountId: $harvestAccountId ? $harvestAccountId.value.trim() : "",
authToken: $authToken ? $authToken.value.trim() : "",
rndFilter: $rndFilter ? $rndFilter.value.trim() : "R&D", // R&D Filter
displayMode: $displayMode ? $displayMode.value : "",
billableLabel: $billableLabel ? $billableLabel.value.trim() : "Billable",
internalLabel: $internalLabel ? $internalLabel.value.trim() : "Internal",
rndLabel: $rndLabel ? $rndLabel.value.trim() : "R&D", // R&D Label
billableColor: $billableColor ? $billableColor.value : "#852d9d",
internalColor: $internalColor ? $internalColor.value : "#ec0bb7",
rndColor: $rndColor ? $rndColor.value : "#76f5ff",
timePeriod: $timePeriod ? $timePeriod.value : "7" // Time Period
})
};

console.log('Custom Settings:', customSettings); // Debugging output

if (context && typeof context.notify === 'function') {
context.notify(WidgetHelpers.WidgetEvent.ConfigurationChange, WidgetHelpers.WidgetEvent.Args(customSettings));
try {
var customSettings = {
data: JSON.stringify({
harvestAccountId: $harvestAccountId ? $harvestAccountId.value.trim() : "",
authToken: $authToken ? $authToken.value.trim() : "",
rndFilter: $rndFilter ? $rndFilter.value.trim() : "R&D", // R&D Filter
displayMode: $displayMode ? $displayMode.value : "",
billableLabel: $billableLabel ? $billableLabel.value.trim() : "Billable",
internalLabel: $internalLabel ? $internalLabel.value.trim() : "Internal",
rndLabel: $rndLabel ? $rndLabel.value.trim() : "R&D", // R&D Label
billableColor: $billableColor ? $billableColor.value : "#852d9d",
internalColor: $internalColor ? $internalColor.value : "#ec0bb7",
rndColor: $rndColor ? $rndColor.value : "#76f5ff",
timePeriod: $timePeriod ? $timePeriod.value : "7", // Time Period
theme: $theme ? $theme.value : "light", // Theme Selection
productSupportLabel: $productSupportLabel ? $productSupportLabel.value.trim() : "Product",
productSupportFilter: $productSupportFilter ? $productSupportFilter.value.trim() : "PRODUCT_SUPPORT",
productSupportColor: $productSupportColor ? $productSupportColor.value : "#FFD700",
unbilledFilter: $unbilledFilter ? $unbilledFilter.value.trim() : "Unbilled",
unbilledLabel: $unbilledLabel ? $unbilledLabel.value.trim() : "Unbilled",
unbilledColor: $unbilledColor ? $unbilledColor.value : "#27CA12"

})
};

console.log("Custom Settings for Notify:", customSettings);

if (context && typeof context.notify === "function") {
context.notify(WidgetHelpers.WidgetEvent.ConfigurationChange, WidgetHelpers.WidgetEvent.Args(customSettings));
} else {
console.error("Configuration context does not support notify.");
}
} catch (error) {
console.error("Error in notifyConfigurationChange:", error);
}
}

function applyTheme(theme) {
const bodyElement = document.body;
const widgetElement = document.querySelector(".widget");

if (!bodyElement) {
console.error("Body element is not found.");
return;
}

bodyElement.classList.remove("light-theme", "dark-theme");

if (theme === "dark") {
bodyElement.classList.add("dark-theme");
} else {
console.error("Configuration context does not support notify.");
bodyElement.classList.add("light-theme");
}

if (widgetElement) {
widgetElement.classList.remove("light-theme", "dark-theme");
widgetElement.classList.add(`${theme}-theme`);
} else {
console.error("Widget element not found.");
}
}

function bindEvents(context) {
var fields = [
$harvestAccountId,
$authToken,
$rndFilter, // R&D Filter
$displayMode,
$billableLabel,
$internalLabel,
$rndLabel, // R&D Label
$billableColor,
$internalColor,
const fields = [
$harvestAccountId,
$authToken,
$rndFilter,
$displayMode,
$billableLabel,
$internalLabel,
$rndLabel,
$billableColor,
$internalColor,
$rndColor,
$timePeriod // Time Period
$timePeriod,
$productSupportLabel,
$productSupportFilter,
$productSupportColor,
$unbilledLabel,
$unbilledFilter,
$unbilledColor,
];

fields.forEach(function(field) {
fields.forEach(function (field) {
if (field) {
field.addEventListener("input", function() {
field.addEventListener("input", function () {
validateField(field);
notifyConfigurationChange(context);
});
}
});

if ($theme) {
$theme.addEventListener("change", function () {
applyTheme($theme.value);
notifyConfigurationChange(context);
});
}

if ($displayMode || $timePeriod) {
[$displayMode, $timePeriod].forEach(function(field) {
field.addEventListener("change", function() {
[$displayMode, $timePeriod].forEach(function (field) {
field.addEventListener("change", function () {
notifyConfigurationChange(context);
});
});
Expand All @@ -96,25 +153,26 @@ document.addEventListener("DOMContentLoaded", function() {
if ($harvestAccountId) $harvestAccountId.value = settings.harvestAccountId || "";
if ($authToken) $authToken.value = settings.authToken || "";
if ($rndFilter) $rndFilter.value = settings.rndFilter || "R&D"; // R&D Filter
if ($productSupportFilter) $productSupportFilter.value = settings.productSupportFilter || "PRODUCT_SUPPORT";
if ($unbilledFilter) $unbilledFilter.value = settings.unbilledFilter || "Unbilled";
if ($displayMode) $displayMode.value = settings.displayMode || "hours";
if ($billableLabel) $billableLabel.value = settings.billableLabel || "Billable";
if ($internalLabel) $internalLabel.value = settings.internalLabel || "Internal";
if ($productSupportLabel) $productSupportLabel.value = settings.productSupportLabel || "Product";
if ($unbilledLabel) $unbilledLabel.value = settings.unbilledLabel || "Unbilled";
if ($rndLabel) $rndLabel.value = settings.rndLabel || "R&D"; // R&D Label
if ($billableColor) $billableColor.value = settings.billableColor || "#852d9d";
if ($internalColor) $internalColor.value = settings.internalColor || "#ec0bb7";
if ($rndColor) $rndColor.value = settings.rndColor || "#76f5ff";
if ($productSupportColor) $productSupportColor.value = settings.productSupportColor || "#FFD700";
if ($unbilledColor) $unbilledColor.value = settings.unbilledColor || "#27CA12";
if ($timePeriod) $timePeriod.value = settings.timePeriod || "7"; // Time Period
if ($theme) $theme.value = settings.theme || "light"; // Load Theme

applyTheme(settings.theme || "light");

validateField($harvestAccountId);
validateField($authToken);
validateField($rndFilter); // R&D Filter
validateField($billableLabel);
validateField($internalLabel);
validateField($rndLabel); // R&D Label
validateField($billableColor);
validateField($internalColor);
validateField($rndColor);
validateField($timePeriod); // Time Period

VSS.resize();

Expand All @@ -128,6 +186,7 @@ document.addEventListener("DOMContentLoaded", function() {
validateField($authToken);

if (($harvestAccountId && $harvestAccountId.value.trim() === "") || ($authToken && $authToken.value.trim() === "")) {
console.error("Validation failed: Required fields are empty.");
return WidgetHelpers.WidgetStatusHelper.Failure("Validation error: fields cannot be empty.");
}

Expand All @@ -143,11 +202,19 @@ document.addEventListener("DOMContentLoaded", function() {
billableColor: $billableColor ? $billableColor.value : "#852d9d",
internalColor: $internalColor ? $internalColor.value : "#ec0bb7",
rndColor: $rndColor ? $rndColor.value : "#76f5ff",
timePeriod: $timePeriod ? $timePeriod.value : "7" // Time Period
timePeriod: $timePeriod ? $timePeriod.value : "7", // Time Period
theme: $theme ? $theme.value : "light", // Theme Selection
productSupportLabel: $productSupportLabel ? $productSupportLabel.value.trim() : "Product",
productSupportFilter: $productSupportFilter ? $productSupportFilter.value.trim() : "PRODUCT_SUPPORT",
productSupportColor: $productSupportColor ? $productSupportColor.value : "#FFD700",
unbilledFilter: $unbilledFilter ? $unbilledFilter.value.trim() : "Unbilled",
unbilledLabel: $unbilledLabel ? $unbilledLabel.value.trim() : "Unbilled",
unbilledColor: $unbilledColor ? $unbilledColor.value : "#27CA12",

})
};

console.log('Saving Settings:', customSettings); // Debugging output
console.log("Saving Settings:", customSettings); // Debugging output

return WidgetHelpers.WidgetConfigurationSave.Valid(customSettings);
}
Expand All @@ -156,4 +223,4 @@ document.addEventListener("DOMContentLoaded", function() {

VSS.notifyLoadSucceeded();
});
});
});
7 changes: 2 additions & 5 deletions Harvest Billing Widget/vss-extension.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifestVersion": 1,
"id": "HarvestWidgets",
"version": "1.0.121",
"version": "1.1.9",
"name": "Harvest Billing Widget",
"description": "Displays hours from Harvest, providing detailed insights into time allocation for projects. The hours are categorized into billable hours, 'R&D' (Research & Development), and Internal hours.",
"publisher": "EirEvo-EvoLabs",
Expand Down Expand Up @@ -50,10 +50,7 @@
"catalogIconUrl": "img/preview.png",
"uri": "widget.html",
"supportedSizes": [
{ "rowSpan": 2, "columnSpan": 2 },
{ "rowSpan": 2, "columnSpan": 3 },
{ "rowSpan": 3, "columnSpan": 2 },
{ "rowSpan": 3, "columnSpan": 3 }
{ "rowSpan": 2, "columnSpan": 2 }
],
"supportedScopes": ["project_team"]
}
Expand Down
Loading