Skip to content

Commit 87788e7

Browse files
alexandrevryghemalexandrevryghem
committed
Merge remote-tracking branch 'upstream/main' into fix-specs-without-expectations_contribute-main
2 parents a340eb2 + 061129e commit 87788e7

373 files changed

Lines changed: 20629 additions & 1520 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/config.example.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,3 +424,12 @@ comcolSelectionSort:
424424
# suggestion:
425425
# - collectionId: 8f7df5ca-f9c2-47a4-81ec-8a6393d6e5af
426426
# source: "openaire"
427+
428+
429+
# Search settings
430+
search:
431+
# Settings to enable/disable or configure advanced search filters.
432+
advancedFilters:
433+
enabled: false
434+
# List of filters to enable in "Advanced Search" dropdown
435+
filter: [ 'title', 'author', 'subject', 'entityType' ]

‎cypress/e2e/collection-edit.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe('Edit Collection > Content Source tab', () => {
4545
cy.get('#externalSourceCheck').check();
4646

4747
// Wait for the source controls to appear
48-
cy.get('ds-collection-source-controls').should('be.visible');
48+
// cy.get('ds-collection-source-controls').should('be.visible');
4949

5050
// Analyze entire page for accessibility issues
5151
testA11y('ds-collection-source');

‎cypress/e2e/collection-statistics.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ describe('Collection Statistics Page', () => {
66

77
it('should load if you click on "Statistics" from a Collection page', () => {
88
cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
9-
cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
9+
cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
1010
cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE);
1111
});
1212

‎cypress/e2e/community-statistics.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ describe('Community Statistics Page', () => {
66

77
it('should load if you click on "Statistics" from a Community page', () => {
88
cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
9-
cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
9+
cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
1010
cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
1111
});
1212

‎cypress/e2e/homepage-statistics.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import '../support/commands';
55
describe('Site Statistics Page', () => {
66
it('should load if you click on "Statistics" from homepage', () => {
77
cy.visit('/');
8-
cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
8+
cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
99
cy.location('pathname').should('eq', '/statistics');
1010
});
1111

‎cypress/e2e/item-statistics.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ describe('Item Statistics Page', () => {
66

77
it('should load if you click on "Statistics" from an Item/Entity page', () => {
88
cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
9-
cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
9+
cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
1010
cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
1111
});
1212

‎cypress/e2e/login-modal.cy.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@ import { testA11y } from 'cypress/support/utils';
33
const page = {
44
openLoginMenu() {
55
// Click the "Log In" dropdown menu in header
6-
cy.get('ds-themed-navbar [data-test="login-menu"]').click();
6+
cy.get('ds-themed-header [data-test="login-menu"]').click();
77
},
88
openUserMenu() {
99
// Once logged in, click the User menu in header
10-
cy.get('ds-themed-navbar [data-test="user-menu"]').click();
10+
cy.get('ds-themed-header [data-test="user-menu"]').click();
1111
},
1212
submitLoginAndPasswordByPressingButton(email, password) {
1313
// Enter email
14-
cy.get('ds-themed-navbar [data-test="email"]').type(email);
14+
cy.get('ds-themed-header [data-test="email"]').type(email);
1515
// Enter password
16-
cy.get('ds-themed-navbar [data-test="password"]').type(password);
16+
cy.get('ds-themed-header [data-test="password"]').type(password);
1717
// Click login button
18-
cy.get('ds-themed-navbar [data-test="login-button"]').click();
18+
cy.get('ds-themed-header [data-test="login-button"]').click();
1919
},
2020
submitLoginAndPasswordByPressingEnter(email, password) {
2121
// In opened Login modal, fill out email & password, then click Enter
22-
cy.get('ds-themed-navbar [data-test="email"]').type(email);
23-
cy.get('ds-themed-navbar [data-test="password"]').type(password);
24-
cy.get('ds-themed-navbar [data-test="password"]').type('{enter}');
22+
cy.get('ds-themed-header [data-test="email"]').type(email);
23+
cy.get('ds-themed-header [data-test="password"]').type(password);
24+
cy.get('ds-themed-header [data-test="password"]').type('{enter}');
2525
},
2626
submitLogoutByPressingButton() {
2727
// This is the POST command that will actually log us out
2828
cy.intercept('POST', '/server/api/authn/logout').as('logout');
2929
// Click logout button
30-
cy.get('ds-themed-navbar [data-test="logout-button"]').click();
30+
cy.get('ds-themed-header [data-test="logout-button"]').click();
3131
// Wait until above POST command responds before continuing
3232
// (This ensures next action waits until logout completes)
3333
cy.wait('@logout');
@@ -102,10 +102,10 @@ describe('Login Modal', () => {
102102
page.openLoginMenu();
103103

104104
// Registration link should be visible
105-
cy.get('ds-themed-navbar [data-test="register"]').should('be.visible');
105+
cy.get('ds-themed-header [data-test="register"]').should('be.visible');
106106

107107
// Click registration link & you should go to registration page
108-
cy.get('ds-themed-navbar [data-test="register"]').click();
108+
cy.get('ds-themed-header [data-test="register"]').click();
109109
cy.location('pathname').should('eq', '/register');
110110
cy.get('ds-register-email').should('exist');
111111

@@ -119,10 +119,10 @@ describe('Login Modal', () => {
119119
page.openLoginMenu();
120120

121121
// Forgot password link should be visible
122-
cy.get('ds-themed-navbar [data-test="forgot"]').should('be.visible');
122+
cy.get('ds-themed-header [data-test="forgot"]').should('be.visible');
123123

124124
// Click link & you should go to Forgot Password page
125-
cy.get('ds-themed-navbar [data-test="forgot"]').click();
125+
cy.get('ds-themed-header [data-test="forgot"]').click();
126126
cy.location('pathname').should('eq', '/forgot');
127127
cy.get('ds-forgot-email').should('exist');
128128

‎cypress/e2e/search-navbar.cy.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
const page = {
22
fillOutQueryInNavBar(query) {
33
// Click the magnifying glass
4-
cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
4+
cy.get('ds-themed-header [data-test="header-search-icon"]').click();
55
// Fill out a query in input that appears
6-
cy.get('ds-themed-navbar [data-test="header-search-box"]').type(query);
6+
cy.get('ds-themed-header [data-test="header-search-box"]').type(query);
77
},
88
submitQueryByPressingEnter() {
9-
cy.get('ds-themed-navbar [data-test="header-search-box"]').type('{enter}');
9+
cy.get('ds-themed-header [data-test="header-search-box"]').type('{enter}');
1010
},
1111
submitQueryByPressingIcon() {
12-
cy.get('ds-themed-navbar [data-test="header-search-icon"]').click();
12+
cy.get('ds-themed-header [data-test="header-search-icon"]').click();
1313
}
1414
};
1515

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
"@angular-eslint/eslint-plugin-template": "15.2.1",
143143
"@angular-eslint/schematics": "15.2.1",
144144
"@angular-eslint/template-parser": "15.2.1",
145-
"@angular/cli": "^15.2.6",
145+
"@angular/cli": "^16.0.4",
146146
"@angular/compiler-cli": "^15.2.8",
147147
"@angular/language-service": "^15.2.8",
148148
"@cypress/schematic": "^1.5.0",
@@ -170,7 +170,7 @@
170170
"eslint": "^8.39.0",
171171
"eslint-plugin-deprecation": "^1.4.1",
172172
"eslint-plugin-import": "^2.27.5",
173-
"eslint-plugin-jsdoc": "^39.6.4",
173+
"eslint-plugin-jsdoc": "^45.0.0",
174174
"eslint-plugin-jsonc": "^2.6.0",
175175
"eslint-plugin-lodash": "^7.4.0",
176176
"eslint-plugin-unused-imports": "^2.0.0",

‎src/app/admin/admin-ldn-services/admin-ldn-services-routing.module.ts‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import { NgModule } from '@angular/core';
2+
import { RouterModule, Routes } from '@angular/router';
3+
import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
4+
import { NavigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver';
5+
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
6+
import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
7+
8+
9+
const moduleRoutes: Routes = [
10+
{
11+
path: '',
12+
pathMatch: 'full',
13+
component: LdnServicesOverviewComponent,
14+
resolve: {breadcrumb: I18nBreadcrumbResolver},
15+
data: {title: 'ldn-registered-services.title', breadcrumbKey: 'ldn-registered-services.new'},
16+
},
17+
{
18+
path: 'new',
19+
resolve: {breadcrumb: NavigationBreadcrumbResolver},
20+
component: LdnServiceFormComponent,
21+
data: {title: 'ldn-register-new-service.title', breadcrumbKey: 'ldn-register-new-service'}
22+
},
23+
{
24+
path: 'edit/:serviceId',
25+
resolve: {breadcrumb: NavigationBreadcrumbResolver},
26+
component: LdnServiceFormComponent,
27+
data: {title: 'ldn-edit-service.title', breadcrumbKey: 'ldn-edit-service'}
28+
},
29+
];
30+
31+
32+
@NgModule({
33+
imports: [
34+
RouterModule.forChild(moduleRoutes.map(route => {
35+
return {...route, data: {
36+
...route.data,
37+
relatedRoutes: moduleRoutes.filter(relatedRoute => relatedRoute.path !== route.path)
38+
.map((relatedRoute) => {
39+
return {path: relatedRoute.path, data: relatedRoute.data};
40+
})
41+
}};
42+
}))
43+
]
44+
})
45+
export class AdminLdnServicesRoutingModule {
46+
47+
}

0 commit comments

Comments
 (0)