Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 29 additions & 17 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": [
"zone.js"
],
"tsConfig": "tsconfig.app.json",
"assets": [
"src/favicon.ico",
"src/assets",
Expand All @@ -36,13 +38,17 @@
"styles": [
"src/styles.scss"
],
"scripts": [],
"scripts": [
"./node_modules/jquery/dist/jquery.js"
],
"allowedCommonJsDependencies": [
"bootstrap",
"@boldreports/javascript-reporting-controls/Scripts/bold.report-viewer.min",
"@boldreports/javascript-reporting-controls/Scripts/data-visualization/ej.bulletgraph.min",
"@boldreports/javascript-reporting-controls/Scripts/data-visualization/ej.chart.min",
"@boldreports/javascript-reporting-controls/Scripts/bold.report-designer.min",
"prismjs",
"@boldreports/javascript-reporting-controls/Scripts/v2.0/common/bold.reports.common.min",
"@boldreports/javascript-reporting-controls/Scripts/v2.0/common/bold.reports.widgets.min",
"@boldreports/javascript-reporting-controls/Scripts/v2.0/bold.report-viewer.min",
"@boldreports/javascript-reporting-controls/Scripts/v2.0/bold.report-designer.min",
"codemirror/lib/codemirror",
"codemirror/addon/hint/show-hint",
"codemirror/addon/hint/sql-hint",
"codemirror/mode/sql/sql",
Expand Down Expand Up @@ -72,32 +78,39 @@
"maximumError": "30mb"
}
]
},
"development": {
"outputHashing": "all"
}
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "reports-cli:build"
"buildTarget": "reports-cli:build"
},
"configurations": {
"production": {
"browserTarget": "reports-cli:build:production"
"buildTarget": "reports-cli:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "reports-cli:build"
"buildTarget": "reports-cli:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"polyfills": [
"zone.js",
"zone.js/testing"
],
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.scss"
Expand All @@ -113,8 +126,8 @@
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
"tsconfig.app.json",
"tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**",
Expand Down Expand Up @@ -153,6 +166,5 @@
}
}
}
},
"defaultProject": "reports-cli"
}
}
2 changes: 1 addition & 1 deletion build/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const ngCli = "node --max_old_space_size=4096 node_modules/@angular/cli/bin/ng";

