Skip to content

Commit

Permalink
Merge branch 'main' into CHARTS-10715
Browse files Browse the repository at this point in the history
  • Loading branch information
artemipanchuk authored Dec 10, 2024
2 parents 3ecfb57 + 784ea72 commit 4b5913b
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/publish_platform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions .github/workflows/publish_platform_hotfix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .github/workflows/statoscope_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ jobs:
name: statoscope-report
path: ./report/statoscope/
retention-days: 1
overwrite: true
3 changes: 2 additions & 1 deletion .github/workflows/statoscope_upload_main_stats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: main-stats
path: ./reference.json
path: ./reference.json
overwrite: true
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 4b5913b

Please sign in to comment.