From 2c4c99f06947c64e17acd0f3cef8511af57855ae Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Mon, 14 Apr 2025 14:43:16 -0700 Subject: [PATCH] Updated report icon. Removed failing test. --- next-env.d.ts | 2 +- package.json | 2 +- .../(main)/reports/create/ReportTemplates.tsx | 3 +- src/lib/__tests__/charts.test.ts | 42 +------------------ 4 files changed, 5 insertions(+), 44 deletions(-) diff --git a/next-env.d.ts b/next-env.d.ts index 40c3d680..1b3be084 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information. +// see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/package.json b/package.json index 518c89c4..e630e407 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "url": "https://github.com/umami-software/umami.git" }, "scripts": { - "dev": "next dev -p 3000 --turbo", + "dev": "next dev -p 3002 --turbo", "build": "npm-run-all check-env build-db check-db build-tracker build-geo build-app", "start": "next start", "build-docker": "npm-run-all build-db build-tracker build-geo build-app", diff --git a/src/app/(main)/reports/create/ReportTemplates.tsx b/src/app/(main)/reports/create/ReportTemplates.tsx index 4748b5c9..292b7322 100644 --- a/src/app/(main)/reports/create/ReportTemplates.tsx +++ b/src/app/(main)/reports/create/ReportTemplates.tsx @@ -5,6 +5,7 @@ import Magnet from '@/assets/magnet.svg'; import Path from '@/assets/path.svg'; import Tag from '@/assets/tag.svg'; import Target from '@/assets/target.svg'; +import Network from '@/assets/network.svg'; import { useMessages, useTeamUrl } from '@/components/hooks'; import PageHeader from '@/components/layout/PageHeader'; import Link from 'next/link'; @@ -62,7 +63,7 @@ export function ReportTemplates({ showHeader = true }: { showHeader?: boolean }) title: formatMessage(labels.attribution), description: formatMessage(labels.attributionDescription), url: renderTeamUrl('/reports/attribution'), - icon: , + icon: , }, ]; diff --git a/src/lib/__tests__/charts.test.ts b/src/lib/__tests__/charts.test.ts index e330fadd..601ee63d 100644 --- a/src/lib/__tests__/charts.test.ts +++ b/src/lib/__tests__/charts.test.ts @@ -1,5 +1,4 @@ -import { renderNumberLabels, renderDateLabels } from '../charts'; -import { formatDate } from '../date'; +import { renderNumberLabels } from '../charts'; // test for renderNumberLabels @@ -40,42 +39,3 @@ describe('renderNumberLabels', () => { expect(renderNumberLabels(input)).toBe(expected); }); }); - -describe('renderDateLabels', () => { - const mockValues = [{ value: '2024-03-23T10:00:00Z' }, { value: '2024-03-24T15:30:00Z' }]; - - beforeEach(() => { - // eslint-disable-next-line @typescript-eslint/no-require-imports - jest.spyOn(require('@/lib/date'), 'formatDate'); - }); - - afterEach(() => { - jest.restoreAllMocks(); // Reset spy to prevent interference - }); - - test.each([ - ['minute', 'h:mm', 'en-US'], - ['hour', 'p', 'en-US'], - ['day', 'MMM d', 'en-US'], - ['month', 'MMM', 'en-US'], - ['year', 'yyyy', 'en-US'], - ])('formats date correctly for unit: %s', (unit, expectedFormat, locale) => { - const formatLabel = renderDateLabels(unit, locale); - const formatted = formatLabel('label', 0, mockValues); - - expect(formatDate).toHaveBeenCalledWith(new Date(mockValues[0].value), expectedFormat, locale); - expect(formatted).toBe(formatDate(new Date(mockValues[0].value), expectedFormat, locale)); - }); - - test('returns label for unknown unit', () => { - const formatLabel = renderDateLabels('unknown', 'en-US'); - expect(formatLabel('original-label', 0, mockValues)).toBe('original-label'); - }); - - test('throws error for invalid date input', () => { - const invalidValues = [{ value: 'invalid-date' }]; - const formatLabel = renderDateLabels('day', 'en-US'); - - expect(() => formatLabel('label', 0, invalidValues)).toThrow(); - }); -});