@datawheel/data-explorer 0.3.7-rc.2 → 0.3.7-rc.3

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/dist/main.d.mts CHANGED
@@ -760,8 +760,10 @@ declare const defaultTranslation: {
760
760
  series: string;
761
761
  series_members: string;
762
762
  main: string;
763
+ measure_over_period: string;
763
764
  main_over_period: string;
764
765
  main_on_period: string;
766
+ measure_on_period: string;
765
767
  total: string;
766
768
  };
767
769
  transient: {
package/dist/main.mjs CHANGED
@@ -471,8 +471,10 @@ var defaultTranslation = {
471
471
  series: "{{series}}",
472
472
  series_members: "{{series}} ({{members}})",
473
473
  main: "{{values}} by {{series}}",
474
+ measure_over_period: "{{values}} over {{time}}",
474
475
  main_over_period: "{{values}} by {{series}} over {{time}}",
475
476
  main_on_period: "{{values}} by {{series}} on {{time_period}}",
477
+ measure_on_period: "{{measure}} on {{period}}",
476
478
  total: "Total: {{value}}"
477
479
  },
478
480
  transient: {
@@ -8058,18 +8060,23 @@ function buildDonutConfig(chart, params) {
8058
8060
  return config;
8059
8061
  }
8060
8062
  function buildLineplotConfig(chart, params) {
8061
- const { datagroup, values, series, time } = chart;
8063
+ const { datagroup, values, series, timeline } = chart;
8062
8064
  const { fullMode, getFormatter, t } = params;
8063
8065
  const { columns, dataset, locale } = datagroup;
8064
8066
  const measureFormatter = getFormatter(values.measure);
8065
8067
  const config = {
8066
8068
  data: dataset,
8067
8069
  discrete: "x",
8068
- label: (d) => series.map((series2) => d[series2.level.name]).join("\n"),
8070
+ label: (d) => {
8071
+ return series.map((series2) => d[series2.level.name]).join("\n") || t("vizbuilder.title.measure_on_period", {
8072
+ measure: values.measure.caption,
8073
+ period: d[timeline.level.name]
8074
+ });
8075
+ },
8069
8076
  legend: fullMode,
8070
8077
  locale,
8071
- groupBy: series.map((series2) => series2.name),
8072
- time: time.level.name,
8078
+ groupBy: series.length ? series.map((series2) => series2.name) : void 0,
8079
+ time: timeline.level.name,
8073
8080
  timeline: fullMode,
8074
8081
  timelineConfig: {
8075
8082
  brushing: true,
@@ -8084,9 +8091,9 @@ function buildLineplotConfig(chart, params) {
8084
8091
  },
8085
8092
  total: false,
8086
8093
  totalFormat: (d) => t("vizbuilder.title.total", { value: measureFormatter(d, locale) }),
8087
- x: time.level.name,
8094
+ x: timeline.level.name,
8088
8095
  xConfig: {
8089
- title: time.level.caption
8096
+ title: timeline.level.caption
8090
8097
  },
8091
8098
  y: values.measure.name,
8092
8099
  yConfig: {
@@ -8162,7 +8169,9 @@ function _buildTitle(t, chart) {
8162
8169
  const [mainSeries, otherSeries] = series;
8163
8170
  const { measure } = values;
8164
8171
  const timeline = chart.timeline || chart.time;
8172
+ console.log({ chart });
8165
8173
  const seriesStr = (series2) => {
8174
+ if (!series2) return "";
8166
8175
  const { members } = series2.captions[series2.level.name];
8167
8176
  if (series2.members.length < 5) {
8168
8177
  return t("vizbuilder.title.series_members", {
@@ -8181,14 +8190,17 @@ function _buildTitle(t, chart) {
8181
8190
  return (data) => {
8182
8191
  const aggregator = measure.annotations.aggregation_method || measure.aggregator;
8183
8192
  const valuesKey = `vizbuilder.aggregator.${aggregator.toLowerCase()}`;
8184
- const values2 = t(valuesKey, { measure: measure.caption });
8193
+ const values2 = otherSeries ? t(valuesKey, { measure: measure.caption }) : measure.caption;
8185
8194
  const config = {
8186
8195
  values: values2 === valuesKey ? measure.caption : values2,
8196
+ measure: values2 === valuesKey ? measure.caption : values2,
8187
8197
  series: otherSeries ? _buildTranslatedList(t, [seriesStr(mainSeries), seriesStr(otherSeries)]) : seriesStr(mainSeries),
8188
8198
  time: timeline == null ? void 0 : timeline.level.caption,
8199
+ period: timeline == null ? void 0 : timeline.level.caption,
8189
8200
  time_period: timeline ? getLast(getMembers(data, timeline)) : ""
8190
8201
  };
8191
8202
  if (isOneOf(chart.type, ["lineplot", "stackedarea"])) {
8203
+ if (!series.length) return t("vizbuilder.title.measure_over_period", config);
8192
8204
  return t("vizbuilder.title.main_over_period", config);
8193
8205
  }
8194
8206
  if (timeline) return t("vizbuilder.title.main_on_period", config);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@datawheel/data-explorer",
3
- "version": "0.3.7-rc.2",
3
+ "version": "0.3.7-rc.3",
4
4
  "main": "./dist/main.mjs",
5
5
  "types": "./dist/main.d.mts",
6
6
  "files": [