Merge branch 'main' into CHARTS-10533-Support-full-title-on-mobile-widgets

Author: flops

.github/workflows/e2e_tests.yml

@@ -159,7 +159,7 @@ jobs:
           echo "reports/${{ github.head_ref || github.ref_name }}/${{ github.run_id }}/${{ github.run_attempt }}" > ./tests/artifacts/report-link
           echo "${{ github.event.pull_request.number }}" > ./tests/artifacts/report-pr
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report

.github/workflows/i18n-check.yml

@@ -25,7 +25,7 @@ concurrency:
 jobs:
     i18n_check:
         runs-on: ubuntu-latest
-        if: github.actor != 'WeblateGravity' && github.event.pull_request.draft == false
+        if: github.actor != 'datalens-weblate-robot' && github.event.pull_request.draft == false
         steps:
             - uses: actions/checkout@v4
               with:

.github/workflows/publish_platform.yaml

@@ -82,8 +82,9 @@ jobs:
         run: |
           mkdir -p ./workflow_ref
           echo "${{ env.NEW_BRANCH }}" > ./workflow_ref/ref
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: workflow_ref
           path: ./workflow_ref/
-          retention-days: 30
+          retention-days: 30
+          overwrite: true

.github/workflows/publish_platform_hotfix.yaml

@@ -62,8 +62,9 @@ jobs:
         run: |
           mkdir -p ./workflow_ref
           echo "${{ env.NEW_BRANCH }}" > ./workflow_ref/ref
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: workflow_ref
           path: ./workflow_ref/
-          retention-days: 30
+          retention-days: 30
+          overwrite: true

.github/workflows/statoscope_tests.yml

@@ -41,3 +41,4 @@ jobs:
           name: statoscope-report
           path: ./report/statoscope/
           retention-days: 1
+          overwrite: true

.github/workflows/statoscope_upload_main_stats.yml

@@ -20,4 +20,5 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: main-stats
-          path: ./reference.json
+          path: ./reference.json
+          overwrite: true

package-lock.json

@@ -123,12 +123,15 @@ export const getRowHeaderCellMetadata = (args: GetHeaderCellMetadataArgs): Chart
     // Formatting a column cell
     if (isNumericalDataType(field.data_type)) {
         cell.type = 'number';
-        cell.value = isNaN(Number(value)) ? value : Number(value);
-        cell.formattedValue = chartKitFormatNumberWrapper(cell.value, {
-            lang: 'ru',
-            ...getFormatOptions(field),
-        });
         cell.fieldId = field.guid;
+
+        if (value !== null) {
+            cell.value = isNaN(Number(value)) ? value : Number(value);
+            cell.formattedValue = chartKitFormatNumberWrapper(cell.value, {
+                lang: 'ru',
+                ...getFormatOptions(field),
+            });
+        }
     } else if (isDateField(field) && value) {
         cell.formattedValue = formatDate({
             valueType: field.data_type,

src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/table-head-generator.ts

@@ -120,6 +120,7 @@ export type DashTabItem =
     | DashTabItemImage;
 
 type BackgroundSettings = {
+    enabled?: boolean;
     color: string;
 };
 

src/shared/types/dash.ts

@@ -32,7 +32,9 @@ function PluginImage(props: Props, _ref?: React.LegacyRef<HTMLDivElement>) {
         w: null,
     };
     const backgroundEnabled = Boolean(
-        background?.color && background?.color !== CustomPaletteColors.NONE,
+        background?.enabled !== false &&
+            background?.color &&
+            background?.color !== CustomPaletteColors.NONE,
     );
     const {classMod, style} = React.useMemo(() => {
         return getPreparedWrapSettings(backgroundEnabled, background?.color);

src/ui/components/DashKit/plugins/Image/Image.tsx

@@ -150,7 +150,9 @@ const textPlugin = {
         const data = props.data as DashTabItemText['data'];
 
         const showBgColor = Boolean(
-            data.background?.color && data.background?.color !== CustomPaletteColors.NONE,
+            data.background?.enabled !== false &&
+                data.background?.color &&
+                data.background?.color !== CustomPaletteColors.NONE,
         );
 
         const {classMod, style} = getPreparedWrapSettings(showBgColor, data.background?.color);

src/ui/components/DashKit/plugins/Text/Text.tsx

@@ -96,7 +96,9 @@ const titlePlugin: PluginTitle = {
         const content = <DashKitPluginTitle {...props} ref={forwardedRef} />;
 
         const showBgColor = Boolean(
-            data.background?.color && data.background?.color !== CustomPaletteColors.NONE,
+            data.background?.enabled !== false &&
+                data.background?.color &&
+                data.background?.color !== CustomPaletteColors.NONE,
         );
 
         const {classMod, style} = getPreparedWrapSettings(showBgColor, data.background?.color);

src/ui/components/DashKit/plugins/Title/Title.tsx

@@ -21,7 +21,7 @@ export type CurrentTab = {
     autoHeight?: boolean;
     enableActionParams?: boolean;
     background?: {
-        enabled: boolean;
+        enabled?: boolean;
         color: string;
     };
 };

src/ui/components/DashKit/plugins/Widget/types.ts

@@ -496,7 +496,7 @@ export const ChartWidget = (props: ChartWidgetProps) => {
     }, [editMode, widgetType]);
 
     const showBgColor = Boolean(
-        currentTab.background?.enabled &&
+        currentTab?.enabled !== false &&
             currentTab.background?.color &&
             currentTab.background?.color !== 'transparent',
     );

src/ui/components/Widgets/Chart/ChartWidget.tsx

@@ -21,6 +21,11 @@ datalensTest.describe('Wizard', () => {
             const previewLoader = chartContainer.locator(slct(ChartKitQa.Loader));
 
             await wizardPage.createNewFieldWithFormula('Null', 'float(null)');
+            await wizardPage.sectionVisualization.addFieldByClick(
+                PlaceholderName.PivotTableColumns,
+                'Null',
+            );
+            await wizardPage.sectionVisualization.addFieldByClick(PlaceholderName.Rows, 'Null');
             await wizardPage.sectionVisualization.addFieldByClick(PlaceholderName.Measures, 'Null');
 
             await expect(previewLoader).not.toBeVisible();