gulp.task('production-build', (done) => {
runSequence('update-extensions-export', 'generate-router', () => {
if (argv.prefix) {
if (argv?.prefix) {
exec(`${ngCli} build -c production --base-href ${argv.prefix}`);
} else {
exec(`${ngCli} build -c production`);
Expand Down
2 changes: 1 addition & 1 deletion build/serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const runSequence = require('gulp4-run-sequence');

gulp.task('serve', (done) => {
runSequence('update-extensions-export', 'generate-router', () => {
exec(`${ngCli} serve --open --port ${argv.port || ''}`);
exec(`${ngCli} serve --open --port ${argv?.port || ''}`);
done();
});
});
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
"serve": "gulp serve"
},
"dependencies": {
"@angular/animations": "^16.1.0",
"@angular/common": "^16.1.0",
"@angular/compiler": "^16.1.0",
"@angular/core": "^16.1.0",
"@angular/forms": "^16.1.0",
"@angular/platform-browser": "^16.1.0",
"@angular/platform-browser-dynamic": "^16.1.0",
"@angular/router": "^16.1.0",
"@angular/animations": "21.0.6",
"@angular/common": "21.0.6",
"@angular/compiler": "21.0.6",
"@angular/core": "21.0.6",
"@angular/forms": "21.0.6",
"@angular/platform-browser": "21.0.6",
"@angular/platform-browser-dynamic": "21.0.6",
"@angular/router": "21.0.6",
"@boldreports/angular-reporting-components": "12.1.12",
"@boldreports/javascript-reporting-controls": "12.1.12",
"@boldreports/javascript-reporting-extensions": "12.1.12",
Expand All @@ -33,12 +33,12 @@
"rxjs": "6.6.0",
"shelljs": "0.8.5",
"tslib": "2.0.0",
"zone.js": "0.13.1"
"zone.js": "0.15.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^16.1.0",
"@angular/cli": "~16.1.0",
"@angular/compiler-cli": "^16.1.0",
"@angular-devkit/build-angular": "21.0.4",
"@angular/cli": "21.0.4",
"@angular/compiler-cli": "21.0.6",
"@types/jasmine": "2.8.8",
"@types/jasminewd2": "2.0.3",
"@types/jquery": "3.3.29",
Expand All @@ -57,7 +57,7 @@
"require-dir": "1.2.0",
"ts-node": "8.3.0",
"tslint": "6.1.0",
"typescript": "4.9.3",
"typescript": "5.9.3",
"typo-js": "1.0.3"
}
}
5 changes: 3 additions & 2 deletions src/app/common/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ type sampleInfo = typeof data;
@Component({
selector: 'ej-main',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss']
styleUrls: ['./app.component.scss'],
standalone: false
})
export class AppComponent implements OnInit {
tocSlideLeft = false;
Expand Down Expand Up @@ -63,7 +64,7 @@ export class AppComponent implements OnInit {
this.meta.updateTag({ name: 'description', property: 'og:description', content: sampleData.metaData.description });
}

@HostListener('window:resize', ['$event'])
@HostListener('window:resize')
onResize(): void {
let sampleData: sampleInfo['samples'][0];
this.subscriptions.add(this.routerService.sampleUrl.subscribe((url) => {
Expand Down
3 changes: 2 additions & 1 deletion src/app/common/header/header.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ const data = samples;
@Component({
selector: 'ej-header',
templateUrl: './header.component.html',
styleUrls: ['./header.component.scss']
styleUrls: ['./header.component.scss'],
standalone: false
})
export class HeaderComponent {
platforms: string[];
Expand Down
8 changes: 5 additions & 3 deletions src/app/common/main-content/main-content.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, ViewChild, AfterViewInit, Input, EventEmitter, Output, Renderer2 } from '@angular/core';
import { Component, ViewChild, AfterViewInit, Input, EventEmitter, Output, Renderer2, ChangeDetectorRef } from '@angular/core';
import { forkJoin, Observable } from 'rxjs';
import { Location } from '@angular/common';
import { Router } from '@angular/router';
Expand Down Expand Up @@ -26,7 +26,8 @@ interface CurData {
@Component({
selector: 'ej-main-content',
templateUrl: './main-content.component.html',
styleUrls: ['./main-content.component.scss']
styleUrls: ['./main-content.component.scss'],
standalone: false
})

export class MainContentComponent implements AfterViewInit {
Expand All @@ -46,7 +47,7 @@ export class MainContentComponent implements AfterViewInit {
@ViewChild('features[2]', { static: true }) feature3;
@ViewChild('freeTrialUrl', { static: true }) freeTrialUrl;
@ViewChild('copyrightYear', { static: true }) copyrightYear;
constructor(private routerService: RouterService, private http: HttpClient, private router: Router, private location: Location, private renderer: Renderer2) { }
constructor(private routerService: RouterService, private http: HttpClient, private router: Router, private location: Location, private renderer: Renderer2, private cdr: ChangeDetectorRef) { }

public loadSourceCode(sampleData: sampleInfo['samples'][0]): void {
(jQuery('#parentTab li:first-child a') as any).tab('show');
Expand Down Expand Up @@ -93,6 +94,7 @@ export class MainContentComponent implements AfterViewInit {
name: `${sampleData.routerPath}.component.html`,
body: Prism.highlight(this.getStringWithOutDescription(resultCollection[0], /(\'|\")description/g), Prism.languages.html), id: 'html'
});
this.cdr.detectChanges();
});
}

Expand Down
3 changes: 2 additions & 1 deletion src/app/common/main.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import { Router, NavigationStart, Event, NavigationEnd } from '@angular/router';
import { RouterService } from './router.service';
@Component({
selector: 'app-root',
template: '<router-outlet></router-outlet>'
template: '<router-outlet></router-outlet>',
standalone: false
})
export class MainComponent {
constructor(private router: Router, private routerService: RouterService) {
Expand Down
5 changes: 3 additions & 2 deletions src/app/common/preview/preview.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const data = samples;
@Component({
selector: 'ej-preview',
templateUrl: './preview.component.html',
styleUrls: ['./preview.component.scss']
styleUrls: ['./preview.component.scss'],
standalone: false

})
export class PreviewComponent implements OnInit {
Expand Down Expand Up @@ -52,7 +53,7 @@ export class PreviewComponent implements OnInit {
}));
}

@HostListener('window:resize', ['$event'])
@HostListener('window:resize')
onResize(): void {
this.setReportsHeight();
}
Expand Down
3 changes: 2 additions & 1 deletion src/app/common/sidebar/sidebar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ const data = samples;
@Component({
selector: 'ej-sidebar',
templateUrl: './sidebar.component.html',
styleUrls: ['./sidebar.component.scss']
styleUrls: ['./sidebar.component.scss'],
standalone: false
})
export class SidebarComponent {
samples: sampleInfo['samples'] = data.samples;
Expand Down
3 changes: 2 additions & 1 deletion src/app/components/barcode/barcode.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Globals } from '../globals';
@Component({
selector: 'ej-sample',
templateUrl: './barcode.component.html',
styleUrls: ['./barcode.component.css']
styleUrls: ['./barcode.component.css'],
standalone: false
})
export class BarcodeComponent {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
3 changes: 2 additions & 1 deletion src/app/components/cmr-report/cmr-report.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Globals } from '../globals';
@Component({
selector: 'ej-sample',
templateUrl: './cmr-report.component.html',
styleUrls: ['./cmr-report.component.css']
styleUrls: ['./cmr-report.component.css'],
standalone: false
})
export class CMRReportComponent {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
3 changes: 2 additions & 1 deletion src/app/components/company-sales/company-sales.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Globals } from '../globals';
@Component({
selector: 'ej-sample',
templateUrl: './company-sales.component.html',
styleUrls: ['./company-sales.component.css']
styleUrls: ['./company-sales.component.css'],
standalone: false
})
export class CompanySalesComponent {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Globals } from '../globals';
@Component({
selector: 'ej-sample',
templateUrl: './conditional-row-formatting.component.html',
styleUrls: ['./conditional-row-formatting.component.css']
styleUrls: ['./conditional-row-formatting.component.css'],
standalone: false
})
export class ConditionalRowFormattingComponent {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import { rdlcData } from '../rdlcData';
@Component({
selector: 'ej-sample',
templateUrl: './consolidated-balance-sheet.component.html',
styleUrls: ['./consolidated-balance-sheet.component.css']
styleUrls: ['./consolidated-balance-sheet.component.css'],
standalone: false
})
export class ConsolidatedBalanceSheetComponent {
@ViewChild('viewer') viewerInst;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Globals } from '../globals';
@Component({
selector: 'ej-sample',
templateUrl: './customer-support-analysis.component.html',
styleUrls: ['./customer-support-analysis.component.css']
styleUrls: ['./customer-support-analysis.component.css'],
standalone: false
})
export class CustomerSupportAnalysisComponent {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
3 changes: 2 additions & 1 deletion src/app/components/data-bar/data-bar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Globals } from '../globals';
@Component({
selector: 'ej-sample',
templateUrl: './data-bar.component.html',
styleUrls: ['./data-bar.component.css']
styleUrls: ['./data-bar.component.css'],
standalone: false
})
export class DataBar {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
3 changes: 2 additions & 1 deletion src/app/components/designer/designer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ window[pdfSignature] = EJPDFSignature;
@Component({
selector: 'ej-sample',
templateUrl: './designer.component.html',
styleUrls: ['./designer.component.css']
styleUrls: ['./designer.component.css'],
standalone: false
})
export class DesignerComponent implements AfterViewInit {
@ViewChild('designer') designerInst;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Globals } from '../globals';
@Component({
selector: 'ej-sample',
templateUrl: './dynamic-chart-series.component.html',
styleUrls: ['./dynamic-chart-series.component.css']
styleUrls: ['./dynamic-chart-series.component.css'],
standalone: false
})
export class DynamicChartSeriesComponent {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
@Component({
selector: 'ej-sample',
templateUrl: './dynamic-columns.component.html',
styleUrls: ['./dynamic-columns.component.css']
styleUrls: ['./dynamic-columns.component.css'],
standalone: false
})
export class DynamicColumnsComponent {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
3 changes: 2 additions & 1 deletion src/app/components/dynamic-logos/dynamic-logos.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
@Component({
selector: 'ej-sample',
templateUrl: './dynamic-logos.component.html',
styleUrls: ['./dynamic-logos.component.css']
styleUrls: ['./dynamic-logos.component.css'],
standalone: false
})
export class DynamicLogosComponent {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import { Globals } from '../globals';
@Component({
selector: 'ej-sample',
templateUrl: './external-parameter-report.component.html',
styleUrls: ['./external-parameter-report.component.css']
styleUrls: ['./external-parameter-report.component.css'],
standalone: false
})
export class ExternalParameterReportComponent {
@ViewChild('externalparameterreport', { static: false }) externalParameterReport;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import { Globals } from '../globals';
@Component({
selector: 'ej-sample',
templateUrl: './grouping-aggregate.component.html',
styleUrls: ['./grouping-aggregate.component.css']
styleUrls: ['./grouping-aggregate.component.css'],
standalone: false
})
export class GroupingAggregateComponent {
// Specifies the report Web API service URL. It is used to process the reports.
Expand Down
Loading