Skip to content

Commit

Permalink
Merge branch 24_2 of https://github.com/DevExpress/DevExtreme into ma…
Browse files Browse the repository at this point in the history
…pIdDeclarations__24_2
  • Loading branch information
Zedwag committed Sep 25, 2024
2 parents d5e2d61 + 78ac6d6 commit d68c6a6
Show file tree
Hide file tree
Showing 517 changed files with 17,497 additions and 4,312 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup-chrome/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ runs:
run: |
if [ -n "$CHROME_VERSION" ]; then
sudo apt-get update
sudo apt-get install libu2f-udev
sudo apt-get -y install libu2f-udev
curl -L "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}-1_amd64.deb" > /tmp/chrome.deb
sudo dpkg -i /tmp/chrome.deb
unlink /tmp/chrome.deb
Expand Down
33 changes: 32 additions & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"@devextreme/runtime",
"devexpress-gantt",
"devexpress-diagram",
"eslint-config-devextreme",
"rrule",
"sass-embedded",
"systemjs"
Expand All @@ -67,6 +66,38 @@
"automerge": true,
"matchDatasources": [ "npm" ],
"minimumReleaseAge": "7 days"
},
{
"matchPackageNames": [
"gulp-sass",
"gulp-babel",
"gulp-typescript",
"gulp-clean",
"gulp-minify",
"gulp-replace",
"gulp-sourcemaps",
"gulp-cache",
"gulp-plumber",
"gulp-shell",
"gulp-cached",
"gulp-concat",
"gulp-each",
"gulp-eol",
"gulp-file",
"gulp-flatmap",
"gulp-footer",
"gulp-header",
"gulp-if",
"gulp-jsbeautifier",
"gulp-multi-process",
"gulp-notify",
"gulp-remote-src",
"gulp-rename",
"gulp-tap",
"gulp-uglify-es",
"gulp-watch"
],
"enabled": false
}
],
"lockFileMaintenance": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_security-alerts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if_no_artifact_found: warn

- name: Teams Notification
uses: DevExpress/github-actions/send-teams-notification@main
uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{ secrets.TEAMS_SECURITY_ALERTS }}
alerts: ${{ needs.fetch.outputs.alerts }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
restore-keys: ${{ runner.os }}-${{ matrix.branch }}-${{ matrix.language }}

- name: Teams Notification
uses: DevExpress/github-actions/send-teams-notification@main
uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{ secrets.TEAMS_HOOK_TMP }}
alerts: ${{ env.ALERTS }}
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/packages_publishing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
required: false

