fix type

datalens-tech · Dec 28, 2024 · 22cb035 · 22cb035
1 parent a76a985
commit 22cb035
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 12 deletions.
diff --git a/src/server/modes/charts/plugins/datalens/preparers/bar-x/d3.ts b/src/server/modes/charts/plugins/datalens/preparers/bar-x/d3.ts
@@ -4,7 +4,7 @@ import type {
     ChartKitWidgetData,
 } from '@gravity-ui/chartkit/build/types/widget-data';
 
-import type {SeriesExportSettings, ServerField} from '../../../../../../../shared';
+import type {SeriesExportSettings, ServerField, WrappedMarkdown} from '../../../../../../../shared';
 import {
     AxisMode,
     LabelsPositions,
@@ -29,7 +29,7 @@ type OldBarXDataItem = {
 } | null;
 
 type ExtendedBaXrSeriesData = Omit<BarXSeriesData, 'x'> & {
-    x?: BarXSeriesData['x'] | WrappedHTML;
+    x?: BarXSeriesData['x'] | WrappedHTML | WrappedMarkdown;
 };
 
 type ExtendedBarXSeries = Omit<BarXSeries, 'data'> & {

diff --git a/src/server/modes/charts/plugins/datalens/preparers/bar-x/prepare-bar-x.ts b/src/server/modes/charts/plugins/datalens/preparers/bar-x/prepare-bar-x.ts
@@ -6,6 +6,7 @@ import type {
     ServerPlaceholder,
     WizardVisualizationId,
     WrappedHTML,
+    WrappedMarkdown,
 } from '../../../../../../../shared';
 import {
     AxisMode,
@@ -514,7 +515,9 @@ export function prepareBarX(args: PrepareFunctionArgs) {
 
             return {
                 graphs,
-                categories: categories.map<string | WrappedHTML>(categoriesFormatter),
+                categories: categories.map<string | WrappedHTML | WrappedMarkdown>(
+                    categoriesFormatter,
+                ),
             };
         } else {
             return {graphs};

diff --git a/src/server/modes/charts/plugins/datalens/preparers/bar-y/prepare-bar-y-data.ts b/src/server/modes/charts/plugins/datalens/preparers/bar-y/prepare-bar-y-data.ts
@@ -4,6 +4,7 @@ import type {
     ServerPlaceholder,
     WizardVisualizationId,
     WrappedHTML,
+    WrappedMarkdown,
 } from '../../../../../../../shared';
 import {
     AxisMode,
@@ -466,7 +467,9 @@ export function prepareBarYData({
         if (isXCategoryAxis) {
             return {
                 graphs,
-                categories: categories.map<string | WrappedHTML>(categoriesFormatter),
+                categories: categories.map<string | WrappedHTML | WrappedMarkdown>(
+                    categoriesFormatter,
+                ),
             };
         } else {
             return {graphs};
@@ -523,7 +526,12 @@ export function prepareBarYData({
         if (xIsDate && xAxisMode !== AxisMode.Discrete) {
             return {graphs, categories_ms: categories};
         } else {
-            return {graphs, categories: categories.map<string | WrappedHTML>(categoriesFormatter)};
+            return {
+                graphs,
+                categories: categories.map<string | WrappedHTML | WrappedMarkdown>(
+                    categoriesFormatter,
+                ),
+            };
         }
     }
 }
diff --git a/src/server/modes/charts/plugins/datalens/preparers/line/d3.ts b/src/server/modes/charts/plugins/datalens/preparers/line/d3.ts
@@ -4,7 +4,12 @@ import type {
     LineSeriesData,
 } from '@gravity-ui/chartkit/build/types/widget-data';
 
-import type {SeriesExportSettings, ServerField, WrappedHTML} from '../../../../../../../shared';
+import type {
+    SeriesExportSettings,
+    ServerField,
+    WrappedHTML,
+    WrappedMarkdown,
+} from '../../../../../../../shared';
 import {AxisMode, PlaceholderId, getXAxisMode} from '../../../../../../../shared';
 import {getFormattedLabel} from '../../d3/utils/dataLabels';
 import {getConfigWithActualFieldTypes} from '../../utils/config-helpers';
@@ -15,7 +20,7 @@ import type {PrepareFunctionArgs} from '../types';
 import {prepareLineData} from './prepare-line-data';
 
 type ExtendedLineSeriesData = Omit<LineSeriesData, 'x'> & {
-    x?: LineSeriesData['x'] | WrappedHTML;
+    x?: LineSeriesData['x'] | WrappedHTML | WrappedMarkdown;
 };
 
 type ExtendedLineSeries = Omit<LineSeries, 'data'> & {

diff --git a/src/server/modes/charts/plugins/datalens/preparers/line/prepare-line-data.ts b/src/server/modes/charts/plugins/datalens/preparers/line/prepare-line-data.ts
@@ -1,7 +1,11 @@
 import _isEmpty from 'lodash/isEmpty';
 import isNil from 'lodash/isNil';
 
-import type {HighchartsSeriesCustomObject, WrappedHTML} from '../../../../../../../shared';
+import type {
+    HighchartsSeriesCustomObject,
+    WrappedHTML,
+    WrappedMarkdown,
+} from '../../../../../../../shared';
 import {
     AxisMode,
     AxisNullsMode,
@@ -562,7 +566,9 @@ export function prepareLineData(args: PrepareFunctionArgs) {
         if (isXCategoryAxis) {
             return {
                 graphs,
-                categories: categories.map<string | WrappedHTML>(categoriesFormatter),
+                categories: categories.map<string | WrappedHTML | WrappedMarkdown>(
+                    categoriesFormatter,
+                ),
             };
         } else {
             return {graphs};
@@ -621,6 +627,9 @@ export function prepareLineData(args: PrepareFunctionArgs) {
             return {graphs, categories_ms: categories};
         }
 
-        return {graphs, categories: categories.map<string | WrappedHTML>(categoriesFormatter)};
+        return {
+            graphs,
+            categories: categories.map<string | WrappedHTML | WrappedMarkdown>(categoriesFormatter),
+        };
     }
 }
diff --git a/src/server/modes/charts/plugins/datalens/utils/misc-helpers.ts b/src/server/modes/charts/plugins/datalens/utils/misc-helpers.ts
@@ -432,10 +432,10 @@ export function getSeriesTitleFormatter(args: {fields: (ServerField | undefined)
     const {fields} = args;
 
     if (fields.some(isHtmlField)) {
-        return (value: string) => wrapHtml(String(value));
+        return (value?: string) => wrapHtml(String(value ?? ''));
     }
 
-    return (value: string) => value;
+    return (value?: string) => value ?? '';
 }
 
 export {