Skip to content

Commit a947e8c

Browse files
Merge branch 'main' into w2p-119915_made-edit-metadata-tab-fields-dynamic_contribute-main
# Conflicts: # src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html # src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html # src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts # src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html # src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
2 parents 2eb34ee + 15f39ea commit a947e8c

936 files changed

Lines changed: 19486 additions & 17665 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.

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,8 @@
294294
"rules": {
295295
// Custom DSpace Angular rules
296296
"dspace-angular-html/themed-component-usages": "error",
297-
"dspace-angular-html/no-disabled-attribute-on-button": "error"
297+
"dspace-angular-html/no-disabled-attribute-on-button": "error",
298+
"@angular-eslint/template/prefer-control-flow": "error"
298299
}
299300
},
300301
{

cypress/e2e/community-list.cy.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ describe('Community List Page', () => {
1212
cy.get('[data-test="expand-button"]').click({ multiple: true });
1313

1414
// Analyze <ds-community-list-page> for accessibility issues
15-
testA11y('ds-community-list-page');
15+
testA11y('ds-community-list-page', {
16+
rules: {
17+
// When expanding a cdk node on the community-list page, the 'aria-posinset' property becomes 0.
18+
// 0 is not a valid value for 'aria-posinset' so the test fails.
19+
// see https://github.com/DSpace/dspace-angular/issues/4068
20+
'aria-valid-attr-value': { enabled: false },
21+
},
22+
});
1623
});
1724
});

0 commit comments

Comments
 (0)