Skip to content

Commit

Permalink
SOLR-12276: Update Angular from 18 -> 19. Adjust the code to the late…
Browse files Browse the repository at this point in the history
…st format. Return package-lock.json, with 15 000 changes back to PR.

Return back some other files.
  • Loading branch information
NikolaiJDev committed Dec 5, 2024
1 parent a64d59a commit 28f87a6
Show file tree
Hide file tree
Showing 8 changed files with 15,727 additions and 26 deletions.
15,695 changes: 15,695 additions & 0 deletions solr/webapp/web/solrUi/package-lock.json

Large diffs are not rendered by default.

37 changes: 19 additions & 18 deletions solr/webapp/web/solrUi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,35 @@
},
"private": true,
"dependencies": {
"@angular/animations": "18.2.8",
"@angular/common": "18.2.8",
"@angular/compiler": "18.2.8",
"@angular/core": "18.2.8",
"@angular/forms": "18.2.8",
"@angular/platform-browser": "18.2.8",
"@angular/platform-browser-dynamic": "18.2.8",
"@angular/router": "18.2.8",
"@ngx-resource/core": "n15.0.0",
"@angular/animations": "19.0.3",
"@angular/common": "19.0.3",
"@angular/compiler": "19.0.3",
"@angular/core": "19.0.3",
"@angular/forms": "19.0.3",
"@angular/platform-browser": "19.0.3",
"@angular/platform-browser-dynamic": "19.0.3",
"@angular/router": "19.0.3",
"@ngx-resource/core": "15.0.0",
"@ngx-resource/handler-ngx-http": "15.0.0",
"rxjs": "7.8.1",
"tslib": "2.7.0",
"zone.js": "0.14.10"
"tslib": "2.8.1",
"zone.js": "0.15.0"
},

"devDependencies": {
"@angular-devkit/build-angular": "18.2.8",
"@angular/cli": "18.2.8",
"@angular/compiler-cli": "18.2.8",
"@types/jasmine": "5.1.4",
"@angular-devkit/build-angular": "19.0.3",
"@angular/cli": "19.0.3",
"@angular/compiler-cli": "19.0.3",
"@types/jasmine": "5.1.5",
"autoprefixer": "10.4.20",
"cssnano": "7.0.5",
"jasmine-core": "5.3.0",
"cssnano": "7.0.6",
"jasmine-core": "5.5.0",
"karma": "6.4.4",
"karma-chrome-launcher": "3.2.0",
"karma-coverage": "2.2.1",
"karma-jasmine": "5.1.0",
"karma-jasmine-html-reporter": "2.1.0",
"postcss": "8.4.47",
"postcss": "8.4.49",
"postcss-cli": "11.0.0",
"tslombok": "^1.2.6",
"typescript": "5.5.4"
Expand Down
4 changes: 2 additions & 2 deletions solr/webapp/web/solrUi/src/app/app.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*
*/

@use "modules/dashboard/components/main/main.component";

$color_1: #c0c0c0;
$color_2: #fff;
$color_3: #4D4D4D;
Expand Down Expand Up @@ -205,5 +207,3 @@ $border-color_1: #c0c0c0;
padding: 5px;
}
}

@import "modules/dashboard/components/main/main.component";
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import {Pipe, PipeTransform} from '@angular/core';


@Pipe({
name: 'sizeUnitConverter'
name: 'sizeUnitConverter',
standalone: false
})
export class SizeUnitConverterPipe implements PipeTransform {
private readonly unitNames: {short:string, long:string}[]= [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
import {Pipe, PipeTransform} from '@angular/core';

@Pipe({
name: 'timeAgo'
name: 'timeAgo',
standalone: false
})
export class TimeAgoPipe implements PipeTransform {
private static YEAR_MS: number = 1000 * 60 * 60 * 24 * 7 * 4 * 12;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import {SharedModule} from "../../../common/shared.module";
@Component({
selector: 'app-dashboard',
templateUrl: './main.component.html',
styleUrl: './main.component.scss'
styleUrl: './main.component.scss',
standalone: false
})
export class MainComponent {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ export const environment = {
production: false,
apiUrl: 'http://localhost:8080/',
};

7 changes: 4 additions & 3 deletions solr/webapp/web/solrUi/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
*
*/


@use "app/app.component";

$color_1: #333;
$color_2: #ffffff;
$color_3: #fff;
Expand Down Expand Up @@ -502,11 +505,9 @@ pre.syntax.language-json {
}
.new-ui-warning {
span.help {
background-image: url(../../img/ico/information-white.png );
background-image: url(../../img/ico/information-white.png);
right: 0px;
padding-left: 16px;
}
}

@import "app/app.component";

0 comments on commit 28f87a6

Please sign in to comment.