Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 9fd71865 authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

Pull request #172: [EDELIVERY-14133] upgarde of the angular from v16 to v18 

Merge in EDELIVERY/smp from bugfix/EDELIVERY-13955-redesing-document-editor-ui to development

* commit 'a7d49290':
  [EDELIVERY-13955] PR updates
  Applied suggestion
  Applied suggestion
  [EDELIVERY-13955] upgrade angular to v18
  [EDELIVERY-13955] upgrade angular to v17
  [EDELIVERY-13955] remove unused angular packages
parents e13f3d13 a7d49290
No related branches found
No related tags found
No related merge requests found
Pipeline #217522 failed
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 13977 additions and 21278 deletions
smp-angular/angular.json
+ 5
− 5
View file @ 9fd71865
......@@ -15,7 +15,7 @@ ng {
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"polyfills": ["zone.js"],
"assets": [
"src/assets",
"src/favicon.ico"
......@@ -68,18 +68,18 @@ ng {
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "SMP-UI:build:development"
"buildTarget": "SMP-UI:build:development"
},
"configurations": {
"production": {
"browserTarget": "SMP-UI:build:production"
"buildTarget": "SMP-UI:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "SMP-UI:build"
"buildTarget": "SMP-UI:build"
}
},
"test": {
......@@ -87,7 +87,7 @@ ng {
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"polyfills": ["zone.js"],
"tsConfig": "src/tsconfig.spec.json",
"scripts": [],
"styles": [
......
smp-angular/package-lock.json
+ 13498
− 20935
View file @ 9fd71865
This diff is collapsed.
smp-angular/package.json
+ 28
− 35
View file @ 9fd71865
......@@ -16,56 +16,49 @@
},
"private": true,
"dependencies": {
"@angular-material-components/datetime-picker": "^16.0.1",
"@angular-material-components/moment-adapter": "^16.0.1",
"@angular/animations": "^16.2.12",
"@angular/cdk": "^16.2.14",
"@angular/common": "^16.2.12",
"@angular/compiler": "^16.2.12",
"@angular/core": "^16.2.12",
"@angular/animations": "^18.2.8",
"@angular/cdk": "^18.2.8",
"@angular/common": "^18.2.8",
"@angular/compiler": "^18.2.8",
"@angular/core": "^18.2.8",
"@angular/flex-layout": "^15.0.0-beta.42",
"@angular/forms": "^16.2.12",
"@angular/material": "^16.2.12",
"@angular/material-moment-adapter": "^16.2.14",
"@angular/platform-browser": "^16.2.12",
"@angular/platform-browser-dynamic": "^16.2.12",
"@angular/platform-server": "^16.2.12",
"@angular/router": "^16.2.12",
"@codemirror/commands": "^6.6.0",
"@codemirror/language": "^6.10.2",
"@angular/forms": "^18.2.8",
"@angular/material": "^18.2.8",
"@angular/material-moment-adapter": "^18.2.8",
"@angular/platform-browser": "^18.2.8",
"@angular/platform-browser-dynamic": "^18.2.8",
"@angular/platform-server": "^18.2.8",
"@angular/router": "^18.2.8",
"@codemirror/commands": "^6.7.0",
"@codemirror/language": "^6.10.3",
"@codemirror/language-data": "^6.5.1",
"@codemirror/merge": "^6.6.3",
"@codemirror/merge": "^6.7.2",
"@codemirror/search": "^6.5.6",
"@codemirror/theme-one-dark": "^6.1.2",
"@codemirror/view": "^6.28.1",
"@codemirror/view": "^6.34.1",
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^8.0.0",
"@swimlane/ngx-datatable": "^20.1.0",
"file-saver": "^2.0.5",
"rxjs": "^7.8.1",
"ts-helpers": "^1.1.2",
"tslib": "^2.6.2",
"zone.js": "^0.13.3"
"zone.js": "^0.14.10",
"moment": "^2.30.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^16.2.10",
"@angular/cli": "^16.2.10",
"@angular/compiler-cli": "^16.2.12",
"@types/file-saver": "2.0.7",
"@types/jasmine": "^4.3.1",
"@angular-devkit/build-angular": "^18.2.8",
"@angular/cli": "^18.2.8",
"@angular/compiler-cli": "^18.2.8",
"@types/jasmine": "^5.1.4",
"@types/node": "^18.15.6",
"eslint": "^8.36.0",
"hammerjs": "^2.0.8",
"jasmine-core": "4.6.0",
"jasmine-spec-reporter": "7.0.0",
"karma": "^6.4.1",
"karma-chrome-launcher": "^3.1.1",
"karma-cli": "^2.0.0",
"karma": "^6.4.4",
"karma-jasmine": "^5.1.0",
"ng-packagr": "^16.2.3",
"postcss": "^8.4.21"
"ng-packagr": "^18.2.1",
"tslib": "^2.7.0",
"postcss": "^8.4.47",
"typescript": "^5.4.5"
},
"peerDependencies": {
"postcss": "^8.4.21"
"postcss": "^8.4.47"
}
}
smp-angular/pom.xml
+ 6
− 2
View file @ 9fd71865
......@@ -17,12 +17,16 @@
<!-- Only selected modules are deployed -->
<maven.deploy.skip>false</maven.deploy.skip>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- latest version supported by the build server -->
<node.version>v20.18.0</node.version>
<npm.version>10.8.2</npm.version>
<!-- Currently last version not supported by the build server :(
node.version>v18.18.2</node.version>
<npm.version>9.8.1</npm.version -->
<!--
<node.version>v16.20.2</node.version>
<npm.version>8.19.4</npm.version>
-->
<!--
set variable to force use of pre-installed npm-->
<!-- To build with preinstalled nodejs build with usePreInstalledNpm argument as example
......@@ -30,7 +34,7 @@
mvn clean install -DusePreInstalledNpm -Dnpm.path=/opt/programs/node-v14.17.0-linux-x64/bin
-->
<!--suppress UnresolvedMavenProperty -->
<npm.path>${env.bamboo_CITNET_NODEJS_18_LINUX_PATH}</npm.path>
<npm.path>${env.bamboo_CITNET_NODEJS_20_LINUX_PATH}</npm.path>
</properties>
......
smp-angular/src/_smp-theme-helper.scss
+ 5
− 5
View file @ 9fd71865
......@@ -3,23 +3,23 @@
@use '@angular/material' as mat;
@function get-theme-type($smp-theme ) {
$color-config: mat.get-color-config($smp-theme);
$color-config: mat.m2-get-color-config($smp-theme);
@return map.get($color-config, type);
}
@function get-theme-color($smp-theme, $color: primary, $hue: null, $opacity: null ) {
$color-config: mat.get-color-config($smp-theme);
$color-config: mat.m2-get-color-config($smp-theme);
// Get the required color palette from the color-config.
$color-palette: map.get($color-config, $color);
@if $hue != null {
@if $opacity != null {
@return mat.get-color-from-palette($color-palette, $hue, $opacity);
@return mat.m2-get-color-from-palette($color-palette, $hue, $opacity);
} @else {
// Finally get the desired color with the specified hue.
@return mat.get-color-from-palette($color-palette, $hue);
@return mat.m2-get-color-from-palette($color-palette, $hue);
}
} @else {
// Finally get the desired color with the specified hue.
@return mat.get-color-from-palette($color-palette);
@return mat.m2-get-color-from-palette($color-palette);
}
}
smp-angular/src/app/app.component.spec.ts
+ 2
− 2
View file @ 9fd71865
/* tslint:disable:no-unused-variable */
import { TestBed, async } from '@angular/core/testing';
import { AppComponent } from './app.component';
import {TestBed, async} from '@angular/core/testing';
import {AppComponent} from './app.component';
describe('AppComponent', () => {
beforeEach(() => {
......
smp-angular/src/app/app.module.ts
+ 412
− 270
View file @ 9fd71865
This diff is collapsed.
smp-angular/src/app/common/column-picker/column-picker.component.spec.ts
+ 2
− 2
View file @ 9fd71865
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { ColumnPickerComponent } from './column-picker.component';
import {ColumnPickerComponent} from './column-picker.component';
describe('ColumnPickerComponent', () => {
let component: ColumnPickerComponent;
......
smp-angular/src/app/common/components/smp-field-error/smp-field-error.component.ts
+ 1
− 1
View file @ 9fd71865
import { Component, Input } from '@angular/core';
import {Component, Input} from '@angular/core';
@Component({
selector: 'smp-field-error',
......
smp-angular/src/app/common/components/smp-label/smp-label.component.ts
+ 1
− 1
View file @ 9fd71865
import { Component, Input } from '@angular/core';
import {Component, Input} from '@angular/core';
@Component({
selector: 'smp-label',
......
smp-angular/src/app/common/components/smp-titled-label/smp-titled-label.component.ts
+ 1
− 1
View file @ 9fd71865
import { Component, Input } from '@angular/core';
import {Component, Input} from '@angular/core';
@Component({
selector: 'smp-titled-label',
......
smp-angular/src/app/common/components/spacer/spacer.component.ts
+ 1
− 1
View file @ 9fd71865
import { Component, Input } from '@angular/core';
import {Component, Input} from '@angular/core';
@Component({
selector: 'tool-button-spacer',
......
smp-angular/src/app/common/components/spinner/spinner.component.ts
+ 1
− 1
View file @ 9fd71865
import { Component, Input } from '@angular/core';
import {Component, Input} from '@angular/core';
@Component({
selector: 'spinner',
......
smp-angular/src/app/common/dialogs/cancel-dialog/cancel-dialog.component.spec.ts
+ 2
− 2
View file @ 9fd71865
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { CancelDialogComponent } from './cancel-dialog.component';
import {CancelDialogComponent} from './cancel-dialog.component';
describe('CancelDialogComponent', () => {
let component: CancelDialogComponent;
......
smp-angular/src/app/common/dialogs/certificate-dialog/certificate-dialog.component.spec.ts
+ 1
− 1
View file @ 9fd71865
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {CertificateDialogComponent} from "./certificate-dialog.component";
......
smp-angular/src/app/common/dialogs/dialog/dialog.component.spec.ts
+ 2
− 2
View file @ 9fd71865
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { DialogComponent } from './dialog.component';
import {DialogComponent} from './dialog.component';
describe('DialogComponent', () => {
let component: DialogComponent;
......
smp-angular/src/app/common/dialogs/dialog/dialog.component.ts
+ 2
− 2
View file @ 9fd71865
import { Component, Input } from '@angular/core';
import { MatDialogRef } from '@angular/material/dialog';
import {Component, Input} from '@angular/core';
import {MatDialogRef} from '@angular/material/dialog';
@Component({
selector: 'smp-dialog',
......
smp-angular/src/app/common/dialogs/expired-password-dialog/expired-password-dialog.component.spec.ts
+ 2
− 2
View file @ 9fd71865
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import { ExpiredPasswordDialogComponent } from './expired-password-dialog.component';
import {ExpiredPasswordDialogComponent} from './expired-password-dialog.component';
describe('ExpiredPasswordDialogComponent', () => {
let component: ExpiredPasswordDialogComponent;
......
smp-angular/src/app/common/dialogs/expired-password-dialog/expired-password-dialog.component.ts
+ 2
− 2
View file @ 9fd71865
import { Component} from '@angular/core';
import { MatDialogRef } from '@angular/material/dialog';
import {Component} from '@angular/core';
import {MatDialogRef} from '@angular/material/dialog';
@Component({
selector: 'smp-expired-password-dialog',
......
smp-angular/src/app/common/dialogs/object-properties-dialog/object-properties-dialog.component.ts
+ 3
− 6
View file @ 9fd71865
import {Component, Inject} from '@angular/core';
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
import {TranslateService} from "@ngx-translate/core";
import {DatePipe} from "@angular/common";
import {GlobalLookups} from "../../global-lookups";
import {DateTimeService} from "../../services/date-time.service";
@Component({
selector: 'object-properties-dialog',
......@@ -18,16 +17,14 @@ export class ObjectPropertiesDialogComponent {
constructor(public dialogRef: MatDialogRef<ObjectPropertiesDialogComponent>,
@Inject(MAT_DIALOG_DATA) public data: any,
private translateService: TranslateService,
private datePipe: DatePipe,
private lookups: GlobalLookups) {
private dateTimeService: DateTimeService) {
this.translateService.get(data.i18n).subscribe(title => this.title = title);
this.dataSource = data.object.map(row => [row.i18n, this.parseValue(row)]);
}
private parseValue(row) {
if (row.type === "dateTime") {
let dateTimeFormat = this.lookups.getDateTimeFormat();
return this.datePipe.transform(row.value, dateTimeFormat);
return this.dateTimeService.formatDateTimeForUserLocal(row.value);
}
return row.value;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about