env:
NX_SKIP_NX_CACHE: true
FILTER: ${{ github.event_name == 'workflow_dispatch' && inputs.filter || '' }}
SET_TIMESTAMP_VERSION: ${{ inputs.tag == 'daily' }}
MOVE_DAILY_TAG: ${{ inputs.tag == 'daily' }}
Expand Down Expand Up @@ -207,7 +208,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/paths.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-filter-stubs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- name: .md files filter
id: mdFilesFilter
uses: DevExpress/github-actions/pr-filter@main
uses: DevExpress/github-actions/pr-filter@v1
with:
paths: '**;!apps/**/*.md'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qunit_tests-additional-renovation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qunit_tests-renovation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renovation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/styles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testcafe_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/themebuilder_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ts_declarations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: DevExpress/github-actions/send-teams-notification@main
- uses: DevExpress/github-actions/send-teams-notification@v1
with:
hook_url: ${{secrets.TEAMS_ALERT}}
bearer_token: ${{secrets.GITHUB_TOKEN}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[showBorders]="true"
>
<dxo-paging [pageSize]="15"></dxo-paging>
<dxo-pager [visible]="true"></dxo-pager>
<dxi-column dataField="ContactName"></dxi-column>
<dxi-column dataField="ContactTitle"></dxi-column>
<dxi-column dataField="CompanyName"></dxi-column>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

import {
Column, DataGrid, MasterDetail, Paging,
Column, DataGrid, MasterDetail, Paging, Pager,
} from 'devextreme-react/data-grid';
import { createStore } from 'devextreme-aspnet-data-nojquery';
import MasterDetailView from './MasterDetailView.tsx';
Expand All @@ -25,6 +25,7 @@ const App = () => (
component={MasterDetailView}
/>
<Paging defaultPageSize={15} />
<Pager visible={true} />

<Column dataField="ContactName" />
<Column dataField="ContactTitle" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import {
Column, DataGrid, MasterDetail, Paging,
Column, DataGrid, MasterDetail, Paging, Pager,
} from 'devextreme-react/data-grid';
import { createStore } from 'devextreme-aspnet-data-nojquery';
import MasterDetailView from './MasterDetailView.js';
Expand All @@ -22,6 +22,7 @@ const App = () => (
component={MasterDetailView}
/>
<Paging defaultPageSize={15} />
<Pager visible={true} />

<Column dataField="ContactName" />
<Column dataField="ContactTitle" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
:show-borders="true"
>
<DxPaging :page-size="15"/>
<DxPager :visible="true"/>

<DxColumn data-field="ContactName"/>
<DxColumn data-field="ContactTitle"/>
Expand All @@ -27,6 +28,7 @@ import {
DxDataGrid,
DxColumn,
DxPaging,
DxPager,
DxMasterDetail,
} from 'devextreme-vue/data-grid';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ $(() => {
paging: {
pageSize: 15,
},
pager: {
visible: true,
},
remoteOperations: true,
columns: [
'ContactName',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[allowDeleting]="true"
[allowUpdating]="true"
></dxo-editing>

<dxo-pager [visible]="true"></dxo-pager>
<dxi-column dataField="OrderID" [allowEditing]="false"></dxi-column>
<dxi-column dataField="ShipName"></dxi-column>
<dxi-column dataField="ShipCountry"></dxi-column>
Expand Down
3 changes: 2 additions & 1 deletion apps/demos/Demos/DataGrid/BatchUpdateRequest/React/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import DataGrid, { DataGridRef, Column, DataGridTypes, Editing } from 'devextreme-react/data-grid';
import DataGrid, { DataGridRef, Column, DataGridTypes, Editing, Pager, } from 'devextreme-react/data-grid';
import { createStore } from 'devextreme-aspnet-data-nojquery';
import 'whatwg-fetch';

Expand Down Expand Up @@ -58,6 +58,7 @@ const App = () => (
allowDeleting={true}
allowUpdating={true}
/>
<Pager visible={true} />
<Column dataField="OrderID" allowEditing={false}></Column>
<Column dataField="ShipName"></Column>
<Column dataField="ShipCountry"></Column>
Expand Down
3 changes: 2 additions & 1 deletion apps/demos/Demos/DataGrid/BatchUpdateRequest/ReactJs/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import DataGrid, { Column, Editing } from 'devextreme-react/data-grid';
import DataGrid, { Column, Editing, Pager } from 'devextreme-react/data-grid';
import { createStore } from 'devextreme-aspnet-data-nojquery';
import 'whatwg-fetch';

Expand Down Expand Up @@ -51,6 +51,7 @@ const App = () => (
allowDeleting={true}
allowUpdating={true}
/>
<Pager visible={true} />
<Column
dataField="OrderID"
allowEditing={false}
Expand Down
3 changes: 2 additions & 1 deletion apps/demos/Demos/DataGrid/BatchUpdateRequest/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
:allow-deleting="true"
:allow-updating="true"
/>
<DxPager :visible="true"/>
<DxColumn
data-field="OrderID"
:allow-editing="false"
Expand All @@ -30,7 +31,7 @@
</template>
<script setup lang="ts">
import {
DxDataGrid, DxColumn, DxEditing, DxDataGridTypes,
DxDataGrid, DxColumn, DxEditing, DxDataGridTypes, DxPager,
} from 'devextreme-vue/data-grid';
import { createStore } from 'devextreme-aspnet-data-nojquery';
import 'whatwg-fetch';
Expand Down
3 changes: 3 additions & 0 deletions apps/demos/Demos/DataGrid/BatchUpdateRequest/jQuery/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ $(() => {
ajaxOptions.xhrFields = { withCredentials: true };
},
}),
pager: {
visible: true,
},
showBorders: true,
editing: {
mode: 'batch',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
[showBorders]="true"
>
<dxo-sorting mode="none"></dxo-sorting>
<dxo-pager [visible]="true"></dxo-pager>
<dxo-paging [pageSize]="10"></dxo-paging>

<dxi-column dataField="date" [width]="110" dataType="date"></dxi-column>
<dxi-column caption="Open" cellTemplate="diffCellTemplate"></dxi-column>
<dxi-column caption="Close" cellTemplate="diffCellTemplate"></dxi-column>
Expand Down
2 changes: 2 additions & 0 deletions apps/demos/Demos/DataGrid/CellCustomization/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import DataGrid, {
Column,
Sorting,
Paging,
Pager,
} from 'devextreme-react/data-grid';
import { weekData } from './data.ts';
import DiffCell from './DiffCell.tsx';
Expand All @@ -17,6 +18,7 @@ const App = () => (
showBorders={true}>
<Sorting mode="none" />
<Paging defaultPageSize={10} />
<Pager visible={true} />
<Column dataField="date" width={110} dataType="date" />
<Column caption="Open" cellRender={DiffCell} />
<Column caption="Close" cellRender={DiffCell} />
Expand Down
5 changes: 4 additions & 1 deletion apps/demos/Demos/DataGrid/CellCustomization/ReactJs/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react';
import DataGrid, { Column, Sorting, Paging } from 'devextreme-react/data-grid';
import DataGrid, {
Column, Sorting, Paging, Pager,
} from 'devextreme-react/data-grid';
import { weekData } from './data.js';
import DiffCell from './DiffCell.js';
import ChartCell from './ChartCell.js';
Expand All @@ -15,6 +17,7 @@ const App = () => (
>
<Sorting mode="none" />
<Paging defaultPageSize={10} />
<Pager visible={true} />
<Column
dataField="date"
width={110}
Expand Down
3 changes: 2 additions & 1 deletion apps/demos/Demos/DataGrid/CellCustomization/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
>
<DxSorting mode="none"/>
<DxPaging :page-size="10"/>
<DxPager :visible="true"/>
<DxColumn
:width="110"
data-field="date"
Expand Down Expand Up @@ -50,7 +51,7 @@
</template>
<script setup lang="ts">
import {
DxDataGrid, DxColumn, DxSorting, DxPaging,
DxDataGrid, DxColumn, DxSorting, DxPaging, DxPager,
} from 'devextreme-vue/data-grid';
import DiffCell from './DiffCell.vue';
Expand Down
3 changes: 3 additions & 0 deletions apps/demos/Demos/DataGrid/CellCustomization/jQuery/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ $(() => {
paging: {
pageSize: 10,
},
pager: {
visible: true,
},
onCellPrepared(options) {
const fieldData = options.value;
let fieldHtml = '';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@
[dataSource]="orders"
keyExpr="OrderNumber"
[showBorders]="true"
></dx-data-grid>
>
<dxo-pager [visible]="true"></dxo-pager>
</dx-data-grid>
Loading

0 comments on commit d68c6a6

Please sign in to comment.