-
Notifications
You must be signed in to change notification settings - Fork 445
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into DURACOM-195
# Conflicts: # src/assets/i18n/en.json5 # src/styles/_custom_variables.scss # src/themes/dspace/styles/_theme_css_variable_overrides.scss
- Loading branch information
Showing
251 changed files
with
10,467 additions
and
1,385 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...ons-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import { Injectable } from '@angular/core'; | ||
| import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router'; | ||
|
|
||
| /** | ||
| * Interface for the route parameters. | ||
| */ | ||
| export interface AdminNotificationsPublicationClaimPageParams { | ||
| pageId?: string; | ||
| pageSize?: number; | ||
| currentPage?: number; | ||
| } | ||
|
|
||
| /** | ||
| * This class represents a resolver that retrieve the route data before the route is activated. | ||
| */ | ||
| @Injectable() | ||
| export class AdminNotificationsPublicationClaimPageResolver implements Resolve<AdminNotificationsPublicationClaimPageParams> { | ||
|
|
||
| /** | ||
| * Method for resolving the parameters in the current route. | ||
| * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot | ||
| * @param {RouterStateSnapshot} state The current RouterStateSnapshot | ||
| * @returns AdminNotificationsSuggestionTargetsPageParams Emits the route parameters | ||
| */ | ||
| resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): AdminNotificationsPublicationClaimPageParams { | ||
| return { | ||
| pageId: route.queryParams.pageId, | ||
| pageSize: parseInt(route.queryParams.pageSize, 10), | ||
| currentPage: parseInt(route.queryParams.page, 10) | ||
| }; | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
...ications-publication-claim-page/admin-notifications-publication-claim-page.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| <ds-publication-claim [source]="'openaire'"></ds-publication-claim> |
File renamed without changes.
38 changes: 38 additions & 0 deletions
38
...tions-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page.component'; | ||
| import { NO_ERRORS_SCHEMA } from '@angular/core'; | ||
| import { CommonModule } from '@angular/common'; | ||
| import { TranslateModule } from '@ngx-translate/core'; | ||
|
|
||
| describe('AdminNotificationsPublicationClaimPageComponent', () => { | ||
| let component: AdminNotificationsPublicationClaimPageComponent; | ||
| let fixture: ComponentFixture<AdminNotificationsPublicationClaimPageComponent>; | ||
|
|
||
| beforeEach(async(() => { | ||
| TestBed.configureTestingModule({ | ||
| imports: [ | ||
| CommonModule, | ||
| TranslateModule.forRoot() | ||
| ], | ||
| declarations: [ | ||
| AdminNotificationsPublicationClaimPageComponent | ||
| ], | ||
| providers: [ | ||
| AdminNotificationsPublicationClaimPageComponent | ||
| ], | ||
| schemas: [NO_ERRORS_SCHEMA] | ||
| }) | ||
| .compileComponents(); | ||
| })); | ||
|
|
||
| beforeEach(() => { | ||
| fixture = TestBed.createComponent(AdminNotificationsPublicationClaimPageComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
10 changes: 10 additions & 0 deletions
10
...ifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import { Component } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'ds-admin-notifications-publication-claim-page', | ||
| templateUrl: './admin-notifications-publication-claim-page.component.html', | ||
| styleUrls: ['./admin-notifications-publication-claim-page.component.scss'] | ||
| }) | ||
| export class AdminNotificationsPublicationClaimPageComponent { | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +0,0 @@ | ||
| :host { | ||
| ::ng-deep { | ||
| .switch { | ||
| position: absolute; | ||
| top: calc(var(--bs-spacer) * 2.5); | ||
| } | ||
| } | ||
| } | ||
| :host ::ng-deep ds-dynamic-form-control-container > div > label { | ||
| margin-top: 1.75rem; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.