From f98c10abf9fcbd6f30ae50d6f97a0d5b096fcfc4 Mon Sep 17 00:00:00 2001 From: Alexander Bulychev Date: Tue, 7 May 2024 14:28:22 +0400 Subject: [PATCH] Fixes, remove @ts-expect-error --- apps/demos/package.json | 1 + packages/devextreme-angular/package.json | 3 +- .../devextreme-monorepo-tools/package.json | 5 +- .../r1/components/base/all_day_panel_cell.tsx | 1 - .../components/base/all_day_panel_table.tsx | 2 - .../base/all_day_panel_table_body.tsx | 2 - .../r1/components/base/date_header.tsx | 2 - .../r1/components/base/date_header_cell.tsx | 1 - .../r1/components/base/date_table.tsx | 2 - .../r1/components/base/date_table_body.tsx | 2 - .../components/base/date_table_cell_base.tsx | 1 - .../r1/components/base/group_panel.tsx | 1 - .../base/group_panel_horizontal.tsx | 1 - .../base/group_panel_horizontal_row.tsx | 1 - .../components/base/group_panel_vertical.tsx | 1 - .../base/group_panel_vertical_row.tsx | 1 - .../r1/components/base/header_panel.tsx | 2 - .../scheduler/r1/components/base/row.tsx | 2 - .../scheduler/r1/components/base/table.tsx | 2 - .../r1/components/base/time_panel_cell.tsx | 1 - .../r1/components/base/time_panel_table.tsx | 6 - .../r1/components/base/virtual_cell.tsx | 1 - .../r1/components/base/virtual_row.tsx | 2 - .../r1/components/month/date_table_month.tsx | 1 - .../month/date_table_month_cell.tsx | 1 - .../timeline/date_header_timeline.tsx | 2 - .../timeline/header_panel_timeline.tsx | 1 - pnpm-lock.yaml | 108 ++++++++++++++---- 28 files changed, 93 insertions(+), 63 deletions(-) diff --git a/apps/demos/package.json b/apps/demos/package.json index d48c85e2e31a..bcb1aa1e486f 100644 --- a/apps/demos/package.json +++ b/apps/demos/package.json @@ -92,6 +92,7 @@ "gulp-minify": "3.1.0", "gulp-replace": "1.1.4", "jest": "26.6.3", + "jest-environment-node": "26.6.2", "lodash.partial": "4.2.1", "looks-same": "7.3.0", "minimist": "1.2.8", diff --git a/packages/devextreme-angular/package.json b/packages/devextreme-angular/package.json index d47ea31cc091..21acbd536267 100644 --- a/packages/devextreme-angular/package.json +++ b/packages/devextreme-angular/package.json @@ -24,7 +24,6 @@ "devextreme": "~24.1.1" }, "devDependencies": { - "@webcomponents/custom-elements": "^1.6.0", "@angular/animations": "^16.2.10", "@angular/cli": "^16.2.10", "@angular/common": "^16.2.10", @@ -37,6 +36,7 @@ "@angular/platform-server": "^16.2.12", "@types/jasmine": "2.8.23", "@types/node": "~20.11.0", + "@webcomponents/custom-elements": "^1.6.0", "codelyzer": "6.0.2", "core-js": "^2.6.12", "del": "^2.2.2", @@ -53,6 +53,7 @@ "karma-webpack": "^5.0.0", "ng-packagr": "16.2.0", "puppeteer": "^19.11.1", + "reflect-metadata": "0.1.13", "rxjs": "^6.6.7", "stream-browserify": "^3.0.0", "tslib": "^2.6.1", diff --git a/packages/devextreme-monorepo-tools/package.json b/packages/devextreme-monorepo-tools/package.json index 4c3ab44f179d..95f095afcd7e 100644 --- a/packages/devextreme-monorepo-tools/package.json +++ b/packages/devextreme-monorepo-tools/package.json @@ -1,4 +1,7 @@ { "name": "devextreme-monorepo-tools", - "version": "24.1.1" + "version": "24.1.1", + "devDependencies": { + "ts-jest": "26.5.6" + } } diff --git a/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_cell.tsx b/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_cell.tsx index 1846784a9490..b78538a4f45f 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_cell.tsx +++ b/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_cell.tsx @@ -23,7 +23,6 @@ export class AllDayPanelCell extends BaseInfernoComponent const DataCellTemplateComponent = getTemplate(dataCellTemplate); return ( - // @ts-expect-error TS2786 - {/* @ts-expect-error TS2786 */} ( - // @ts-expect-error TS2786 { <> { dataMap.map((dateHeaderRow, rowIndex) => ( - // @ts-expect-error TS2786 { text, today, }) => ( - // @ts-expect-error TS2786 { ) : ( - // @ts-expect-error TS2786 { const DataCellTemplateComponent = getTemplate(dataCellTemplate); return ( - // @ts-expect-error TS2786
{ className={classes} width={width} > - {/* @ts-expect-error TS2786 */} { }) => ( { - // @ts-expect-error TS2786 isGroupedAllDayPanel && { cells, key: rowKey, }) => ( - // @ts-expect-error TS2786 { const Layout = isVerticalLayout ? GroupPanelVertical : GroupPanelHorizontal; return ( - // @ts-expect-error TS2786 { - // @ts-expect-error TS2786 groupPanelItems.map((group) => {
{ groupPanelData.groupPanelItems - // @ts-expect-error TS2786 .map((group) => {
{ isHorizontalGrouping && !groupByDate && ( - // @ts-expect-error TS2786 { } { groupByDate && ( - // @ts-expect-error TS2786 { hasLeftVirtualCell && leftVirtualCellCount != null && splitNumber(leftVirtualCellCount, MAX_COL_SPAN).map( - // @ts-expect-error TS2786 (colSpan, index) => { hasRightVirtualCell && rightVirtualCellCount != null && splitNumber(rightVirtualCellCount, MAX_COL_SPAN).map( - // @ts-expect-error TS2786 (colSpan, index) => { { hasTopVirtualRow && ( - // @ts-expect-error TS2786 { {children} { hasBottomVirtualRow && ( - // @ts-expect-error TS2786 { const TimeCellTemplateComponent = getTemplate(timeCellTemplate); return ( - // @ts-expect-error TS2786 const TimeCellTemplateComponent = getTemplate(timeCellTemplate); return ( - // @ts-expect-error TS2786
{ isGroupedAllDayPanel && ( - // @ts-expect-error TS2786 - {/* @ts-expect-error TS2786 */} - {/* @ts-expect-error TS2786 */} @@ -96,14 +92,12 @@ export class TimePanelTable extends InfernoWrapperComponent startDate, text, }) => ( - // @ts-expect-error TS2786 - {/* @ts-expect-error TS2786 */} { const Cell = isHeaderCell ? HeaderCell : OrdinaryCell; return ( - // @ts-expect-error TS2786 { const virtualCells = this.getVirtualCells(); return ( - // @ts-expect-error TS2786 { { virtualCells.map( (_, index) => ( - // @ts-expect-error TS2786 { const DataCellTemplateComponent = getTemplate(dataCellTemplate); return ( - // @ts-expect-error TS2786 ( - // @ts-expect-error TS2786