mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 18:14:17 +00:00
87968: Automatic upgrade to Angular 13
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
|
/.angular/cache
|
||||||
/__build__
|
/__build__
|
||||||
/__server_build__
|
/__server_build__
|
||||||
/node_modules
|
/node_modules
|
||||||
|
13
angular.json
13
angular.json
@@ -166,19 +166,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lint": {
|
|
||||||
"builder": "@angular-devkit/build-angular:tslint",
|
|
||||||
"options": {
|
|
||||||
"tsConfig": [
|
|
||||||
"tsconfig.app.json",
|
|
||||||
"tsconfig.spec.json",
|
|
||||||
"cypress/tsconfig.json"
|
|
||||||
],
|
|
||||||
"exclude": [
|
|
||||||
"**/node_modules/**"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"e2e": {
|
"e2e": {
|
||||||
"builder": "@cypress/schematic:cypress",
|
"builder": "@cypress/schematic:cypress",
|
||||||
"options": {
|
"options": {
|
||||||
|
30
package.json
30
package.json
@@ -51,17 +51,17 @@
|
|||||||
"ts-node": "10.2.1"
|
"ts-node": "10.2.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "~12.2.16",
|
"@angular/animations": "~13.2.6",
|
||||||
"@angular/cdk": "^12.2.13",
|
"@angular/cdk": "^12.2.13",
|
||||||
"@angular/common": "~12.2.16",
|
"@angular/common": "~13.2.6",
|
||||||
"@angular/compiler": "~12.2.16",
|
"@angular/compiler": "~13.2.6",
|
||||||
"@angular/core": "~12.2.16",
|
"@angular/core": "~13.2.6",
|
||||||
"@angular/forms": "~12.2.16",
|
"@angular/forms": "~13.2.6",
|
||||||
"@angular/localize": "12.2.16",
|
"@angular/localize": "13.2.6",
|
||||||
"@angular/platform-browser": "~12.2.16",
|
"@angular/platform-browser": "~13.2.6",
|
||||||
"@angular/platform-browser-dynamic": "~12.2.16",
|
"@angular/platform-browser-dynamic": "~13.2.6",
|
||||||
"@angular/platform-server": "~12.2.16",
|
"@angular/platform-server": "~13.2.6",
|
||||||
"@angular/router": "~12.2.16",
|
"@angular/router": "~13.2.6",
|
||||||
"@babel/runtime": "^7.17.2",
|
"@babel/runtime": "^7.17.2",
|
||||||
"@kolkov/ngx-gallery": "1.2.3",
|
"@kolkov/ngx-gallery": "1.2.3",
|
||||||
"@material-ui/core": "^4.11.0",
|
"@material-ui/core": "^4.11.0",
|
||||||
@@ -128,10 +128,10 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-builders/custom-webpack": "~12.1.3",
|
"@angular-builders/custom-webpack": "~12.1.3",
|
||||||
"@angular-devkit/build-angular": "~12.2.16",
|
"@angular-devkit/build-angular": "~13.2.6",
|
||||||
"@angular/cli": "~12.2.16",
|
"@angular/cli": "~13.2.6",
|
||||||
"@angular/compiler-cli": "~12.2.16",
|
"@angular/compiler-cli": "~13.2.6",
|
||||||
"@angular/language-service": "~12.2.16",
|
"@angular/language-service": "~13.2.6",
|
||||||
"@cypress/schematic": "^1.5.0",
|
"@cypress/schematic": "^1.5.0",
|
||||||
"@fortawesome/fontawesome-free": "^5.5.0",
|
"@fortawesome/fontawesome-free": "^5.5.0",
|
||||||
"@ngrx/store-devtools": "^12.5.1",
|
"@ngrx/store-devtools": "^12.5.1",
|
||||||
@@ -190,7 +190,7 @@
|
|||||||
"ts-loader": "^5.2.0",
|
"ts-loader": "^5.2.0",
|
||||||
"ts-node": "^8.10.2",
|
"ts-node": "^8.10.2",
|
||||||
"tslint": "^6.1.3",
|
"tslint": "^6.1.3",
|
||||||
"typescript": "~4.3.5",
|
"typescript": "~4.5.5",
|
||||||
"webpack": "^5.69.1",
|
"webpack": "^5.69.1",
|
||||||
"webpack-bundle-analyzer": "^4.4.0",
|
"webpack-bundle-analyzer": "^4.4.0",
|
||||||
"webpack-cli": "^4.2.0",
|
"webpack-cli": "^4.2.0",
|
||||||
|
@@ -8,7 +8,7 @@
|
|||||||
<span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
|
<span class="fa fa-chevron-right invisible" aria-hidden="true"></span>
|
||||||
</button>
|
</button>
|
||||||
<div class="align-middle pt-2">
|
<div class="align-middle pt-2">
|
||||||
<a *ngIf="node!==loadingNode" [routerLink]="" (click)="getNextPage(node)"
|
<a *ngIf="node!==loadingNode" [routerLink]="[][]" (click)="getNextPage(node)"
|
||||||
class="btn btn-outline-primary btn-sm" role="button">
|
class="btn btn-outline-primary btn-sm" role="button">
|
||||||
<i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
|
<i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
|
||||||
</a>
|
</a>
|
||||||
|
@@ -8,10 +8,10 @@
|
|||||||
</ds-file-download-link>
|
</ds-file-download-link>
|
||||||
<ds-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-loading>
|
<ds-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-loading>
|
||||||
<div *ngIf="!isLastPage" class="mt-1" id="view-more">
|
<div *ngIf="!isLastPage" class="mt-1" id="view-more">
|
||||||
<a class="bitstream-view-more btn btn-outline-secondary btn-sm" [routerLink]="" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</a>
|
<a class="bitstream-view-more btn btn-outline-secondary btn-sm" [routerLink]="[]" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</a>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="isLastPage && currentPage != 1" class="mt-1" id="collapse">
|
<div *ngIf="isLastPage && currentPage != 1" class="mt-1" id="collapse">
|
||||||
<a class="bitstream-collapse btn btn-outline-secondary btn-sm" [routerLink]="" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</a>
|
<a class="bitstream-collapse btn btn-outline-secondary btn-sm" [routerLink]="[]" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ds-metadata-field-wrapper>
|
</ds-metadata-field-wrapper>
|
||||||
|
@@ -7,11 +7,11 @@
|
|||||||
<ds-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-loading>
|
<ds-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-loading>
|
||||||
<div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && representations?.length > 0">
|
<div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && representations?.length > 0">
|
||||||
<div *ngIf="(objects.length * incrementBy) < total" class="float-left">
|
<div *ngIf="(objects.length * incrementBy) < total" class="float-left">
|
||||||
<a [routerLink]="" (click)="increase()">{{'item.page.related-items.view-more' |
|
<a [routerLink]="[]" (click)="increase()">{{'item.page.related-items.view-more' |
|
||||||
translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</a>
|
translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</a>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="objects.length > 1" class="float-right">
|
<div *ngIf="objects.length > 1" class="float-right">
|
||||||
<a [routerLink]="" (click)="decrease()">{{'item.page.related-items.view-less' |
|
<a [routerLink]="[]" (click)="decrease()">{{'item.page.related-items.view-less' |
|
||||||
translate:{ amount: representations?.length } }}</a>
|
translate:{ amount: representations?.length } }}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -7,11 +7,11 @@
|
|||||||
<ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
|
<ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
|
||||||
<div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
|
<div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
|
||||||
<div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
|
<div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
|
||||||
<a [routerLink]="" (click)="increase()">{{'item.page.related-items.view-more' |
|
<a [routerLink]="[]" (click)="increase()">{{'item.page.related-items.view-more' |
|
||||||
translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }}</a>
|
translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }}</a>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="objects.length > 1" class="float-right" id="view-less">
|
<div *ngIf="objects.length > 1" class="float-right" id="view-less">
|
||||||
<a [routerLink]="" (click)="decrease()">{{'item.page.related-items.view-less' |
|
<a [routerLink]="[]" (click)="decrease()">{{'item.page.related-items.view-less' |
|
||||||
translate:{ amount: itemsRD?.payload?.page?.length } }}</a>
|
translate:{ amount: itemsRD?.payload?.page?.length } }}</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -38,13 +38,7 @@ const ENTRY_COMPONENTS = [
|
|||||||
NavbarSectionComponent,
|
NavbarSectionComponent,
|
||||||
ExpandableNavbarSectionComponent
|
ExpandableNavbarSectionComponent
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [],
|
||||||
|
|
||||||
],
|
|
||||||
entryComponents: [
|
|
||||||
NavbarSectionComponent,
|
|
||||||
ExpandableNavbarSectionComponent
|
|
||||||
],
|
|
||||||
exports: [
|
exports: [
|
||||||
ThemedNavbarComponent,
|
ThemedNavbarComponent,
|
||||||
NavbarSectionComponent,
|
NavbarSectionComponent,
|
||||||
|
@@ -33,8 +33,7 @@ import { ExportMetadataSelectorComponent } from './export-metadata-selector.comp
|
|||||||
],
|
],
|
||||||
exports: [],
|
exports: [],
|
||||||
declarations: [ConfirmationModalComponent],
|
declarations: [ConfirmationModalComponent],
|
||||||
providers: [],
|
providers: []
|
||||||
entryComponents: [ConfirmationModalComponent],
|
|
||||||
})
|
})
|
||||||
class ModelTestModule {
|
class ModelTestModule {
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
<div class="d-flex flex-row">
|
<div class="d-flex flex-row">
|
||||||
<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="" [queryParams]="getQueryParams()" [queryParamsHandling]="'merge'" class="lead">
|
<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="[][]" [queryParams]="getQueryParams()" [queryParamsHandling]="'merge'" class="lead">
|
||||||
{{object.value}}
|
{{object.value}}
|
||||||
</a>
|
</a>
|
||||||
<span *ngIf="linkType == linkTypes.None" class="lead">
|
<span *ngIf="linkType == linkTypes.None" class="lead">
|
||||||
|
@@ -18,16 +18,6 @@
|
|||||||
* BROWSER POLYFILLS
|
* BROWSER POLYFILLS
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
|
|
||||||
// import 'classlist.js'; // Run `npm install --save classlist.js`.
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Web Animations `@angular/platform-browser/animations`
|
|
||||||
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
|
|
||||||
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
|
|
||||||
*/
|
|
||||||
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* By default, zone.js will patch all possible macroTask and DomEvents
|
* By default, zone.js will patch all possible macroTask and DomEvents
|
||||||
* user can disable parts of macroTask/DomEvents patch by setting following flags
|
* user can disable parts of macroTask/DomEvents patch by setting following flags
|
||||||
|
@@ -12,7 +12,9 @@ declare const require: any;
|
|||||||
// First, initialize the Angular testing environment.
|
// First, initialize the Angular testing environment.
|
||||||
getTestBed().initTestEnvironment(
|
getTestBed().initTestEnvironment(
|
||||||
BrowserDynamicTestingModule,
|
BrowserDynamicTestingModule,
|
||||||
platformBrowserDynamicTesting()
|
platformBrowserDynamicTesting(), {
|
||||||
|
teardown: { destroyAfterEach: false }
|
||||||
|
}
|
||||||
);
|
);
|
||||||
// Then we find all the tests.
|
// Then we find all the tests.
|
||||||
const context = require.context('./', true, /\.spec\.ts$/);
|
const context = require.context('./', true, /\.spec\.ts$/);
|
||||||
|
Reference in New Issue
Block a user