@10x-media/analytics 1.0.0-beta.6 → 1.0.0-beta.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +73 -0
- package/README.md +13 -3
- package/dist/adapters/ga4/ga4.js +3 -2
- package/dist/adapters/ga4/ga4.js.map +1 -1
- package/dist/adapters/http/fetchJson.js +1 -1
- package/dist/adapters/plausible/plausible.d.ts +10 -0
- package/dist/adapters/plausible/plausible.js +42 -1
- package/dist/adapters/plausible/plausible.js.map +1 -1
- package/dist/adapters/posthog/posthog.d.ts +10 -1
- package/dist/adapters/posthog/posthog.js +47 -0
- package/dist/adapters/posthog/posthog.js.map +1 -1
- package/dist/adapters/umami/umami.d.ts +5 -1
- package/dist/adapters/umami/umami.js +26 -0
- package/dist/adapters/umami/umami.js.map +1 -1
- package/dist/capture/getTrackerConfig.d.ts +20 -0
- package/dist/capture/getTrackerConfig.js +31 -0
- package/dist/capture/getTrackerConfig.js.map +1 -0
- package/dist/capture/mountPath.js +14 -0
- package/dist/capture/mountPath.js.map +1 -0
- package/dist/capture/proxyEndpoint.js +123 -0
- package/dist/capture/proxyEndpoint.js.map +1 -0
- package/dist/capture/proxyRoutes.js +108 -0
- package/dist/capture/proxyRoutes.js.map +1 -0
- package/dist/capture/requestBody.js +68 -0
- package/dist/capture/requestBody.js.map +1 -0
- package/dist/capture/slots.d.ts +8 -0
- package/dist/capture/slots.js +54 -0
- package/dist/capture/slots.js.map +1 -0
- package/dist/capture/trackerConfig.d.ts +33 -0
- package/dist/capture/trackerConfig.js +95 -0
- package/dist/capture/trackerConfig.js.map +1 -0
- package/dist/capture/trackerEndpoint.js +35 -0
- package/dist/capture/trackerEndpoint.js.map +1 -0
- package/dist/charts/BarList.d.ts +15 -1
- package/dist/charts/BarList.js +34 -18
- package/dist/charts/BarList.js.map +1 -1
- package/dist/charts/TrendChart.d.ts +16 -3
- package/dist/charts/TrendChart.js +172 -106
- package/dist/charts/TrendChart.js.map +1 -1
- package/dist/charts/bars.d.ts +2 -0
- package/dist/charts/bars.js +2 -1
- package/dist/charts/bars.js.map +1 -1
- package/dist/charts/bucket.js +10 -1
- package/dist/charts/bucket.js.map +1 -1
- package/dist/charts/spline.js +2 -2
- package/dist/charts/spline.js.map +1 -1
- package/dist/charts/styles.js +18 -1
- package/dist/charts/styles.js.map +1 -1
- package/dist/core/cacheKey.js +13 -1
- package/dist/core/cacheKey.js.map +1 -1
- package/dist/core/capture.d.ts +49 -0
- package/dist/core/contract.d.ts +35 -4
- package/dist/core/contract.js +29 -1
- package/dist/core/contract.js.map +1 -1
- package/dist/core/granularity.js +1 -1
- package/dist/core/options.d.ts +148 -4
- package/dist/core/options.js +121 -3
- package/dist/core/options.js.map +1 -1
- package/dist/core/registry.d.ts +1 -0
- package/dist/core/scopeList.js +32 -0
- package/dist/core/scopeList.js.map +1 -0
- package/dist/core/scopedRead.js +45 -28
- package/dist/core/scopedRead.js.map +1 -1
- package/dist/core/serverEvent.d.ts +42 -0
- package/dist/core/serverEvent.js +12 -0
- package/dist/core/serverEvent.js.map +1 -0
- package/dist/exports/client.d.ts +8 -2
- package/dist/exports/client.js +6 -1
- package/dist/exports/next.d.ts +2 -1
- package/dist/exports/next.js +2 -1
- package/dist/exports/react.d.ts +4 -0
- package/dist/exports/react.js +5 -0
- package/dist/exports/rsc.d.ts +8 -1
- package/dist/exports/rsc.js +7 -2
- package/dist/exports/tracker.d.ts +18 -0
- package/dist/exports/tracker.js +12 -0
- package/dist/exports/types.d.ts +14 -3
- package/dist/exports/types.js +2 -2
- package/dist/fields/AnalyticsPanelClient.js +2 -2
- package/dist/fields/AnalyticsPanelField.js +1 -1
- package/dist/fields/AnalyticsStatField.js +2 -2
- package/dist/fields/config/MetricSelectField.js +2 -2
- package/dist/fields/config/MetricSelectField.js.map +1 -1
- package/dist/fields/config/SourceSelectField.js +2 -2
- package/dist/fields/config/SourceSelectField.js.map +1 -1
- package/dist/fields/config/fetchSources.d.ts +5 -1
- package/dist/fields/config/narrow.js +2 -0
- package/dist/fields/config/narrow.js.map +1 -1
- package/dist/fields/readForDocument.d.ts +5 -0
- package/dist/fields/readForDocument.js +6 -6
- package/dist/fields/readForDocument.js.map +1 -1
- package/dist/goals/GoalSelectField.d.ts +7 -0
- package/dist/goals/GoalSelectField.js +77 -0
- package/dist/goals/GoalSelectField.js.map +1 -0
- package/dist/goals/collection.js +250 -0
- package/dist/goals/collection.js.map +1 -0
- package/dist/goals/currency.js +14 -0
- package/dist/goals/currency.js.map +1 -0
- package/dist/goals/fetchGoals.d.ts +18 -0
- package/dist/goals/fetchGoals.js +29 -0
- package/dist/goals/fetchGoals.js.map +1 -0
- package/dist/goals/goalField.d.ts +31 -0
- package/dist/goals/goalField.js +56 -0
- package/dist/goals/goalField.js.map +1 -0
- package/dist/goals/goalsEndpoint.d.ts +1 -0
- package/dist/goals/goalsEndpoint.js +55 -0
- package/dist/goals/goalsEndpoint.js.map +1 -0
- package/dist/goals/match.js +64 -0
- package/dist/goals/match.js.map +1 -0
- package/dist/goals/resolver.d.ts +8 -0
- package/dist/goals/resolver.js +147 -0
- package/dist/goals/resolver.js.map +1 -0
- package/dist/goals/trackGoalAction.d.ts +74 -0
- package/dist/goals/trackGoalAction.js +139 -0
- package/dist/goals/trackGoalAction.js.map +1 -0
- package/dist/goals/types.d.ts +33 -0
- package/dist/goals/types.js +7 -0
- package/dist/goals/types.js.map +1 -0
- package/dist/goals/useAnalyticsGoals.d.ts +20 -0
- package/dist/goals/useAnalyticsGoals.js +67 -0
- package/dist/goals/useAnalyticsGoals.js.map +1 -0
- package/dist/index.d.ts +11 -3
- package/dist/index.js +104 -17
- package/dist/index.js.map +1 -1
- package/dist/native/collections/events.js +21 -1
- package/dist/native/collections/events.js.map +1 -1
- package/dist/native/collections/rollups.js +24 -0
- package/dist/native/collections/rollups.js.map +1 -1
- package/dist/native/geo/maxmindResolver.js +2 -4
- package/dist/native/geo/maxmindResolver.js.map +1 -1
- package/dist/native/ingest/clientIp.js +15 -0
- package/dist/native/ingest/clientIp.js.map +1 -0
- package/dist/native/ingest/device.js +11 -3
- package/dist/native/ingest/device.js.map +1 -1
- package/dist/native/ingest/endpoint.d.ts +1 -0
- package/dist/native/ingest/endpoint.js +25 -4
- package/dist/native/ingest/endpoint.js.map +1 -1
- package/dist/native/ingest/flushBatch.js +4 -13
- package/dist/native/ingest/flushBatch.js.map +1 -1
- package/dist/native/ingest/normalizeEvent.d.ts +20 -0
- package/dist/native/ingest/normalizeEvent.js +78 -10
- package/dist/native/ingest/normalizeEvent.js.map +1 -1
- package/dist/native/ingest/serverTrack.d.ts +20 -0
- package/dist/native/ingest/serverTrack.js +99 -0
- package/dist/native/ingest/serverTrack.js.map +1 -0
- package/dist/native/ingest/validate.js +27 -0
- package/dist/native/ingest/validate.js.map +1 -0
- package/dist/native/nativeAdapter.d.ts +1 -1
- package/dist/native/nativeAdapter.js +38 -11
- package/dist/native/nativeAdapter.js.map +1 -1
- package/dist/native/query/eventAgg.js +39 -13
- package/dist/native/query/eventAgg.js.map +1 -1
- package/dist/native/retention/pruneTask.js +1 -1
- package/dist/native/rollupAcc.js +12 -1
- package/dist/native/rollupAcc.js.map +1 -1
- package/dist/native/rollups/bumpRollup.js +5 -1
- package/dist/native/rollups/bumpRollup.js.map +1 -1
- package/dist/native/rollups/deltas.js +28 -6
- package/dist/native/rollups/deltas.js.map +1 -1
- package/dist/native/rollups/insertIfNew.js +36 -2
- package/dist/native/rollups/insertIfNew.js.map +1 -1
- package/dist/next/captureRewrites.d.ts +41 -0
- package/dist/next/captureRewrites.js +56 -0
- package/dist/next/captureRewrites.js.map +1 -0
- package/dist/next/posthogProxyRewrites.d.ts +5 -0
- package/dist/next/posthogProxyRewrites.js +16 -21
- package/dist/next/posthogProxyRewrites.js.map +1 -1
- package/dist/plugin/documentEndpoint.js +28 -10
- package/dist/plugin/documentEndpoint.js.map +1 -1
- package/dist/plugin/paths.js +15 -1
- package/dist/plugin/paths.js.map +1 -1
- package/dist/plugin/queryEndpoint.js +113 -0
- package/dist/plugin/queryEndpoint.js.map +1 -0
- package/dist/plugin/readContextForRequest.js +71 -0
- package/dist/plugin/readContextForRequest.js.map +1 -0
- package/dist/plugin/realtimeEndpoint.js +6 -3
- package/dist/plugin/realtimeEndpoint.js.map +1 -1
- package/dist/plugin/runtime.d.ts +1 -0
- package/dist/plugin/runtime.js +31 -1
- package/dist/plugin/runtime.js.map +1 -1
- package/dist/plugin/scopeFieldBoot.js +22 -0
- package/dist/plugin/scopeFieldBoot.js.map +1 -0
- package/dist/plugin/sourcesEndpoint.js +13 -39
- package/dist/plugin/sourcesEndpoint.js.map +1 -1
- package/dist/plugin/warmTask.js +0 -0
- package/dist/plugin/warmTask.js.map +1 -1
- package/dist/providers/collection.js +71 -25
- package/dist/providers/collection.js.map +1 -1
- package/dist/providers/factory.js +8 -2
- package/dist/providers/factory.js.map +1 -1
- package/dist/providers/resolver.js.map +1 -1
- package/dist/query/dates.js +64 -0
- package/dist/query/dates.js.map +1 -0
- package/dist/query/errors.d.ts +17 -0
- package/dist/query/errors.js +10 -0
- package/dist/query/errors.js.map +1 -0
- package/dist/query/fetchQuery.d.ts +59 -0
- package/dist/query/fetchQuery.js +110 -0
- package/dist/query/fetchQuery.js.map +1 -0
- package/dist/query/parse.d.ts +22 -0
- package/dist/query/parse.js +168 -0
- package/dist/query/parse.js.map +1 -0
- package/dist/query/response.d.ts +36 -0
- package/dist/react/AnalyticsProvider.d.ts +43 -0
- package/dist/react/AnalyticsProvider.js +66 -0
- package/dist/react/AnalyticsProvider.js.map +1 -0
- package/dist/react/TrackerBoot.d.ts +22 -0
- package/dist/react/TrackerBoot.js +30 -0
- package/dist/react/TrackerBoot.js.map +1 -0
- package/dist/react/useAnalytics.d.ts +17 -0
- package/dist/react/useAnalytics.js +36 -0
- package/dist/react/useAnalytics.js.map +1 -0
- package/dist/rsc/AnalyticsScripts.d.ts +30 -0
- package/dist/rsc/AnalyticsScripts.js +41 -0
- package/dist/rsc/AnalyticsScripts.js.map +1 -0
- package/dist/surfacing/cacheStore.d.ts +1 -0
- package/dist/surfacing/cacheStore.js +18 -2
- package/dist/surfacing/cacheStore.js.map +1 -1
- package/dist/surfacing/engine.d.ts +1 -0
- package/dist/surfacing/engine.js +44 -4
- package/dist/surfacing/engine.js.map +1 -1
- package/dist/surfacing/queue.js +22 -6
- package/dist/surfacing/queue.js.map +1 -1
- package/dist/surfacing/rateLimiter.js +130 -0
- package/dist/surfacing/rateLimiter.js.map +1 -0
- package/dist/surfacing/retryPolicy.js +15 -0
- package/dist/surfacing/retryPolicy.js.map +1 -0
- package/dist/sync/syncTask.js +60 -33
- package/dist/sync/syncTask.js.map +1 -1
- package/dist/testing/memoryAdapter.d.ts +2 -0
- package/dist/testing/memoryAdapter.js +10 -0
- package/dist/testing/memoryAdapter.js.map +1 -1
- package/dist/timeframe/tz.js +17 -6
- package/dist/timeframe/tz.js.map +1 -1
- package/dist/tracker/autoCapture.d.ts +48 -0
- package/dist/tracker/autoCapture.js +129 -0
- package/dist/tracker/autoCapture.js.map +1 -0
- package/dist/tracker/consent.d.ts +24 -0
- package/dist/tracker/consent.js +48 -0
- package/dist/tracker/consent.js.map +1 -0
- package/dist/tracker/createTracker.d.ts +18 -0
- package/dist/tracker/createTracker.js +163 -0
- package/dist/tracker/createTracker.js.map +1 -0
- package/dist/tracker/initTracker.d.ts +22 -0
- package/dist/tracker/initTracker.js +33 -0
- package/dist/tracker/initTracker.js.map +1 -0
- package/dist/tracker/loadScript.d.ts +14 -0
- package/dist/tracker/loadScript.js +41 -0
- package/dist/tracker/loadScript.js.map +1 -0
- package/dist/tracker/pageTracking.d.ts +17 -0
- package/dist/tracker/pageTracking.js +38 -0
- package/dist/tracker/pageTracking.js.map +1 -0
- package/dist/tracker/registry.d.ts +27 -0
- package/dist/tracker/registry.js +73 -0
- package/dist/tracker/registry.js.map +1 -0
- package/dist/tracker/sinks/native.d.ts +22 -0
- package/dist/tracker/sinks/native.js +56 -0
- package/dist/tracker/sinks/native.js.map +1 -0
- package/dist/tracker/sinks/plausible.d.ts +14 -0
- package/dist/tracker/sinks/plausible.js +25 -0
- package/dist/tracker/sinks/plausible.js.map +1 -0
- package/dist/tracker/sinks/posthog.d.ts +14 -0
- package/dist/tracker/sinks/posthog.js +18 -0
- package/dist/tracker/sinks/posthog.js.map +1 -0
- package/dist/tracker/sinks/umami.d.ts +13 -0
- package/dist/tracker/sinks/umami.js +17 -0
- package/dist/tracker/sinks/umami.js.map +1 -0
- package/dist/tracker/sinks/vendor.d.ts +14 -0
- package/dist/tracker/sinks/vendor.js +66 -0
- package/dist/tracker/sinks/vendor.js.map +1 -0
- package/dist/tracker/transport.js +28 -0
- package/dist/tracker/transport.js.map +1 -0
- package/dist/tracker/types.d.ts +66 -0
- package/dist/translations/ar.js +104 -1
- package/dist/translations/ar.js.map +1 -1
- package/dist/translations/de.js +104 -1
- package/dist/translations/de.js.map +1 -1
- package/dist/translations/en.js +104 -1
- package/dist/translations/en.js.map +1 -1
- package/dist/translations/es.js +104 -1
- package/dist/translations/es.js.map +1 -1
- package/dist/translations/fr.js +104 -1
- package/dist/translations/fr.js.map +1 -1
- package/dist/translations/id.js +104 -1
- package/dist/translations/id.js.map +1 -1
- package/dist/translations/keys.d.ts +103 -0
- package/dist/translations/keys.js +104 -1
- package/dist/translations/keys.js.map +1 -1
- package/dist/translations/ko.js +104 -1
- package/dist/translations/ko.js.map +1 -1
- package/dist/translations/metricKeys.js +1 -1
- package/dist/translations/metricKeys.js.map +1 -1
- package/dist/translations/pt.js +104 -1
- package/dist/translations/pt.js.map +1 -1
- package/dist/translations/ru.js +104 -1
- package/dist/translations/ru.js.map +1 -1
- package/dist/translations/uk.js +104 -1
- package/dist/translations/uk.js.map +1 -1
- package/dist/translations/zh.js +104 -1
- package/dist/translations/zh.js.map +1 -1
- package/dist/view/AnalyticsNavLink.d.ts +19 -0
- package/dist/view/AnalyticsNavLink.js +40 -0
- package/dist/view/AnalyticsNavLink.js.map +1 -0
- package/dist/view/AnalyticsView.d.ts +23 -0
- package/dist/view/AnalyticsView.js +45 -0
- package/dist/view/AnalyticsView.js.map +1 -0
- package/dist/view/AnalyticsViewClient.d.ts +15 -0
- package/dist/view/AnalyticsViewClient.js +189 -0
- package/dist/view/AnalyticsViewClient.js.map +1 -0
- package/dist/view/authRedirect.js +32 -0
- package/dist/view/authRedirect.js.map +1 -0
- package/dist/view/conversionRate.js +18 -0
- package/dist/view/conversionRate.js.map +1 -0
- package/dist/view/dayRange.js +68 -0
- package/dist/view/dayRange.js.map +1 -0
- package/dist/view/gating.d.ts +1 -0
- package/dist/view/gating.js +105 -0
- package/dist/view/gating.js.map +1 -0
- package/dist/view/labels.js +44 -0
- package/dist/view/labels.js.map +1 -0
- package/dist/view/registerView.js +48 -0
- package/dist/view/registerView.js.map +1 -0
- package/dist/view/sections/Breakdowns.js +157 -0
- package/dist/view/sections/Breakdowns.js.map +1 -0
- package/dist/view/sections/EmptyStates.js +92 -0
- package/dist/view/sections/EmptyStates.js.map +1 -0
- package/dist/view/sections/FilterChips.js +41 -0
- package/dist/view/sections/FilterChips.js.map +1 -0
- package/dist/view/sections/GoalsPanel.js +81 -0
- package/dist/view/sections/GoalsPanel.js.map +1 -0
- package/dist/view/sections/OverviewCards.js +65 -0
- package/dist/view/sections/OverviewCards.js.map +1 -0
- package/dist/view/sections/RealtimeStrip.js +77 -0
- package/dist/view/sections/RealtimeStrip.js.map +1 -0
- package/dist/view/sections/Toolbar.js +179 -0
- package/dist/view/sections/Toolbar.js.map +1 -0
- package/dist/view/sections/Trend.js +119 -0
- package/dist/view/sections/Trend.js.map +1 -0
- package/dist/view/sections/styles.js +74 -0
- package/dist/view/sections/styles.js.map +1 -0
- package/dist/view/state.js +206 -0
- package/dist/view/state.js.map +1 -0
- package/dist/view/useViewQueries.js +150 -0
- package/dist/view/useViewQueries.js.map +1 -0
- package/dist/view/viewProps.d.ts +40 -0
- package/dist/view/viewProps.js +90 -0
- package/dist/view/viewProps.js.map +1 -0
- package/dist/widgets/AnalyticsBreakdownWidget.d.ts +2 -1
- package/dist/widgets/AnalyticsBreakdownWidget.js +22 -4
- package/dist/widgets/AnalyticsBreakdownWidget.js.map +1 -1
- package/dist/widgets/AnalyticsGoalsWidget.d.ts +14 -0
- package/dist/widgets/AnalyticsGoalsWidget.js +188 -0
- package/dist/widgets/AnalyticsGoalsWidget.js.map +1 -0
- package/dist/widgets/AnalyticsMetricWidget.d.ts +2 -1
- package/dist/widgets/AnalyticsMetricWidget.js +35 -12
- package/dist/widgets/AnalyticsMetricWidget.js.map +1 -1
- package/dist/widgets/AnalyticsRealtimeWidget.d.ts +2 -1
- package/dist/widgets/AnalyticsRealtimeWidget.js +42 -22
- package/dist/widgets/AnalyticsRealtimeWidget.js.map +1 -1
- package/dist/widgets/AnalyticsTrendWidget.d.ts +2 -1
- package/dist/widgets/AnalyticsTrendWidget.js +51 -15
- package/dist/widgets/AnalyticsTrendWidget.js.map +1 -1
- package/dist/widgets/WidgetViewLink.js +17 -0
- package/dist/widgets/WidgetViewLink.js.map +1 -0
- package/dist/widgets/breakdownTypes.js +32 -0
- package/dist/widgets/breakdownTypes.js.map +1 -1
- package/dist/widgets/cardChrome.js +31 -7
- package/dist/widgets/cardChrome.js.map +1 -1
- package/dist/widgets/range.js +43 -12
- package/dist/widgets/range.js.map +1 -1
- package/dist/widgets/readForWidget.d.ts +12 -0
- package/dist/widgets/readForWidget.js +30 -19
- package/dist/widgets/readForWidget.js.map +1 -1
- package/dist/widgets/readForWidgetBreakdown.d.ts +15 -0
- package/dist/widgets/readForWidgetBreakdown.js +32 -20
- package/dist/widgets/readForWidgetBreakdown.js.map +1 -1
- package/dist/widgets/readForWidgetGoals.d.ts +57 -0
- package/dist/widgets/readForWidgetGoals.js +126 -0
- package/dist/widgets/readForWidgetGoals.js.map +1 -0
- package/dist/widgets/readForWidgetRealtime.js +1 -1
- package/dist/widgets/readForWidgetSeries.d.ts +13 -0
- package/dist/widgets/readForWidgetSeries.js +56 -28
- package/dist/widgets/readForWidgetSeries.js.map +1 -1
- package/dist/widgets/registerWidgets.js +58 -9
- package/dist/widgets/registerWidgets.js.map +1 -1
- package/dist/widgets/types.js +16 -2
- package/dist/widgets/types.js.map +1 -1
- package/dist/widgets/viewLink.d.ts +22 -0
- package/dist/widgets/viewLink.js +83 -0
- package/dist/widgets/viewLink.js.map +1 -0
- package/package.json +25 -5
|
@@ -1,13 +1,16 @@
|
|
|
1
|
+
import { requestTimezone } from "../plugin/runtime.js";
|
|
1
2
|
import { keys } from "../translations/keys.js";
|
|
2
3
|
import { asTranslate } from "../translations/server.js";
|
|
3
|
-
import { readForWidgetSeries } from "./readForWidgetSeries.js";
|
|
4
4
|
import { METRIC_KEYS, TIMEFRAME_KEYS } from "../translations/metricKeys.js";
|
|
5
|
+
import { readForWidgetSeries } from "./readForWidgetSeries.js";
|
|
5
6
|
import { formatRangeCaption, resolveCustomRange } from "./range.js";
|
|
6
7
|
import { TrendChart } from "../charts/TrendChart.js";
|
|
7
8
|
import { formatMetricValue } from "../fields/format.js";
|
|
8
|
-
import { cardStyle, labelStyle } from "./cardChrome.js";
|
|
9
9
|
import { ComparisonDelta } from "./ComparisonDelta.js";
|
|
10
|
-
import {
|
|
10
|
+
import { cardStyle, labelStyle } from "./cardChrome.js";
|
|
11
|
+
import { widgetViewHref } from "./viewLink.js";
|
|
12
|
+
import { WidgetViewLink } from "./WidgetViewLink.js";
|
|
13
|
+
import { bucketByRange, bucketSeries, onPrimaryAxis } from "../charts/bucket.js";
|
|
11
14
|
import { jsx, jsxs } from "react/jsx-runtime";
|
|
12
15
|
//#region src/widgets/AnalyticsTrendWidget.tsx
|
|
13
16
|
const STATE_KEY = {
|
|
@@ -18,35 +21,58 @@ async function AnalyticsTrendWidget(props) {
|
|
|
18
21
|
const data = props.widgetData ?? {};
|
|
19
22
|
const metric = data.metric ?? "pageviews";
|
|
20
23
|
const rawTimeframe = data.timeframe ?? "last30days";
|
|
21
|
-
const
|
|
24
|
+
const timezone = rawTimeframe === "custom" ? await requestTimezone(props.req) : void 0;
|
|
25
|
+
const customRange = timezone ? resolveCustomRange(rawTimeframe, data.range, timezone) : void 0;
|
|
22
26
|
const timeframe = rawTimeframe === "custom" ? "last30days" : rawTimeframe;
|
|
23
27
|
const t = asTranslate(props.req.i18n.t);
|
|
24
28
|
const locale = props.req.i18n.language ?? "en-US";
|
|
25
29
|
const title = data.title?.trim() || t(METRIC_KEYS[metric]);
|
|
30
|
+
const compare = data.compare === true;
|
|
26
31
|
const result = await readForWidgetSeries({
|
|
27
32
|
req: props.req,
|
|
28
33
|
metric,
|
|
29
34
|
timeframe,
|
|
30
35
|
adapterId: data.dataSource,
|
|
31
36
|
now: /* @__PURE__ */ new Date(),
|
|
32
|
-
range: customRange
|
|
37
|
+
range: customRange,
|
|
38
|
+
compare,
|
|
39
|
+
...timezone ? { timezone } : {}
|
|
40
|
+
});
|
|
41
|
+
const href = widgetViewHref(props.view, props.req, {
|
|
42
|
+
timeframe: rawTimeframe,
|
|
43
|
+
timezone: timezone ?? "UTC",
|
|
44
|
+
...customRange ? { range: customRange } : {},
|
|
45
|
+
...result.adapterId ? { source: result.adapterId } : {},
|
|
46
|
+
metric,
|
|
47
|
+
compare
|
|
33
48
|
});
|
|
34
49
|
if (result.status !== "ok") return /* @__PURE__ */ jsxs("div", {
|
|
35
50
|
className: "analytics-trend-widget",
|
|
36
51
|
style: cardStyle,
|
|
37
|
-
children: [
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
52
|
+
children: [
|
|
53
|
+
/* @__PURE__ */ jsx("span", {
|
|
54
|
+
style: labelStyle,
|
|
55
|
+
children: title
|
|
56
|
+
}),
|
|
57
|
+
/* @__PURE__ */ jsx("span", {
|
|
58
|
+
style: { color: "var(--theme-elevation-400)" },
|
|
59
|
+
children: t(STATE_KEY[result.status])
|
|
60
|
+
}),
|
|
61
|
+
/* @__PURE__ */ jsx(WidgetViewLink, {
|
|
62
|
+
href,
|
|
63
|
+
label: t(keys.widgetOpenInView)
|
|
64
|
+
})
|
|
65
|
+
]
|
|
44
66
|
});
|
|
45
|
-
const caption = customRange ? formatRangeCaption(customRange, locale) : t(TIMEFRAME_KEYS[timeframe]);
|
|
46
|
-
const
|
|
67
|
+
const caption = customRange && timezone ? formatRangeCaption(customRange, locale, timezone) : t(TIMEFRAME_KEYS[timeframe]);
|
|
68
|
+
const buckets = customRange ? bucketByRange(result.points, customRange, result.timezone) : bucketSeries(result.points, timeframe, result.timezone);
|
|
69
|
+
const toPoints = (source) => source.map((b) => ({
|
|
47
70
|
...b,
|
|
48
71
|
display: formatMetricValue(metric, b.value, locale)
|
|
49
72
|
}));
|
|
73
|
+
const trendPoints = toPoints(buckets);
|
|
74
|
+
const previousSeries = compare && result.comparisonPoints ? onPrimaryAxis(result.comparisonPoints, result.points) : void 0;
|
|
75
|
+
const comparisonPoints = previousSeries ? toPoints(customRange ? bucketByRange(previousSeries, customRange, result.timezone) : bucketSeries(previousSeries, timeframe, result.timezone)) : void 0;
|
|
50
76
|
return /* @__PURE__ */ jsxs("div", {
|
|
51
77
|
className: "analytics-trend-widget",
|
|
52
78
|
style: cardStyle,
|
|
@@ -66,6 +92,12 @@ async function AnalyticsTrendWidget(props) {
|
|
|
66
92
|
}),
|
|
67
93
|
/* @__PURE__ */ jsx(TrendChart, {
|
|
68
94
|
buckets: trendPoints,
|
|
95
|
+
...comparisonPoints && result.comparisonRange ? {
|
|
96
|
+
comparison: comparisonPoints,
|
|
97
|
+
comparisonLabel: t(keys.viewTrendPrevious),
|
|
98
|
+
comparisonRange: formatRangeCaption(result.comparisonRange, locale, result.timezone),
|
|
99
|
+
label: title
|
|
100
|
+
} : {},
|
|
69
101
|
ariaLabel: `${title} ${caption}`,
|
|
70
102
|
minHeight: 180
|
|
71
103
|
}),
|
|
@@ -89,7 +121,11 @@ async function AnalyticsTrendWidget(props) {
|
|
|
89
121
|
color: "var(--theme-elevation-400)"
|
|
90
122
|
},
|
|
91
123
|
children: t(keys.stateClamped)
|
|
92
|
-
}) : null
|
|
124
|
+
}) : null,
|
|
125
|
+
/* @__PURE__ */ jsx(WidgetViewLink, {
|
|
126
|
+
href,
|
|
127
|
+
label: t(keys.widgetOpenInView)
|
|
128
|
+
})
|
|
93
129
|
]
|
|
94
130
|
});
|
|
95
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnalyticsTrendWidget.js","names":[],"sources":["../../src/widgets/AnalyticsTrendWidget.tsx"],"sourcesContent":["import type { WidgetServerProps } from 'payload'\nimport { bucketByRange, bucketSeries } from '../charts/bucket'\nimport { TrendChart } from '../charts/TrendChart'\nimport type { MetricKey } from '../core/contract'\nimport { formatMetricValue } from '../fields/format'\nimport type { TimeframePreset } from '../timeframe/presets'\nimport { keys, type TranslationKey } from '../translations/keys'\nimport { METRIC_KEYS, TIMEFRAME_KEYS } from '../translations/metricKeys'\nimport { asTranslate } from '../translations/server'\nimport { ComparisonDelta } from './ComparisonDelta'\nimport { cardStyle, labelStyle } from './cardChrome'\nimport { formatRangeCaption, resolveCustomRange } from './range'\nimport type { WidgetReadStatus } from './readForWidget'\nimport { readForWidgetSeries } from './readForWidgetSeries'\nimport type { MetricWidgetData } from './types'\n\nconst STATE_KEY: Record<Exclude<WidgetReadStatus, 'ok'>, TranslationKey> = {\n\t'not-configured': keys.stateNotConfigured,\n\tunavailable: keys.stateUnavailable,\n}\n\nexport default async function AnalyticsTrendWidget(props: WidgetServerProps) {\n\tconst data = (props.widgetData ?? {}) as MetricWidgetData\n\tconst metric: MetricKey = data.metric ?? 'pageviews'\n\tconst rawTimeframe = data.timeframe ?? 'last30days'\n\tconst customRange = resolveCustomRange(rawTimeframe, data.range)\n\tconst timeframe: TimeframePreset = rawTimeframe === 'custom' ? 'last30days' : rawTimeframe\n\tconst t = asTranslate(props.req.i18n.t)\n\tconst locale = props.req.i18n.language ?? 'en-US'\n\tconst title = data.title?.trim() || t(METRIC_KEYS[metric])\n\n\tconst result = await readForWidgetSeries({\n\t\treq: props.req,\n\t\tmetric,\n\t\ttimeframe,\n\t\tadapterId: data.dataSource,\n\t\tnow: new Date(),\n\t\trange: customRange,\n\t})\n\n\tif (result.status !== 'ok') {\n\t\treturn (\n\t\t\t<div className=\"analytics-trend-widget\" style={cardStyle}>\n\t\t\t\t<span style={labelStyle}>{title}</span>\n\t\t\t\t<span style={{ color: 'var(--theme-elevation-400)' }}>{t(STATE_KEY[result.status])}</span>\n\t\t\t</div>\n\t\t)\n\t}\n\n\tconst caption
|
|
1
|
+
{"version":3,"file":"AnalyticsTrendWidget.js","names":[],"sources":["../../src/widgets/AnalyticsTrendWidget.tsx"],"sourcesContent":["import type { WidgetServerProps } from 'payload'\nimport { bucketByRange, bucketSeries, onPrimaryAxis } from '../charts/bucket'\nimport { TrendChart } from '../charts/TrendChart'\nimport type { MetricKey } from '../core/contract'\nimport { formatMetricValue } from '../fields/format'\nimport { requestTimezone } from '../plugin/runtime'\nimport type { TimeframePreset } from '../timeframe/presets'\nimport { DEFAULT_TIMEZONE } from '../timeframe/tz'\nimport { keys, type TranslationKey } from '../translations/keys'\nimport { METRIC_KEYS, TIMEFRAME_KEYS } from '../translations/metricKeys'\nimport { asTranslate } from '../translations/server'\nimport { ComparisonDelta } from './ComparisonDelta'\nimport { cardStyle, labelStyle } from './cardChrome'\nimport { formatRangeCaption, resolveCustomRange } from './range'\nimport type { WidgetReadStatus } from './readForWidget'\nimport { readForWidgetSeries } from './readForWidgetSeries'\nimport type { MetricWidgetData } from './types'\nimport { type WidgetViewProps, widgetViewHref } from './viewLink'\nimport { WidgetViewLink } from './WidgetViewLink'\n\nconst STATE_KEY: Record<Exclude<WidgetReadStatus, 'ok'>, TranslationKey> = {\n\t'not-configured': keys.stateNotConfigured,\n\tunavailable: keys.stateUnavailable,\n}\n\nexport default async function AnalyticsTrendWidget(props: WidgetServerProps & WidgetViewProps) {\n\tconst data = (props.widgetData ?? {}) as MetricWidgetData\n\tconst metric: MetricKey = data.metric ?? 'pageviews'\n\tconst rawTimeframe = data.timeframe ?? 'last30days'\n\t// Only a custom range needs the reporting timezone before the read; a preset window\n\t// resolves inside the read path, which resolves the timezone there as it always has.\n\tconst timezone = rawTimeframe === 'custom' ? await requestTimezone(props.req) : undefined\n\tconst customRange = timezone ? resolveCustomRange(rawTimeframe, data.range, timezone) : undefined\n\tconst timeframe: TimeframePreset = rawTimeframe === 'custom' ? 'last30days' : rawTimeframe\n\tconst t = asTranslate(props.req.i18n.t)\n\tconst locale = props.req.i18n.language ?? 'en-US'\n\tconst title = data.title?.trim() || t(METRIC_KEYS[metric])\n\n\tconst compare = data.compare === true\n\tconst result = await readForWidgetSeries({\n\t\treq: props.req,\n\t\tmetric,\n\t\ttimeframe,\n\t\tadapterId: data.dataSource,\n\t\tnow: new Date(),\n\t\trange: customRange,\n\t\tcompare,\n\t\t...(timezone ? { timezone } : {}),\n\t})\n\t// The adapter that answered, which on a scoped or runtime-provider install is not the\n\t// id the widget asked for.\n\tconst href = widgetViewHref(props.view, props.req, {\n\t\ttimeframe: rawTimeframe,\n\t\ttimezone: timezone ?? DEFAULT_TIMEZONE,\n\t\t...(customRange ? { range: customRange } : {}),\n\t\t...(result.adapterId ? { source: result.adapterId } : {}),\n\t\tmetric,\n\t\tcompare,\n\t})\n\n\tif (result.status !== 'ok') {\n\t\treturn (\n\t\t\t<div className=\"analytics-trend-widget\" style={cardStyle}>\n\t\t\t\t<span style={labelStyle}>{title}</span>\n\t\t\t\t<span style={{ color: 'var(--theme-elevation-400)' }}>{t(STATE_KEY[result.status])}</span>\n\t\t\t\t<WidgetViewLink href={href} label={t(keys.widgetOpenInView)} />\n\t\t\t</div>\n\t\t)\n\t}\n\n\tconst caption =\n\t\tcustomRange && timezone\n\t\t\t? formatRangeCaption(customRange, locale, timezone)\n\t\t\t: t(TIMEFRAME_KEYS[timeframe])\n\tconst buckets = customRange\n\t\t? bucketByRange(result.points, customRange, result.timezone)\n\t\t: bucketSeries(result.points, timeframe, result.timezone)\n\tconst toPoints = (source: typeof buckets) =>\n\t\tsource.map((b) => ({ ...b, display: formatMetricValue(metric, b.value, locale) }))\n\tconst trendPoints = toPoints(buckets)\n\t// The comparison is re-dated onto the primary axis before bucketing: at week and month\n\t// units its own dates would fall on different boundaries.\n\tconst previousSeries =\n\t\tcompare && result.comparisonPoints\n\t\t\t? onPrimaryAxis(result.comparisonPoints, result.points)\n\t\t\t: undefined\n\tconst comparisonPoints = previousSeries\n\t\t? toPoints(\n\t\t\t\tcustomRange\n\t\t\t\t\t? bucketByRange(previousSeries, customRange, result.timezone)\n\t\t\t\t\t: bucketSeries(previousSeries, timeframe, result.timezone)\n\t\t\t)\n\t\t: undefined\n\treturn (\n\t\t<div className=\"analytics-trend-widget\" style={cardStyle}>\n\t\t\t<span style={labelStyle}>{title}</span>\n\t\t\t<span\n\t\t\t\tstyle={{\n\t\t\t\t\tfontSize: '1.75rem',\n\t\t\t\t\tfontWeight: 700,\n\t\t\t\t\tlineHeight: 1.1,\n\t\t\t\t\tcolor: 'var(--theme-elevation-800)',\n\t\t\t\t}}\n\t\t\t>\n\t\t\t\t{formatMetricValue(metric, result.total, locale)}\n\t\t\t</span>\n\t\t\t<TrendChart\n\t\t\t\tbuckets={trendPoints}\n\t\t\t\t{...(comparisonPoints && result.comparisonRange\n\t\t\t\t\t? {\n\t\t\t\t\t\t\tcomparison: comparisonPoints,\n\t\t\t\t\t\t\tcomparisonLabel: t(keys.viewTrendPrevious),\n\t\t\t\t\t\t\tcomparisonRange: formatRangeCaption(result.comparisonRange, locale, result.timezone),\n\t\t\t\t\t\t\tlabel: title,\n\t\t\t\t\t\t}\n\t\t\t\t\t: {})}\n\t\t\t\tariaLabel={`${title} ${caption}`}\n\t\t\t\tminHeight={180}\n\t\t\t/>\n\t\t\t<span style={{ fontSize: '0.75rem', color: 'var(--theme-elevation-400)' }}>{caption}</span>\n\t\t\t{result.comparisonRange ? (\n\t\t\t\t<ComparisonDelta\n\t\t\t\t\tcurrent={result.total}\n\t\t\t\t\tprevious={result.previousTotal}\n\t\t\t\t\tmetric={metric}\n\t\t\t\t\tlocale={locale}\n\t\t\t\t\tt={t}\n\t\t\t\t/>\n\t\t\t) : null}\n\t\t\t{result.clamped ? (\n\t\t\t\t<span style={{ fontSize: '0.6875rem', color: 'var(--theme-elevation-400)' }}>\n\t\t\t\t\t{t(keys.stateClamped)}\n\t\t\t\t</span>\n\t\t\t) : null}\n\t\t\t<WidgetViewLink href={href} label={t(keys.widgetOpenInView)} />\n\t\t</div>\n\t)\n}\n"],"mappings":";;;;;;;;;;;;;;;AAoBA,MAAM,YAAqE;CAC1E,kBAAkB,KAAK;CACvB,aAAa,KAAK;AACnB;AAEA,eAA8B,qBAAqB,OAA4C;CAC9F,MAAM,OAAQ,MAAM,cAAc,CAAC;CACnC,MAAM,SAAoB,KAAK,UAAU;CACzC,MAAM,eAAe,KAAK,aAAa;CAGvC,MAAM,WAAW,iBAAiB,WAAW,MAAM,gBAAgB,MAAM,GAAG,IAAI,KAAA;CAChF,MAAM,cAAc,WAAW,mBAAmB,cAAc,KAAK,OAAO,QAAQ,IAAI,KAAA;CACxF,MAAM,YAA6B,iBAAiB,WAAW,eAAe;CAC9E,MAAM,IAAI,YAAY,MAAM,IAAI,KAAK,CAAC;CACtC,MAAM,SAAS,MAAM,IAAI,KAAK,YAAY;CAC1C,MAAM,QAAQ,KAAK,OAAO,KAAK,KAAK,EAAE,YAAY,OAAO;CAEzD,MAAM,UAAU,KAAK,YAAY;CACjC,MAAM,SAAS,MAAM,oBAAoB;EACxC,KAAK,MAAM;EACX;EACA;EACA,WAAW,KAAK;EAChB,qBAAK,IAAI,KAAK;EACd,OAAO;EACP;EACA,GAAI,WAAW,EAAE,SAAS,IAAI,CAAC;CAChC,CAAC;CAGD,MAAM,OAAO,eAAe,MAAM,MAAM,MAAM,KAAK;EAClD,WAAW;EACX,UAAU,YAAA;EACV,GAAI,cAAc,EAAE,OAAO,YAAY,IAAI,CAAC;EAC5C,GAAI,OAAO,YAAY,EAAE,QAAQ,OAAO,UAAU,IAAI,CAAC;EACvD;EACA;CACD,CAAC;CAED,IAAI,OAAO,WAAW,MACrB,OACC,qBAAC,OAAD;EAAK,WAAU;EAAyB,OAAO;YAA/C;GACC,oBAAC,QAAD;IAAM,OAAO;cAAa;GAAY,CAAA;GACtC,oBAAC,QAAD;IAAM,OAAO,EAAE,OAAO,6BAA6B;cAAI,EAAE,UAAU,OAAO,OAAO;GAAQ,CAAA;GACzF,oBAAC,gBAAD;IAAsB;IAAM,OAAO,EAAE,KAAK,gBAAgB;GAAI,CAAA;EAC1D;;CAIP,MAAM,UACL,eAAe,WACZ,mBAAmB,aAAa,QAAQ,QAAQ,IAChD,EAAE,eAAe,UAAU;CAC/B,MAAM,UAAU,cACb,cAAc,OAAO,QAAQ,aAAa,OAAO,QAAQ,IACzD,aAAa,OAAO,QAAQ,WAAW,OAAO,QAAQ;CACzD,MAAM,YAAY,WACjB,OAAO,KAAK,OAAO;EAAE,GAAG;EAAG,SAAS,kBAAkB,QAAQ,EAAE,OAAO,MAAM;CAAE,EAAE;CAClF,MAAM,cAAc,SAAS,OAAO;CAGpC,MAAM,iBACL,WAAW,OAAO,mBACf,cAAc,OAAO,kBAAkB,OAAO,MAAM,IACpD,KAAA;CACJ,MAAM,mBAAmB,iBACtB,SACA,cACG,cAAc,gBAAgB,aAAa,OAAO,QAAQ,IAC1D,aAAa,gBAAgB,WAAW,OAAO,QAAQ,CAC3D,IACC,KAAA;CACH,OACC,qBAAC,OAAD;EAAK,WAAU;EAAyB,OAAO;YAA/C;GACC,oBAAC,QAAD;IAAM,OAAO;cAAa;GAAY,CAAA;GACtC,oBAAC,QAAD;IACC,OAAO;KACN,UAAU;KACV,YAAY;KACZ,YAAY;KACZ,OAAO;IACR;cAEC,kBAAkB,QAAQ,OAAO,OAAO,MAAM;GAC1C,CAAA;GACN,oBAAC,YAAD;IACC,SAAS;IACT,GAAK,oBAAoB,OAAO,kBAC7B;KACA,YAAY;KACZ,iBAAiB,EAAE,KAAK,iBAAiB;KACzC,iBAAiB,mBAAmB,OAAO,iBAAiB,QAAQ,OAAO,QAAQ;KACnF,OAAO;IACR,IACC,CAAC;IACJ,WAAW,GAAG,MAAM,GAAG;IACvB,WAAW;GACX,CAAA;GACD,oBAAC,QAAD;IAAM,OAAO;KAAE,UAAU;KAAW,OAAO;IAA6B;cAAI;GAAc,CAAA;GACzF,OAAO,kBACP,oBAAC,iBAAD;IACC,SAAS,OAAO;IAChB,UAAU,OAAO;IACT;IACA;IACL;GACH,CAAA,IACE;GACH,OAAO,UACP,oBAAC,QAAD;IAAM,OAAO;KAAE,UAAU;KAAa,OAAO;IAA6B;cACxE,EAAE,KAAK,YAAY;GACf,CAAA,IACH;GACJ,oBAAC,gBAAD;IAAsB;IAAM,OAAO,EAAE,KAAK,gBAAgB;GAAI,CAAA;EAC1D;;AAEP"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { linkStyle } from "./cardChrome.js";
|
|
2
|
+
import { jsx } from "react/jsx-runtime";
|
|
3
|
+
//#region src/widgets/WidgetViewLink.tsx
|
|
4
|
+
/**
|
|
5
|
+
* A built-in widget's footer link into the analytics view. Renders nothing without an
|
|
6
|
+
* href, which is how a widget carries "the app turned the view off" through to the markup.
|
|
7
|
+
*/
|
|
8
|
+
const WidgetViewLink = ({ href, label }) => href === void 0 ? null : /* @__PURE__ */ jsx("a", {
|
|
9
|
+
className: "analytics-widget__link",
|
|
10
|
+
href,
|
|
11
|
+
style: linkStyle,
|
|
12
|
+
children: label
|
|
13
|
+
});
|
|
14
|
+
//#endregion
|
|
15
|
+
export { WidgetViewLink };
|
|
16
|
+
|
|
17
|
+
//# sourceMappingURL=WidgetViewLink.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WidgetViewLink.js","names":[],"sources":["../../src/widgets/WidgetViewLink.tsx"],"sourcesContent":["import { linkStyle } from './cardChrome'\n\n/**\n * A built-in widget's footer link into the analytics view. Renders nothing without an\n * href, which is how a widget carries \"the app turned the view off\" through to the markup.\n */\nexport const WidgetViewLink = ({ href, label }: { href?: string; label: string }) =>\n\thref === undefined ? null : (\n\t\t<a className=\"analytics-widget__link\" href={href} style={linkStyle}>\n\t\t\t{label}\n\t\t</a>\n\t)\n"],"mappings":";;;;;;;AAMA,MAAa,kBAAkB,EAAE,MAAM,YACtC,SAAS,KAAA,IAAY,OACpB,oBAAC,KAAD;CAAG,WAAU;CAA+B;CAAM,OAAO;WACvD;AACC,CAAA"}
|
|
@@ -20,6 +20,38 @@ const BREAKDOWN_SPECS = [
|
|
|
20
20
|
slug: "analytics-breakdown-countries",
|
|
21
21
|
dimension: "country",
|
|
22
22
|
label: keys.widgetBreakdownCountries
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
slug: "analytics-breakdown-goals",
|
|
26
|
+
dimension: "goal",
|
|
27
|
+
label: keys.widgetBreakdownGoals,
|
|
28
|
+
preferredDefault: "conversions"
|
|
29
|
+
},
|
|
30
|
+
{
|
|
31
|
+
slug: "analytics-breakdown-referrers",
|
|
32
|
+
dimension: "referrer",
|
|
33
|
+
label: keys.widgetBreakdownReferrers
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
slug: "analytics-breakdown-browsers",
|
|
37
|
+
dimension: "browser",
|
|
38
|
+
label: keys.widgetBreakdownBrowsers
|
|
39
|
+
},
|
|
40
|
+
{
|
|
41
|
+
slug: "analytics-breakdown-os",
|
|
42
|
+
dimension: "os",
|
|
43
|
+
label: keys.widgetBreakdownOs
|
|
44
|
+
},
|
|
45
|
+
{
|
|
46
|
+
slug: "analytics-breakdown-campaigns",
|
|
47
|
+
dimension: "utmCampaign",
|
|
48
|
+
label: keys.widgetBreakdownCampaigns
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
slug: "analytics-breakdown-events",
|
|
52
|
+
dimension: "event",
|
|
53
|
+
label: keys.widgetBreakdownEvents,
|
|
54
|
+
preferredDefault: "events"
|
|
23
55
|
}
|
|
24
56
|
];
|
|
25
57
|
const breakdownSpecBySlug = (slug) => BREAKDOWN_SPECS.find((s) => s.slug === slug);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"breakdownTypes.js","names":[],"sources":["../../src/widgets/breakdownTypes.ts"],"sourcesContent":["import type { DimensionKey, MetricKey } from '../core/contract'\nimport type { TimeframePreset } from '../timeframe/presets'\nimport { keys, type TranslationKey } from '../translations/keys'\nimport type { WidgetRange } from './types'\n\nexport interface BreakdownWidgetData {\n\ttitle?: string\n\tmetric?: MetricKey\n\ttimeframe?: TimeframePreset | 'custom'\n\trange?: WidgetRange\n\tlimit?: number\n\tdataSource?: string\n}\n\nexport interface BreakdownSpec {\n\tslug: string\n\tdimension: DimensionKey\n\tlabel: TranslationKey\n}\n\nexport const BREAKDOWN_SPECS: BreakdownSpec[] = [\n\t{ slug: 'analytics-breakdown-pages', dimension: 'page', label: keys.widgetBreakdownPages },\n\t{ slug: 'analytics-breakdown-sources', dimension: 'source', label: keys.widgetBreakdownSources },\n\t{ slug: 'analytics-breakdown-devices', dimension: 'device', label: keys.widgetBreakdownDevices },\n\t{\n\t\tslug: 'analytics-breakdown-countries',\n\t\tdimension: 'country',\n\t\tlabel: keys.widgetBreakdownCountries,\n\t},\n]\n\nexport const breakdownSpecBySlug = (slug: string): BreakdownSpec | undefined =>\n\tBREAKDOWN_SPECS.find((s) => s.slug === slug)\n"],"mappings":";;
|
|
1
|
+
{"version":3,"file":"breakdownTypes.js","names":[],"sources":["../../src/widgets/breakdownTypes.ts"],"sourcesContent":["import type { DimensionKey, MetricKey } from '../core/contract'\nimport type { TimeframePreset } from '../timeframe/presets'\nimport { keys, type TranslationKey } from '../translations/keys'\nimport type { WidgetRange } from './types'\n\nexport interface BreakdownWidgetData {\n\ttitle?: string\n\tmetric?: MetricKey\n\ttimeframe?: TimeframePreset | 'custom'\n\trange?: WidgetRange\n\tlimit?: number\n\tdataSource?: string\n}\n\nexport interface BreakdownSpec {\n\tslug: string\n\tdimension: DimensionKey\n\tlabel: TranslationKey\n\tpreferredDefault?: MetricKey\n}\n\nexport const BREAKDOWN_SPECS: BreakdownSpec[] = [\n\t{ slug: 'analytics-breakdown-pages', dimension: 'page', label: keys.widgetBreakdownPages },\n\t{ slug: 'analytics-breakdown-sources', dimension: 'source', label: keys.widgetBreakdownSources },\n\t{ slug: 'analytics-breakdown-devices', dimension: 'device', label: keys.widgetBreakdownDevices },\n\t{\n\t\tslug: 'analytics-breakdown-countries',\n\t\tdimension: 'country',\n\t\tlabel: keys.widgetBreakdownCountries,\n\t},\n\t{\n\t\tslug: 'analytics-breakdown-goals',\n\t\tdimension: 'goal',\n\t\tlabel: keys.widgetBreakdownGoals,\n\t\t// A goals breakdown is a conversion table: pageviews per goal is a stranger default.\n\t\tpreferredDefault: 'conversions',\n\t},\n\t{\n\t\tslug: 'analytics-breakdown-referrers',\n\t\tdimension: 'referrer',\n\t\tlabel: keys.widgetBreakdownReferrers,\n\t},\n\t{\n\t\tslug: 'analytics-breakdown-browsers',\n\t\tdimension: 'browser',\n\t\tlabel: keys.widgetBreakdownBrowsers,\n\t},\n\t{ slug: 'analytics-breakdown-os', dimension: 'os', label: keys.widgetBreakdownOs },\n\t{\n\t\tslug: 'analytics-breakdown-campaigns',\n\t\tdimension: 'utmCampaign',\n\t\tlabel: keys.widgetBreakdownCampaigns,\n\t},\n\t{\n\t\tslug: 'analytics-breakdown-events',\n\t\tdimension: 'event',\n\t\tlabel: keys.widgetBreakdownEvents,\n\t\tpreferredDefault: 'events',\n\t},\n]\n\nexport const breakdownSpecBySlug = (slug: string): BreakdownSpec | undefined =>\n\tBREAKDOWN_SPECS.find((s) => s.slug === slug)\n"],"mappings":";;AAqBA,MAAa,kBAAmC;CAC/C;EAAE,MAAM;EAA6B,WAAW;EAAQ,OAAO,KAAK;CAAqB;CACzF;EAAE,MAAM;EAA+B,WAAW;EAAU,OAAO,KAAK;CAAuB;CAC/F;EAAE,MAAM;EAA+B,WAAW;EAAU,OAAO,KAAK;CAAuB;CAC/F;EACC,MAAM;EACN,WAAW;EACX,OAAO,KAAK;CACb;CACA;EACC,MAAM;EACN,WAAW;EACX,OAAO,KAAK;EAEZ,kBAAkB;CACnB;CACA;EACC,MAAM;EACN,WAAW;EACX,OAAO,KAAK;CACb;CACA;EACC,MAAM;EACN,WAAW;EACX,OAAO,KAAK;CACb;CACA;EAAE,MAAM;EAA0B,WAAW;EAAM,OAAO,KAAK;CAAkB;CACjF;EACC,MAAM;EACN,WAAW;EACX,OAAO,KAAK;CACb;CACA;EACC,MAAM;EACN,WAAW;EACX,OAAO,KAAK;EACZ,kBAAkB;CACnB;AACD;AAEA,MAAa,uBAAuB,SACnC,gBAAgB,MAAM,MAAM,EAAE,SAAS,IAAI"}
|
|
@@ -1,22 +1,46 @@
|
|
|
1
1
|
//#region src/widgets/cardChrome.ts
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
/**
|
|
3
|
+
* The card chrome, as token values rather than only as style objects: the widgets apply them
|
|
4
|
+
* inline (they are server-rendered and the package ships no stylesheet), while the analytics
|
|
5
|
+
* view interpolates the same values into its own injected CSS, where hover and pressed states
|
|
6
|
+
* need real selectors. One definition, so the two surfaces cannot drift apart.
|
|
7
|
+
*/
|
|
8
|
+
const CARD_CHROME = {
|
|
5
9
|
gap: "0.375rem",
|
|
6
10
|
padding: "var(--base, 1rem)",
|
|
7
11
|
background: "var(--theme-elevation-50)",
|
|
8
12
|
border: "1px solid var(--theme-elevation-150)",
|
|
9
|
-
|
|
10
|
-
boxSizing: "border-box"
|
|
13
|
+
radius: "var(--style-radius-m, 6px)"
|
|
11
14
|
};
|
|
12
|
-
const
|
|
15
|
+
const CARD_LABEL = {
|
|
13
16
|
fontSize: "0.6875rem",
|
|
14
17
|
fontWeight: 600,
|
|
15
18
|
letterSpacing: "0.04em",
|
|
16
19
|
textTransform: "uppercase",
|
|
17
20
|
color: "var(--theme-elevation-500)"
|
|
18
21
|
};
|
|
22
|
+
const cardStyle = {
|
|
23
|
+
display: "flex",
|
|
24
|
+
flexDirection: "column",
|
|
25
|
+
gap: CARD_CHROME.gap,
|
|
26
|
+
padding: CARD_CHROME.padding,
|
|
27
|
+
background: CARD_CHROME.background,
|
|
28
|
+
border: CARD_CHROME.border,
|
|
29
|
+
borderRadius: CARD_CHROME.radius,
|
|
30
|
+
boxSizing: "border-box"
|
|
31
|
+
};
|
|
32
|
+
const labelStyle = { ...CARD_LABEL };
|
|
33
|
+
/** The card's footer link. `marginTop: auto` floors it, so cards of a row line their links up. */
|
|
34
|
+
const linkStyle = {
|
|
35
|
+
marginTop: "auto",
|
|
36
|
+
alignSelf: "flex-start",
|
|
37
|
+
fontSize: "0.75rem",
|
|
38
|
+
fontWeight: 500,
|
|
39
|
+
color: "var(--theme-elevation-500)",
|
|
40
|
+
textDecoration: "underline",
|
|
41
|
+
textUnderlineOffset: "2px"
|
|
42
|
+
};
|
|
19
43
|
//#endregion
|
|
20
|
-
export { cardStyle, labelStyle };
|
|
44
|
+
export { CARD_CHROME, CARD_LABEL, cardStyle, labelStyle, linkStyle };
|
|
21
45
|
|
|
22
46
|
//# sourceMappingURL=cardChrome.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cardChrome.js","names":[],"sources":["../../src/widgets/cardChrome.ts"],"sourcesContent":["import type { CSSProperties } from 'react'\n\
|
|
1
|
+
{"version":3,"file":"cardChrome.js","names":[],"sources":["../../src/widgets/cardChrome.ts"],"sourcesContent":["import type { CSSProperties } from 'react'\n\n/**\n * The card chrome, as token values rather than only as style objects: the widgets apply them\n * inline (they are server-rendered and the package ships no stylesheet), while the analytics\n * view interpolates the same values into its own injected CSS, where hover and pressed states\n * need real selectors. One definition, so the two surfaces cannot drift apart.\n */\nexport const CARD_CHROME = {\n\tgap: '0.375rem',\n\tpadding: 'var(--base, 1rem)',\n\tbackground: 'var(--theme-elevation-50)',\n\tborder: '1px solid var(--theme-elevation-150)',\n\tradius: 'var(--style-radius-m, 6px)',\n} as const\n\nexport const CARD_LABEL = {\n\tfontSize: '0.6875rem',\n\tfontWeight: 600,\n\tletterSpacing: '0.04em',\n\ttextTransform: 'uppercase',\n\tcolor: 'var(--theme-elevation-500)',\n} as const\n\nexport const cardStyle: CSSProperties = {\n\tdisplay: 'flex',\n\tflexDirection: 'column',\n\tgap: CARD_CHROME.gap,\n\tpadding: CARD_CHROME.padding,\n\tbackground: CARD_CHROME.background,\n\tborder: CARD_CHROME.border,\n\tborderRadius: CARD_CHROME.radius,\n\tboxSizing: 'border-box',\n}\n\nexport const labelStyle: CSSProperties = { ...CARD_LABEL }\n\n/** The card's footer link. `marginTop: auto` floors it, so cards of a row line their links up. */\nexport const linkStyle: CSSProperties = {\n\tmarginTop: 'auto',\n\talignSelf: 'flex-start',\n\tfontSize: '0.75rem',\n\tfontWeight: 500,\n\tcolor: 'var(--theme-elevation-500)',\n\ttextDecoration: 'underline',\n\ttextUnderlineOffset: '2px',\n}\n"],"mappings":";;;;;;;AAQA,MAAa,cAAc;CAC1B,KAAK;CACL,SAAS;CACT,YAAY;CACZ,QAAQ;CACR,QAAQ;AACT;AAEA,MAAa,aAAa;CACzB,UAAU;CACV,YAAY;CACZ,eAAe;CACf,eAAe;CACf,OAAO;AACR;AAEA,MAAa,YAA2B;CACvC,SAAS;CACT,eAAe;CACf,KAAK,YAAY;CACjB,SAAS,YAAY;CACrB,YAAY,YAAY;CACxB,QAAQ,YAAY;CACpB,cAAc,YAAY;CAC1B,WAAW;AACZ;AAEA,MAAa,aAA4B,EAAE,GAAG,WAAW;;AAGzD,MAAa,YAA2B;CACvC,WAAW;CACX,WAAW;CACX,UAAU;CACV,YAAY;CACZ,OAAO;CACP,gBAAgB;CAChB,qBAAqB;AACtB"}
|
package/dist/widgets/range.js
CHANGED
|
@@ -1,27 +1,58 @@
|
|
|
1
|
+
import { zonedCalendarDay } from "../timeframe/tz.js";
|
|
2
|
+
import { DATE_ONLY, parseDayOrInstant } from "../query/dates.js";
|
|
1
3
|
//#region src/widgets/range.ts
|
|
4
|
+
const NOON_MS = 12 * 36e5;
|
|
2
5
|
/**
|
|
3
|
-
*
|
|
4
|
-
* the
|
|
5
|
-
*
|
|
6
|
-
*
|
|
6
|
+
* The calendar day a stored bound names. The `dayOnly` picker stores the picked day at the
|
|
7
|
+
* admin browser's local midnight, so the instant lands on that day or the one before it in
|
|
8
|
+
* UTC depending on the browser's offset; a 12-hour shift recovers the picked day for every
|
|
9
|
+
* offset in (-12, +12]. Zones at +12:45 and beyond (Chatham in DST, Kiritimati) recover the
|
|
10
|
+
* day before, and the uninhabited UTC-12 the day after.
|
|
7
11
|
*/
|
|
8
|
-
const
|
|
12
|
+
const pickedDay = (raw) => {
|
|
13
|
+
if (DATE_ONLY.test(raw)) return raw;
|
|
14
|
+
const instant = new Date(raw);
|
|
15
|
+
if (Number.isNaN(instant.getTime())) return null;
|
|
16
|
+
return zonedCalendarDay(new Date(instant.getTime() + NOON_MS), "UTC");
|
|
17
|
+
};
|
|
18
|
+
/**
|
|
19
|
+
* Resolve a widget's explicit custom range to a concrete DateRange, or undefined when the
|
|
20
|
+
* widget is on a relative preset, the custom range is incomplete, or either bound names no
|
|
21
|
+
* real day (a corrupt or hand-set widgetData would otherwise reach the cache key and throw
|
|
22
|
+
* on `toISOString`). The two picked days are read inclusively in `timezone`, the reporting
|
|
23
|
+
* timezone the read resolves in: `from` at the first instant of its day, `to` at the last.
|
|
24
|
+
*/
|
|
25
|
+
const resolveCustomRange = (timeframe, range, timezone) => {
|
|
9
26
|
if (timeframe !== "custom" || !range?.from || !range?.to) return;
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
if (
|
|
27
|
+
const fromDay = pickedDay(range.from);
|
|
28
|
+
const toDay = pickedDay(range.to);
|
|
29
|
+
if (!fromDay || !toDay) return;
|
|
30
|
+
const start = parseDayOrInstant(fromDay, {
|
|
31
|
+
timezone,
|
|
32
|
+
edge: "start"
|
|
33
|
+
});
|
|
34
|
+
const end = parseDayOrInstant(toDay, {
|
|
35
|
+
timezone,
|
|
36
|
+
edge: "end"
|
|
37
|
+
});
|
|
38
|
+
if (!start || !end) return;
|
|
13
39
|
return {
|
|
14
40
|
start,
|
|
15
41
|
end
|
|
16
42
|
};
|
|
17
43
|
};
|
|
18
|
-
const formatDay = (d, locale) => d.toLocaleDateString(locale, {
|
|
44
|
+
const formatDay = (d, locale, timeZone) => d.toLocaleDateString(locale, {
|
|
19
45
|
month: "short",
|
|
20
46
|
day: "numeric",
|
|
21
|
-
year: "numeric"
|
|
47
|
+
year: "numeric",
|
|
48
|
+
timeZone
|
|
22
49
|
});
|
|
23
|
-
/**
|
|
24
|
-
|
|
50
|
+
/**
|
|
51
|
+
* Server-side caption for a custom range, e.g. "Jun 1, 2026 - Jun 23, 2026". Both bounds
|
|
52
|
+
* render in the reporting timezone, so the caption names the days that were read rather
|
|
53
|
+
* than the days the server's own zone would spell them as.
|
|
54
|
+
*/
|
|
55
|
+
const formatRangeCaption = (range, locale, timezone) => `${formatDay(range.start, locale, timezone)} - ${formatDay(range.end, locale, timezone)}`;
|
|
25
56
|
//#endregion
|
|
26
57
|
export { formatRangeCaption, resolveCustomRange };
|
|
27
58
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"range.js","names":[],"sources":["../../src/widgets/range.ts"],"sourcesContent":["import type { DateRange } from '../core/contract'\nimport type { WidgetRange } from './types'\n\n/**\n * Resolve a widget's explicit custom range to a concrete DateRange, or undefined when\n *
|
|
1
|
+
{"version":3,"file":"range.js","names":[],"sources":["../../src/widgets/range.ts"],"sourcesContent":["import type { DateRange } from '../core/contract'\nimport { DATE_ONLY, parseDayOrInstant } from '../query/dates'\nimport { zonedCalendarDay } from '../timeframe/tz'\nimport type { WidgetRange } from './types'\n\nconst NOON_MS = 12 * 3_600_000\n\n/**\n * The calendar day a stored bound names. The `dayOnly` picker stores the picked day at the\n * admin browser's local midnight, so the instant lands on that day or the one before it in\n * UTC depending on the browser's offset; a 12-hour shift recovers the picked day for every\n * offset in (-12, +12]. Zones at +12:45 and beyond (Chatham in DST, Kiritimati) recover the\n * day before, and the uninhabited UTC-12 the day after.\n */\nconst pickedDay = (raw: string): string | null => {\n\tif (DATE_ONLY.test(raw)) {\n\t\treturn raw\n\t}\n\tconst instant = new Date(raw)\n\tif (Number.isNaN(instant.getTime())) {\n\t\treturn null\n\t}\n\treturn zonedCalendarDay(new Date(instant.getTime() + NOON_MS), 'UTC')\n}\n\n/**\n * Resolve a widget's explicit custom range to a concrete DateRange, or undefined when the\n * widget is on a relative preset, the custom range is incomplete, or either bound names no\n * real day (a corrupt or hand-set widgetData would otherwise reach the cache key and throw\n * on `toISOString`). The two picked days are read inclusively in `timezone`, the reporting\n * timezone the read resolves in: `from` at the first instant of its day, `to` at the last.\n */\nexport const resolveCustomRange = (\n\ttimeframe: string | undefined,\n\trange: WidgetRange | undefined,\n\ttimezone: string\n): DateRange | undefined => {\n\tif (timeframe !== 'custom' || !range?.from || !range?.to) {\n\t\treturn undefined\n\t}\n\tconst fromDay = pickedDay(range.from)\n\tconst toDay = pickedDay(range.to)\n\tif (!fromDay || !toDay) {\n\t\treturn undefined\n\t}\n\tconst start = parseDayOrInstant(fromDay, { timezone, edge: 'start' })\n\tconst end = parseDayOrInstant(toDay, { timezone, edge: 'end' })\n\tif (!start || !end) {\n\t\treturn undefined\n\t}\n\treturn { start, end }\n}\n\nconst formatDay = (d: Date, locale: string, timeZone: string): string =>\n\td.toLocaleDateString(locale, { month: 'short', day: 'numeric', year: 'numeric', timeZone })\n\n/**\n * Server-side caption for a custom range, e.g. \"Jun 1, 2026 - Jun 23, 2026\". Both bounds\n * render in the reporting timezone, so the caption names the days that were read rather\n * than the days the server's own zone would spell them as.\n */\nexport const formatRangeCaption = (range: DateRange, locale: string, timezone: string): string =>\n\t`${formatDay(range.start, locale, timezone)} - ${formatDay(range.end, locale, timezone)}`\n"],"mappings":";;;AAKA,MAAM,UAAU,KAAK;;;;;;;;AASrB,MAAM,aAAa,QAA+B;CACjD,IAAI,UAAU,KAAK,GAAG,GACrB,OAAO;CAER,MAAM,UAAU,IAAI,KAAK,GAAG;CAC5B,IAAI,OAAO,MAAM,QAAQ,QAAQ,CAAC,GACjC,OAAO;CAER,OAAO,iBAAiB,IAAI,KAAK,QAAQ,QAAQ,IAAI,OAAO,GAAG,KAAK;AACrE;;;;;;;;AASA,MAAa,sBACZ,WACA,OACA,aAC2B;CAC3B,IAAI,cAAc,YAAY,CAAC,OAAO,QAAQ,CAAC,OAAO,IACrD;CAED,MAAM,UAAU,UAAU,MAAM,IAAI;CACpC,MAAM,QAAQ,UAAU,MAAM,EAAE;CAChC,IAAI,CAAC,WAAW,CAAC,OAChB;CAED,MAAM,QAAQ,kBAAkB,SAAS;EAAE;EAAU,MAAM;CAAQ,CAAC;CACpE,MAAM,MAAM,kBAAkB,OAAO;EAAE;EAAU,MAAM;CAAM,CAAC;CAC9D,IAAI,CAAC,SAAS,CAAC,KACd;CAED,OAAO;EAAE;EAAO;CAAI;AACrB;AAEA,MAAM,aAAa,GAAS,QAAgB,aAC3C,EAAE,mBAAmB,QAAQ;CAAE,OAAO;CAAS,KAAK;CAAW,MAAM;CAAW;AAAS,CAAC;;;;;;AAO3F,MAAa,sBAAsB,OAAkB,QAAgB,aACpE,GAAG,UAAU,MAAM,OAAO,QAAQ,QAAQ,EAAE,KAAK,UAAU,MAAM,KAAK,QAAQ,QAAQ"}
|
|
@@ -10,6 +10,8 @@ interface WidgetReadResult {
|
|
|
10
10
|
dateRange: DateRange;
|
|
11
11
|
metrics: Partial<Record<MetricKey, number>>;
|
|
12
12
|
clamped?: boolean;
|
|
13
|
+
/** True when the engine served a stale cache entry after a failed provider read. */
|
|
14
|
+
stale?: boolean;
|
|
13
15
|
/** Previous-window totals, present only when the adapter supports comparison. */
|
|
14
16
|
previousMetrics?: Partial<Record<MetricKey, number>>;
|
|
15
17
|
/** The previous comparable window, present only when comparison ran. */
|
|
@@ -24,7 +26,17 @@ interface ReadForWidgetArgs {
|
|
|
24
26
|
range?: DateRange;
|
|
25
27
|
/** Explicit scope override; omitted resolves via the plugin's scopeResolver. */
|
|
26
28
|
scope?: string | null;
|
|
29
|
+
/**
|
|
30
|
+
* Reporting timezone the caller already resolved, reused rather than resolved again so
|
|
31
|
+
* a caller-supplied `range` is read in the very timezone it was interpreted in.
|
|
32
|
+
*/
|
|
33
|
+
timezone?: string;
|
|
27
34
|
filters?: AnalyticsFilter[];
|
|
35
|
+
/**
|
|
36
|
+
* Read the previous window too, where the install and the source both allow it. Defaults
|
|
37
|
+
* to on; a caller that never renders a delta passes false to save the second read.
|
|
38
|
+
*/
|
|
39
|
+
comparison?: boolean;
|
|
28
40
|
}
|
|
29
41
|
declare const readForWidget: (args: ReadForWidgetArgs) => Promise<WidgetReadResult>;
|
|
30
42
|
//#endregion
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { satisfiesCapabilities } from "../core/capabilities.js";
|
|
2
1
|
import { getRuntime, resolveTimezoneFor } from "../plugin/runtime.js";
|
|
3
|
-
import { resolveReadContext } from "../core/scopedRead.js";
|
|
4
2
|
import { resolveTimeframe } from "../timeframe/presets.js";
|
|
3
|
+
import { satisfiesCapabilities } from "../core/capabilities.js";
|
|
4
|
+
import { resolveReadContext } from "../core/scopedRead.js";
|
|
5
5
|
import { previousWindow } from "./comparison.js";
|
|
6
6
|
//#region src/widgets/readForWidget.ts
|
|
7
7
|
const readForWidget = async (args) => {
|
|
@@ -11,7 +11,7 @@ const readForWidget = async (args) => {
|
|
|
11
11
|
if (!runtime) return {
|
|
12
12
|
status: "unavailable",
|
|
13
13
|
adapterId: adapterId ?? "",
|
|
14
|
-
dateRange: range ?? resolveTimeframe(timeframe, now),
|
|
14
|
+
dateRange: range ?? resolveTimeframe(timeframe, now, args.timezone),
|
|
15
15
|
metrics: emptyMetrics
|
|
16
16
|
};
|
|
17
17
|
const ctx = await resolveReadContext({
|
|
@@ -23,10 +23,10 @@ const readForWidget = async (args) => {
|
|
|
23
23
|
if (!ctx.ok) return {
|
|
24
24
|
status: "unavailable",
|
|
25
25
|
adapterId: adapterId ?? "",
|
|
26
|
-
dateRange: range ?? resolveTimeframe(timeframe, now),
|
|
26
|
+
dateRange: range ?? resolveTimeframe(timeframe, now, args.timezone),
|
|
27
27
|
metrics: emptyMetrics
|
|
28
28
|
};
|
|
29
|
-
const tz = await resolveTimezoneFor(runtime, req, ctx.scope);
|
|
29
|
+
const tz = args.timezone ?? await resolveTimezoneFor(runtime, req, ctx.scope);
|
|
30
30
|
const dateRange = range ?? resolveTimeframe(timeframe, now, tz);
|
|
31
31
|
const base = {
|
|
32
32
|
dateRange,
|
|
@@ -49,20 +49,30 @@ const readForWidget = async (args) => {
|
|
|
49
49
|
adapterId: adapter.id,
|
|
50
50
|
...base
|
|
51
51
|
};
|
|
52
|
-
const comparisonRange = runtime.comparison && adapter.capabilities.comparison ? previousWindow(dateRange, tz) ?? void 0 : void 0;
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
52
|
+
const comparisonRange = args.comparison !== false && runtime.comparison && adapter.capabilities.comparison ? previousWindow(dateRange, tz) ?? void 0 : void 0;
|
|
53
|
+
let result;
|
|
54
|
+
let previous;
|
|
55
|
+
try {
|
|
56
|
+
[result, previous] = await Promise.all([runtime.engine.read(adapter, {
|
|
57
|
+
metrics,
|
|
58
|
+
dateRange,
|
|
59
|
+
filters,
|
|
60
|
+
timezone: tz,
|
|
61
|
+
scope: ctx.queryScope
|
|
62
|
+
}), comparisonRange ? runtime.engine.read(adapter, {
|
|
63
|
+
metrics,
|
|
64
|
+
dateRange: comparisonRange,
|
|
65
|
+
filters,
|
|
66
|
+
timezone: tz,
|
|
67
|
+
scope: ctx.queryScope
|
|
68
|
+
}) : void 0]);
|
|
69
|
+
} catch {
|
|
70
|
+
return {
|
|
71
|
+
status: "unavailable",
|
|
72
|
+
adapterId: adapter.id,
|
|
73
|
+
...base
|
|
74
|
+
};
|
|
75
|
+
}
|
|
66
76
|
const previousMetrics = previous ? previous.totals ?? {} : void 0;
|
|
67
77
|
return {
|
|
68
78
|
status: "ok",
|
|
@@ -70,6 +80,7 @@ const readForWidget = async (args) => {
|
|
|
70
80
|
dateRange,
|
|
71
81
|
metrics: result.totals ?? {},
|
|
72
82
|
clamped: result.meta.clamped ?? false,
|
|
83
|
+
stale: result.meta.stale ?? false,
|
|
73
84
|
previousMetrics,
|
|
74
85
|
comparisonRange
|
|
75
86
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readForWidget.js","names":[],"sources":["../../src/widgets/readForWidget.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport { satisfiesCapabilities } from '../core/capabilities'\nimport type {
|
|
1
|
+
{"version":3,"file":"readForWidget.js","names":[],"sources":["../../src/widgets/readForWidget.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport { satisfiesCapabilities } from '../core/capabilities'\nimport type {\n\tAnalyticsAdapter,\n\tAnalyticsFilter,\n\tAnalyticsResult,\n\tDateRange,\n\tMetricKey,\n} from '../core/contract'\nimport { resolveReadContext } from '../core/scopedRead'\nimport { getRuntime, resolveTimezoneFor } from '../plugin/runtime'\nimport { resolveTimeframe, type TimeframePreset } from '../timeframe/presets'\nimport { previousWindow } from './comparison'\n\nexport type WidgetReadStatus = 'ok' | 'not-configured' | 'unavailable'\n\nexport interface WidgetReadResult {\n\tstatus: WidgetReadStatus\n\tadapterId: string\n\tdateRange: DateRange\n\tmetrics: Partial<Record<MetricKey, number>>\n\tclamped?: boolean\n\t/** True when the engine served a stale cache entry after a failed provider read. */\n\tstale?: boolean\n\t/** Previous-window totals, present only when the adapter supports comparison. */\n\tpreviousMetrics?: Partial<Record<MetricKey, number>>\n\t/** The previous comparable window, present only when comparison ran. */\n\tcomparisonRange?: DateRange\n}\n\nexport interface ReadForWidgetArgs {\n\treq: PayloadRequest\n\tmetrics: MetricKey[]\n\ttimeframe: TimeframePreset\n\tadapterId?: string\n\tnow: Date\n\trange?: DateRange\n\t/** Explicit scope override; omitted resolves via the plugin's scopeResolver. */\n\tscope?: string | null\n\t/**\n\t * Reporting timezone the caller already resolved, reused rather than resolved again so\n\t * a caller-supplied `range` is read in the very timezone it was interpreted in.\n\t */\n\ttimezone?: string\n\tfilters?: AnalyticsFilter[]\n\t/**\n\t * Read the previous window too, where the install and the source both allow it. Defaults\n\t * to on; a caller that never renders a delta passes false to save the second read.\n\t */\n\tcomparison?: boolean\n}\n\nexport const readForWidget = async (args: ReadForWidgetArgs): Promise<WidgetReadResult> => {\n\tconst { req, metrics, timeframe, adapterId, now, range, filters } = args\n\tconst emptyMetrics = {} as Partial<Record<MetricKey, number>>\n\n\tconst runtime = getRuntime(req.payload)\n\tif (!runtime) {\n\t\treturn {\n\t\t\tstatus: 'unavailable',\n\t\t\tadapterId: adapterId ?? '',\n\t\t\tdateRange: range ?? resolveTimeframe(timeframe, now, args.timezone),\n\t\t\tmetrics: emptyMetrics,\n\t\t}\n\t}\n\tconst ctx = await resolveReadContext({ runtime, req, adapterId, scope: args.scope })\n\tif (!ctx.ok) {\n\t\treturn {\n\t\t\tstatus: 'unavailable',\n\t\t\tadapterId: adapterId ?? '',\n\t\t\tdateRange: range ?? resolveTimeframe(timeframe, now, args.timezone),\n\t\t\tmetrics: emptyMetrics,\n\t\t}\n\t}\n\tconst tz = args.timezone ?? (await resolveTimezoneFor(runtime, req, ctx.scope))\n\tconst dateRange = range ?? resolveTimeframe(timeframe, now, tz)\n\tconst base = { dateRange, metrics: emptyMetrics }\n\tconst adapter: AnalyticsAdapter = ctx.adapter\n\tif (!adapter.isConfigured()) {\n\t\treturn { status: 'not-configured', adapterId: adapter.id, ...base }\n\t}\n\tif (\n\t\t!satisfiesCapabilities(adapter.capabilities, {\n\t\t\tmetrics,\n\t\t\t...(filters && filters.length > 0\n\t\t\t\t? {\n\t\t\t\t\t\tfilters: filters.map((f) => f.dimension),\n\t\t\t\t\t\tfilterOperators: filters.map((f) => f.operator),\n\t\t\t\t\t}\n\t\t\t\t: {}),\n\t\t})\n\t) {\n\t\treturn { status: 'unavailable', adapterId: adapter.id, ...base }\n\t}\n\tconst comparisonRange =\n\t\targs.comparison !== false && runtime.comparison && adapter.capabilities.comparison\n\t\t\t? (previousWindow(dateRange, tz) ?? undefined)\n\t\t\t: undefined\n\tlet result: AnalyticsResult\n\tlet previous: AnalyticsResult | undefined\n\ttry {\n\t\t;[result, previous] = await Promise.all([\n\t\t\truntime.engine.read(adapter, {\n\t\t\t\tmetrics,\n\t\t\t\tdateRange,\n\t\t\t\tfilters,\n\t\t\t\ttimezone: tz,\n\t\t\t\tscope: ctx.queryScope,\n\t\t\t}),\n\t\t\tcomparisonRange\n\t\t\t\t? runtime.engine.read(adapter, {\n\t\t\t\t\t\tmetrics,\n\t\t\t\t\t\tdateRange: comparisonRange,\n\t\t\t\t\t\tfilters,\n\t\t\t\t\t\ttimezone: tz,\n\t\t\t\t\t\tscope: ctx.queryScope,\n\t\t\t\t\t})\n\t\t\t\t: undefined,\n\t\t])\n\t} catch {\n\t\t// No cache entry (fresh or stale) survived the failed read; degrade like an\n\t\t// unsupported capability instead of throwing through the widget render tree.\n\t\treturn { status: 'unavailable', adapterId: adapter.id, ...base }\n\t}\n\tconst previousMetrics = previous ? (previous.totals ?? {}) : undefined\n\treturn {\n\t\tstatus: 'ok',\n\t\tadapterId: adapter.id,\n\t\tdateRange,\n\t\tmetrics: result.totals ?? {},\n\t\tclamped: result.meta.clamped ?? false,\n\t\tstale: result.meta.stale ?? false,\n\t\tpreviousMetrics,\n\t\tcomparisonRange,\n\t}\n}\n"],"mappings":";;;;;;AAoDA,MAAa,gBAAgB,OAAO,SAAuD;CAC1F,MAAM,EAAE,KAAK,SAAS,WAAW,WAAW,KAAK,OAAO,YAAY;CACpE,MAAM,eAAe,CAAC;CAEtB,MAAM,UAAU,WAAW,IAAI,OAAO;CACtC,IAAI,CAAC,SACJ,OAAO;EACN,QAAQ;EACR,WAAW,aAAa;EACxB,WAAW,SAAS,iBAAiB,WAAW,KAAK,KAAK,QAAQ;EAClE,SAAS;CACV;CAED,MAAM,MAAM,MAAM,mBAAmB;EAAE;EAAS;EAAK;EAAW,OAAO,KAAK;CAAM,CAAC;CACnF,IAAI,CAAC,IAAI,IACR,OAAO;EACN,QAAQ;EACR,WAAW,aAAa;EACxB,WAAW,SAAS,iBAAiB,WAAW,KAAK,KAAK,QAAQ;EAClE,SAAS;CACV;CAED,MAAM,KAAK,KAAK,YAAa,MAAM,mBAAmB,SAAS,KAAK,IAAI,KAAK;CAC7E,MAAM,YAAY,SAAS,iBAAiB,WAAW,KAAK,EAAE;CAC9D,MAAM,OAAO;EAAE;EAAW,SAAS;CAAa;CAChD,MAAM,UAA4B,IAAI;CACtC,IAAI,CAAC,QAAQ,aAAa,GACzB,OAAO;EAAE,QAAQ;EAAkB,WAAW,QAAQ;EAAI,GAAG;CAAK;CAEnE,IACC,CAAC,sBAAsB,QAAQ,cAAc;EAC5C;EACA,GAAI,WAAW,QAAQ,SAAS,IAC7B;GACA,SAAS,QAAQ,KAAK,MAAM,EAAE,SAAS;GACvC,iBAAiB,QAAQ,KAAK,MAAM,EAAE,QAAQ;EAC/C,IACC,CAAC;CACL,CAAC,GAED,OAAO;EAAE,QAAQ;EAAe,WAAW,QAAQ;EAAI,GAAG;CAAK;CAEhE,MAAM,kBACL,KAAK,eAAe,SAAS,QAAQ,cAAc,QAAQ,aAAa,aACpE,eAAe,WAAW,EAAE,KAAK,KAAA,IAClC,KAAA;CACJ,IAAI;CACJ,IAAI;CACJ,IAAI;EACF,CAAC,QAAQ,YAAY,MAAM,QAAQ,IAAI,CACvC,QAAQ,OAAO,KAAK,SAAS;GAC5B;GACA;GACA;GACA,UAAU;GACV,OAAO,IAAI;EACZ,CAAC,GACD,kBACG,QAAQ,OAAO,KAAK,SAAS;GAC7B;GACA,WAAW;GACX;GACA,UAAU;GACV,OAAO,IAAI;EACZ,CAAC,IACA,KAAA,CACJ,CAAC;CACF,QAAQ;EAGP,OAAO;GAAE,QAAQ;GAAe,WAAW,QAAQ;GAAI,GAAG;EAAK;CAChE;CACA,MAAM,kBAAkB,WAAY,SAAS,UAAU,CAAC,IAAK,KAAA;CAC7D,OAAO;EACN,QAAQ;EACR,WAAW,QAAQ;EACnB;EACA,SAAS,OAAO,UAAU,CAAC;EAC3B,SAAS,OAAO,KAAK,WAAW;EAChC,OAAO,OAAO,KAAK,SAAS;EAC5B;EACA;CACD;AACD"}
|
|
@@ -7,6 +7,8 @@ import { PayloadRequest } from "payload";
|
|
|
7
7
|
interface BreakdownRow {
|
|
8
8
|
label: string;
|
|
9
9
|
value: number;
|
|
10
|
+
/** Every metric the read asked for, present only when `extraMetrics` asked for more. */
|
|
11
|
+
metrics?: Partial<Record<MetricKey, number>>;
|
|
10
12
|
}
|
|
11
13
|
interface WidgetBreakdownResult {
|
|
12
14
|
status: WidgetReadStatus;
|
|
@@ -14,6 +16,8 @@ interface WidgetBreakdownResult {
|
|
|
14
16
|
dateRange: DateRange;
|
|
15
17
|
rows: BreakdownRow[];
|
|
16
18
|
clamped?: boolean;
|
|
19
|
+
/** True when the engine served a stale cache entry after a failed provider read. */
|
|
20
|
+
stale?: boolean;
|
|
17
21
|
}
|
|
18
22
|
interface ReadForWidgetBreakdownArgs {
|
|
19
23
|
req: PayloadRequest;
|
|
@@ -26,7 +30,18 @@ interface ReadForWidgetBreakdownArgs {
|
|
|
26
30
|
range?: DateRange;
|
|
27
31
|
/** Explicit scope override; omitted resolves via the plugin's scopeResolver. */
|
|
28
32
|
scope?: string | null;
|
|
33
|
+
/**
|
|
34
|
+
* Reporting timezone the caller already resolved, reused rather than resolved again so
|
|
35
|
+
* a caller-supplied `range` is read in the very timezone it was interpreted in.
|
|
36
|
+
*/
|
|
37
|
+
timezone?: string;
|
|
29
38
|
filters?: AnalyticsFilter[];
|
|
39
|
+
/**
|
|
40
|
+
* Further metrics to read alongside the ranked one, narrowed to what the source serves
|
|
41
|
+
* so an unsupported one never turns the whole read unavailable. They reach each row's
|
|
42
|
+
* `metrics`; ranking and status still follow `metric` alone.
|
|
43
|
+
*/
|
|
44
|
+
extraMetrics?: MetricKey[];
|
|
30
45
|
}
|
|
31
46
|
/**
|
|
32
47
|
* Site-wide ranked breakdown of one metric by one dimension, read through the engine.
|