Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/lfx-one/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@fullcalendar/daygrid": "^6.1.19",
"@fullcalendar/timegrid": "^6.1.19",
"@lfx-one/shared": "workspace:*",
"@linuxfoundation/lfx-ui-core": "^0.0.20",
"@linuxfoundation/lfx-ui-core": "^0.0.21",
"@openfeature/core": "^1.9.1",
"@openfeature/launchdarkly-client-provider": "^0.3.3",
"@openfeature/web-sdk": "^1.7.1",
Expand Down Expand Up @@ -83,7 +83,7 @@
"playwright": "^1.54.2",
"pm2": "^6.0.8",
"postcss": "^8.5.6",
"prettier": "^3.6.2",
"prettier": "^3.7.4",
"prettier-plugin-organize-imports": "^4.2.0",
"prettier-plugin-tailwindcss": "^0.6.14",
"tailwindcss": "^3.4.17",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1 class="text-xl font-semibold text-gray-900">{{ isEditMode() ? 'Edit ' : 'Cre
</div>

<!-- Form Card -->
<div class="bg-white rounded-lg p-4 md:p-8 shadow-[0px_1px_2px_-1px_rgba(0,0,0,0.10),0px_1px_3px_0px_rgba(0,0,0,0.10)]">
<div class="bg-white rounded-lg p-4 md:p-8 shadow-md">
<lfx-committee-form
[form]="form"
[isEditMode]="isEditMode()"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- Copyright The Linux Foundation and each contributor to LFX. -->
<!-- SPDX-License-Identifier: MIT -->

<lfx-card styleClass="border-0 shadow-[0px_1px_2px_-1px_rgba(0,0,0,0.10),0px_1px_3px_0px_rgba(0,0,0,0.10)]">
<lfx-card styleClass="border-0 shadow-md">
<div class="overflow-x-auto">
<table class="min-w-full" data-testid="committee-dashboard-table">
<thead>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import type {
TopProjectDisplay,
UniqueContributorsDailyResponse,
} from '@lfx-one/shared/interfaces';
import type { TooltipItem } from 'chart.js';

@Component({
selector: 'lfx-foundation-health',
Expand Down Expand Up @@ -225,9 +224,9 @@ export class FoundationHealthComponent {
tooltip: {
...(this.sparklineOptions.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => context[0].label,
label: (context: TooltipItem<'line'>) => {
const count = context.parsed.y;
title: (context) => context[0]?.label ?? '',
label: (context) => {
const count = context.parsed.y ?? 0;
return `Total projects: ${count}`;
},
},
Expand Down Expand Up @@ -266,9 +265,9 @@ export class FoundationHealthComponent {
tooltip: {
...(this.sparklineOptions.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => context[0].label,
label: (context: TooltipItem<'line'>) => {
const count = context.parsed.y;
title: (context) => context[0]?.label ?? '',
label: (context) => {
const count = context.parsed.y ?? 0;
return `Total members: ${count}`;
},
},
Expand Down Expand Up @@ -346,9 +345,9 @@ export class FoundationHealthComponent {
tooltip: {
...(this.sparklineOptions.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => context[0].label,
label: (context: TooltipItem<'line'>) => {
const count = context.parsed.y;
title: (context) => context[0]?.label ?? '',
label: (context) => {
const count = context.parsed.y ?? 0;
return `Active contributors: ${count.toLocaleString()}`;
},
},
Expand Down Expand Up @@ -387,9 +386,9 @@ export class FoundationHealthComponent {
tooltip: {
...(this.sparklineOptions.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => context[0].label,
label: (context: TooltipItem<'line'>) => {
const count = context.parsed.y;
title: (context) => context[0]?.label ?? '',
label: (context) => {
const count = context.parsed.y ?? 0;
return `Active maintainers: ${count}`;
},
},
Expand Down Expand Up @@ -433,9 +432,9 @@ export class FoundationHealthComponent {
tooltip: {
...(this.barChartOptions.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'bar'>[]) => context[0].label,
label: (context: TooltipItem<'bar'>) => {
const count = context.parsed.y;
title: (context) => context[0]?.label ?? '',
label: (context) => {
const count = context.parsed.y ?? 0;
return `Events: ${count.toLocaleString()}`;
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import type {
OrganizationMaintainersResponse,
TrainingEnrollmentsResponse,
} from '@lfx-one/shared/interfaces';
import type { ChartOptions, TooltipItem } from 'chart.js';
import type { ChartOptions, ChartType } from 'chart.js';

@Component({
selector: 'lfx-organization-involvement',
Expand Down Expand Up @@ -635,32 +635,32 @@ export class OrganizationInvolvementComponent {
};
}

private createBarChartOptions(label: string): ChartOptions<'bar'> {
private createBarChartOptions(label: string): ChartOptions<ChartType> {
return {
...BASE_BAR_CHART_OPTIONS,
plugins: {
...BASE_BAR_CHART_OPTIONS.plugins,
tooltip: {
...(BASE_BAR_CHART_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'bar'>[]) => context[0].label,
label: (context: TooltipItem<'bar'>) => `${label}: ${context.parsed.y}`,
title: (context) => context[0]?.label ?? '',
label: (context) => `${label}: ${context.parsed.y ?? 0}`,
},
},
},
};
}

private createLineChartOptions(label: string): ChartOptions<'line'> {
private createLineChartOptions(label: string): ChartOptions<ChartType> {
return {
...BASE_LINE_CHART_OPTIONS,
plugins: {
...BASE_LINE_CHART_OPTIONS.plugins,
tooltip: {
...(BASE_LINE_CHART_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => context[0].label,
label: (context: TooltipItem<'line'>) => `${label}: ${context.parsed.y}`,
title: (context) => context[0]?.label ?? '',
label: (context) => `${label}: ${context.parsed.y ?? 0}`,
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import type {
UserCodeCommitsResponse,
UserPullRequestsResponse,
} from '@lfx-one/shared/interfaces';
import type { TooltipItem } from 'chart.js';

@Component({
selector: 'lfx-recent-progress',
Expand Down Expand Up @@ -159,8 +158,8 @@ export class RecentProgressComponent {
tooltip: {
...(BASE_BAR_CHART_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'bar'>[]) => context[0].label,
label: (context: TooltipItem<'bar'>) => {
title: (context) => context[0].label,
label: (context) => {
const isActive = context.parsed.y === 1;
return isActive ? 'Active' : 'Inactive';
},
Expand Down Expand Up @@ -198,13 +197,13 @@ export class RecentProgressComponent {
tooltip: {
...(BASE_LINE_CHART_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => {
title: (context) => {
const dateStr = context[0].label;
const date = parseLocalDateString(dateStr);
return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
},
label: (context: TooltipItem<'line'>) => {
const count = context.parsed.y;
label: (context) => {
const count = context.parsed.y ?? 0;
return `PRs Merged: ${count}`;
},
},
Expand Down Expand Up @@ -241,13 +240,13 @@ export class RecentProgressComponent {
tooltip: {
...(BASE_LINE_CHART_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => {
title: (context) => {
const dateStr = context[0].label;
const date = parseLocalDateString(dateStr);
return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
},
label: (context: TooltipItem<'line'>) => {
const count = context.parsed.y;
label: (context) => {
const count = context.parsed.y ?? 0;
return `Commits: ${count}`;
},
},
Expand Down Expand Up @@ -316,18 +315,18 @@ export class RecentProgressComponent {
tooltip: {
...(DUAL_LINE_CHART_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => {
title: (context) => {
const dateStr = context[0].label;
const date = parseLocalDateString(dateStr);
return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
},
label: (context: TooltipItem<'line'>) => {
label: (context) => {
const datasetLabel = context.dataset?.label || '';
const count = context.parsed.y;
const count = context.parsed.y ?? 0;
return `${datasetLabel}: ${count.toLocaleString()}`;
},
labelPointStyle: () => ({
pointStyle: 'circle',
pointStyle: 'circle' as const,
rotation: 0,
}),
},
Expand Down Expand Up @@ -382,7 +381,7 @@ export class RecentProgressComponent {
tooltip: {
...(BAR_CHART_WITH_FOOTER_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'bar'>[]) => {
title: (context) => {
try {
const dateStr = context[0]?.label || '';
if (!dateStr) return '';
Expand All @@ -394,7 +393,7 @@ export class RecentProgressComponent {
return context[0]?.label || '';
}
},
label: (context: TooltipItem<'bar'>) => {
label: (context) => {
try {
const dataIndex = context.dataIndex;
const weekData = chartData[dataIndex];
Expand All @@ -404,7 +403,7 @@ export class RecentProgressComponent {
return '';
}
},
footer: (context: TooltipItem<'bar'>[]) => {
footer: (context) => {
try {
const dataIndex = context[0]?.dataIndex;
if (dataIndex === undefined) return '';
Expand Down Expand Up @@ -457,9 +456,9 @@ export class RecentProgressComponent {
tooltip: {
...(BASE_LINE_CHART_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => context[0].label,
label: (context: TooltipItem<'line'>) => {
const count = context.parsed.y;
title: (context) => context[0].label,
label: (context) => {
const count = context.parsed.y ?? 0;
return `Contributors mentored: ${count.toLocaleString()}`;
},
},
Expand Down Expand Up @@ -515,7 +514,7 @@ export class RecentProgressComponent {
tooltip: {
...(BAR_CHART_WITH_FOOTER_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'bar'>[]) => {
title: (context) => {
try {
const dateStr = context[0]?.label || '';
if (!dateStr) return '';
Expand All @@ -527,7 +526,7 @@ export class RecentProgressComponent {
return context[0]?.label || '';
}
},
label: (context: TooltipItem<'bar'>) => {
label: (context) => {
try {
const dataIndex = context.dataIndex;
const weekData = chartData[dataIndex];
Expand All @@ -537,7 +536,7 @@ export class RecentProgressComponent {
return '';
}
},
footer: (context: TooltipItem<'bar'>[]) => {
footer: (context) => {
try {
const dataIndex = context[0].dataIndex;
const weekData = chartData[dataIndex];
Expand Down Expand Up @@ -593,13 +592,13 @@ export class RecentProgressComponent {
tooltip: {
...(BASE_LINE_CHART_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => {
title: (context) => {
const dateStr = context[0].label;
const date = parseLocalDateString(dateStr);
return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
},
label: (context: TooltipItem<'line'>) => {
const score = Math.round(context.parsed.y);
label: (context) => {
const score = Math.round(context.parsed.y ?? 0);
return `Avg Health Score: ${score}`;
},
},
Expand Down Expand Up @@ -641,14 +640,14 @@ export class RecentProgressComponent {
tooltip: {
...(BASE_LINE_CHART_OPTIONS.plugins?.tooltip ?? {}),
callbacks: {
title: (context: TooltipItem<'line'>[]) => {
title: (context) => {
const dateStr = context[0]?.label || '';
if (!dateStr) return '';
const date = parseLocalDateString(dateStr);
return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
},
label: (context: TooltipItem<'line'>) => {
const count = context.parsed.y;
label: (context) => {
const count = context.parsed.y ?? 0;
return `Commits: ${count.toLocaleString()}`;
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<!-- RSVP Container -->
<div
[ngClass]="{
'bg-cyan-50 border border-cyan-400': selectedResponse() === null && !disabled(),
'bg-blue-50 border border-blue-300': selectedResponse() === null && !disabled(),
'bg-gray-200/50': selectedResponse() !== null || disabled(),
}"
class="rounded-[6px] p-[12px] space-y-2 flex-1"
[attr.data-testid]="'meeting-rsvp-container'">
<!-- Header -->
<div
[ngClass]="{
'text-cyan-600': selectedResponse() === null && !disabled(),
'text-blue-600': selectedResponse() === null && !disabled(),
'text-gray-500': selectedResponse() !== null || disabled(),
}"
class="flex items-center gap-[7px]"
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@
"prepare": "husky"
},
"devDependencies": {
"@commitlint/cli": "^19.8.1",
"@commitlint/config-angular": "^19.8.1",
"@linuxfoundation/lfx-ui-core": "^0.0.20",
"@commitlint/cli": "^20.1.0",
"@commitlint/config-angular": "^20.0.0",
"@linuxfoundation/lfx-ui-core": "^0.0.21",
"@types/node": "^24.2.1",
"@typescript-eslint/eslint-plugin": "^8.39.1",
"@typescript-eslint/parser": "^8.39.1",
"@typescript-eslint/type-utils": "^8.39.1",
"@typescript-eslint/types": "^8.39.1",
"@typescript-eslint/utils": "^8.39.1",
"husky": "^9.1.7",
"lint-staged": "^16.1.5",
"prettier": "^3.6.2",
"lint-staged": "^16.2.7",
"prettier": "^3.7.4",
"tslib": "^2.8.1",
"turbo": "^2.5.5",
"typescript": "5.8.3"
Expand All @@ -63,6 +63,6 @@
]
},
"dependencies": {
"chart.js": "^4.5.0"
"chart.js": "^4.5.1"
}
}
Loading