Skip to content

Commit

Permalink
Merge branch '24_2' of github.com:DevExpress/DevExtreme into Rename_P…
Browse files Browse the repository at this point in the history
…agination_CSS_24_2
  • Loading branch information
Raushen committed Oct 24, 2024
2 parents 6ec55f2 + 48ed0b5 commit bc1cce3
Show file tree
Hide file tree
Showing 52 changed files with 577 additions and 424 deletions.
36 changes: 20 additions & 16 deletions .github/workflows/packages_publishing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: |
${{ env.STORE_PATH }}
${{ env.PNPM_STORE_PATH }}
.nx/cache
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
Expand All @@ -72,18 +72,22 @@ jobs:
BUILD_INTERNAL_PACKAGE: true
run: pnpm run all:build

# - name: Clone deps scanner
# uses: actions/checkout@v4
# with:
# repository: DevExpress/npmdeps-scanner
# token: ${{ secrets.NPM_DEPS_SCANNER_PAT }}
# path: deps-scanner
#
# - name: Run deps scanner
# run: |
# ./deps-scanner/exe/npmDepsScanner.exe scan_cache ${{ github.workspace }} reportGithub.json
# mkdir -p ./artifacts/deps-scanner
# cp reportGithub.json ./artifacts/deps-scanner/
- name: Clone deps scanner
uses: actions/checkout@v4
with:
repository: DevExpress/npmdeps-scanner
token: ${{ secrets.NPM_DEPS_SCANNER_PAT }}
path: deps-scanner

- name: Build deps scanner
working-directory: deps-scanner
run: dotnet build npmDepsScanner.csproj /p:Configuration=Release

- name: Run deps scanner
run: |
./deps-scanner/bin/Release/npmDepsScanner.exe scan_cache ${{ github.workspace }} reportGithub.json
mkdir -p ./artifacts/deps-scanner
cp reportGithub.json ./artifacts/deps-scanner/
- name: Build artifacts package
run: npx ts-node tools/scripts/make-artifacts-package
Expand Down Expand Up @@ -136,13 +140,13 @@ jobs:
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
echo "PNPM_STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: |
${{ env.STORE_PATH }}
${{ env.PNPM_STORE_PATH }}
.nx/cache
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
placeholder="Type first name..."
[(value)]="firstName"
[dataSource]="names"
(onValueChanged)="updateEmployeeInfo($event)"
(onValueChanged)="updateEmployeeInfo()"
>
</dx-autocomplete>
</div>
Expand All @@ -24,7 +24,7 @@
[showClearButton]="true"
[dataSource]="surnames"
[(value)]="lastName"
(onValueChanged)="updateEmployeeInfo($event)"
(onValueChanged)="updateEmployeeInfo()"
>
</dx-autocomplete>
</div>
Expand Down Expand Up @@ -57,7 +57,7 @@
valueExpr="State_Long"
[dataSource]="states"
[(value)]="state"
(onValueChanged)="updateEmployeeInfo($event)"
(onValueChanged)="updateEmployeeInfo()"
>
<div *dxTemplate="let item of 'item'">
<span>{{ item.State_Long }} ({{ item.State_Short }})</span>
Expand All @@ -78,7 +78,7 @@
valueExpr="Text"
[dataSource]="clientsStore"
[(value)]="currentClient"
(onValueChanged)="updateEmployeeInfo($event)"
(onValueChanged)="updateEmployeeInfo()"
>
</dx-autocomplete>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<dxo-margin [bottom]="30"></dxo-margin>
</dxo-title>
<dxo-export [enabled]="true"></dxo-export>
<dxo-tooltip [enabled]="true" [format]="fixedPoint"> </dxo-tooltip>
<dxo-tooltip [enabled]="true" format="fixedPoint"> </dxo-tooltip>
<dxo-item>
<dxo-border [visible]="true"> </dxo-border>
</dxo-item>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
(onDropZoneLeave)="onDropZoneLeave($event)"
(onUploaded)="onUploaded($event)"
(onProgress)="onProgress($event)"
(onUploadStarted)="onUploadStarted($event)"
(onUploadStarted)="onUploadStarted()"
></dx-file-uploader>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<dx-filter-builder
[fields]="fields"
[(value)]="filter"
[customOperations]="customOperations"
(onInitialized)="refreshDataSource()"
>
</dx-filter-builder>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { DxGalleryModule } from 'devextreme-angular';
import { DxCheckBoxModule, DxCheckBoxTypes } from 'devextreme-angular/ui/check-box';
import { Service } from './app.service';
import { Service, Image } from './app.service';

if (!/localhost/.test(document.location.host)) {
enableProdMode();
Expand All @@ -22,7 +22,7 @@ if (window && window.config.packageConfigPaths) {
styleUrls: [`.${modulePrefix}/app.component.css`],
})
export class AppComponent {
dataSource: string[];
dataSource: Image[];

slideshowDelay = 2000;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';

interface Image {
export interface Image {
imageAlt: string,
imageSrc: string,
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { ViewEncapsulation } from '@angular/compiler';
import { NgModule, Component, enableProdMode } from '@angular/core';
import { NgModule, Component, enableProdMode, ViewEncapsulation } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { DxCheckBoxModule, DxSelectBoxModule, DxDateBoxModule } from 'devextreme-angular';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { ViewEncapsulation } from '@angular/compiler';
import { NgModule, Component, enableProdMode } from '@angular/core';
import { NgModule, Component, enableProdMode, ViewEncapsulation } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { DxGanttModule, DxCheckBoxModule, DxSelectBoxModule } from 'devextreme-angular';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</dx-gantt>

<dx-popup
[height]="auto"
height="auto"
[showTitle]="true"
title="About"
[hideOnOutsideClick]="true"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule, Component, enableProdMode } from '@angular/core';
import { NgModule, Component, enableProdMode, ViewEncapsulation } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { DxGanttModule, DxPopupModule } from 'devextreme-angular';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (window && window.config.packageConfigPaths) {
export class AppComponent {
cities: City[];

weatherData: City;
weatherData: City['data'];

constructor(service: Service) {
this.cities = service.getCities();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[dataSource]="listData"
[grouped]="true"
[collapsibleGroups]="true"
[selectionMode]="multiple"
selectionMode="multiple"
[showSelectionControls]="true"
pageLoadMode="scrollBottom"
itemTemplate="data"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@

<div id="employee">
<p>
Birth date: <b>{{ employeeInfo.Birth_Date }}</b>
Birth date: <b>{{ employeeInfo?.Birth_Date }}</b>
</p>
<p class="address">
Address:<br />
<b>{{ employeeInfo.City }}</b
><br />
<span>{{ employeeInfo.Zipcode }}</span>
<span>{{ employeeInfo.Address }}</span>
<span>{{ employeeInfo?.Zipcode }}</span>
<span>{{ employeeInfo?.Address }}</span>
</p>
<p>
Phone:
<b>{{ employeeInfo.Mobile_Phone }}</b
<b>{{ employeeInfo?.Mobile_Phone }}</b
><br />
Email: <b>{{ employeeInfo.Email }}</b>
Email: <b>{{ employeeInfo?.Email }}</b>
</p>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (window && window.config.packageConfigPaths) {
export class AppComponent {
employee: Employee;

employeeInfo: Employee | {} = {};
employeeInfo = new Employee();

loadingVisible = false;

Expand All @@ -45,7 +45,7 @@ export class AppComponent {
}

showLoadPanel() {
this.employeeInfo = {};
this.employeeInfo = new Employee();
this.loadingVisible = true;
}
}
Expand Down
6 changes: 3 additions & 3 deletions apps/demos/Demos/Menu/Scrolling/Angular/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { NgModule, Component, enableProdMode } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { DxCheckBoxModule } from 'devextreme-angular';
import { DxMenuModule } from 'devextreme-angular/ui/menu';
import { DxMenuModule, DxMenuTypes } from 'devextreme-angular/ui/menu';
import notify from 'devextreme/ui/notify';
import { Product, Service } from './app.service';

Expand Down Expand Up @@ -33,13 +33,13 @@ export class AppComponent {
this.products = service.getProducts();
}

itemClick(e: ItemClickEvent) {
itemClick(e: DxMenuTypes.ItemClickEvent) {
if (!e.itemData.items) {
notify(`The "${e.itemData.text}" item was clicked`, 'success', 1500);
}
}

onSubmenuShowing({ submenuContainer }: HTMLElement) {
onSubmenuShowing({ submenuContainer }: DxMenuTypes.SubmenuShowingEvent) {
submenuContainer.style.maxHeight = this.limitSubmenuHeight ? `${this.SUBMENU_HEIGHT}px` : '';
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
text="Show Popup"
type="default"
[width]="300"
(onClick)="showPopup($event)"
(onClick)="showPopup()"
>
</dx-button>
<div class="label"> A native scrollable container </div>
Expand All @@ -14,7 +14,7 @@
<dx-button
text="Show Popup"
[width]="300"
(onClick)="showPopupWithScrollView($event)"
(onClick)="showPopupWithScrollView()"
>
</dx-button>
<div class="label"> The ScrollView </div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
[endValue]="endValue"
[placeholderHeight]="20"
>
<dxo-label [format]="shorttime"> </dxo-label>
<dxo-label format="shorttime"> </dxo-label>
<dxo-minor-tick-interval [hours]="1"> </dxo-minor-tick-interval>
<dxo-tick-interval [hours]="2"> </dxo-tick-interval>
</dxo-scale>
<dxo-slider-marker [format]="shorttime" [placeholderHeight]="30">
<dxo-slider-marker format="shorttime" [placeholderHeight]="30">
</dxo-slider-marker>
</dx-range-selector>
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<dx-speed-dial-action
#speedDialAction
icon="plus"
(onClick)="showAppointmentPopup($event)"
(onClick)="showAppointmentPopup()"
>
</dx-speed-dial-action>
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ if (window && window.config.packageConfigPaths) {
export class AppComponent {
dataSource: DataSource;

dinnerTime = this.dataService.getDinnerTime();
dinnerTime: { from: number, to: number };

holidays = this.dataService.getHolidays();
holidays: Date[];

currentDate = new Date(2021, 3, 27);

Expand All @@ -63,6 +63,8 @@ export class AppComponent {
};

constructor(public dataService: DataService) {
this.dinnerTime = this.dataService.getDinnerTime();
this.holidays = this.dataService.getHolidays();
this.dataSource = new DataSource({
store: dataService.getData(),
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*ngIf="getMovieById | apply : model.appointmentData.movieId as movie"
>
<div class="movie">
<img [src]="movie.image" />
<img [src]="movie.image" alt="{{ movie.text }} poster" />
<div class="movie-text">{{ movie.text }}</div>
</div>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const AppointmentTemplate = (props: AppointmentTemplateProps) => {

return (
<div className="movie">
<img src={movieInfo.image} />
<img src={movieInfo.image} alt={movieInfo.text + ' poster'} />
<div className="movie-text">{movieInfo.text}</div>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ const AppointmentTemplate = (props) => {
const movieInfo = getMovieById(appointmentData.movieId) || {};
return (
<div className="movie">
<img src={movieInfo.image} />
<img
src={movieInfo.image}
alt={`${movieInfo.text} poster`}
/>
<div className="movie-text">{movieInfo.text}</div>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="movie">
<img :src="movieInfo.image">
<img :src="movieInfo.image" :alt="`${movieInfo.text} poster`">
<div class="movie-text">{{ movieInfo.text }}</div>
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $(() => {
const movieInfo = getMovieById(model.appointmentData.movieId) || {};

return $(`${"<div class='movie'>"
+ "<img src='"}${movieInfo.image}' />`
+ "<img src='"}${movieInfo.image}' alt='${movieInfo.text} poster' />`
+ `<div class='movie-text'>${movieInfo.text}</div>`
+ '</div>');
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<dx-scheduler
timeZone="America/Los_Angeles"
[dataSource]="appointmentsData"
[views]="views"
currentView="day"
[startDayHour]="8"
[endDayHour]="20"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<dx-scheduler
timeZone="America/Los_Angeles"
[dataSource]="appointmentsData"
[views]="views"
currentView="Auto Mode"
[currentDate]="currentDate"
[height]="730"
Expand Down
Loading

0 comments on commit bc1cce3

Please sign in to comment.