diff --git a/CHANGELOG.md b/CHANGELOG.md index 32acbedf96..34f28abc35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +## v2.34.0 - 2023-07-05 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.33.3...v2.34.0) + +- [#2000](https://github.com/ORCID/orcid-angular/pull/2000): Rollback fix: Temporarily remove onetrust link from footer +- [#2002](https://github.com/ORCID/orcid-angular/pull/2002): fix: Add missing assistive text to professional activities and sort type +- [#2001](https://github.com/ORCID/orcid-angular/pull/2001): fix: Update professional activities link section + +### Fix + +- Add missing assistive text to professional activities and sort type +- Update professional activities link section +- Temporarily remove onetrust link from footer + +## v2.33.3 - 2023-07-03 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.33.2...v2.33.3) + +- [#1999](https://github.com/ORCID/orcid-angular/pull/1999): Fix/developer tools second batch + ## v2.33.2 - 2023-07-02 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.33.1...v2.33.2) diff --git a/src/app/cdk/panel/panels/panels.component.html b/src/app/cdk/panel/panels/panels.component.html index ac6874be3a..1e5ac1657a 100644 --- a/src/app/cdk/panel/panels/panels.component.html +++ b/src/app/cdk/panel/panels/panels.component.html @@ -232,6 +232,7 @@

mat-menu-item (click)="sortChange(option)" *ngFor="let option of sortTypes" + [attr.aria-label]="option | appPanelsSortByAriaLabel" > {{ option | sortLabel }} Accessibility Statement + + + diff --git a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html index 3ab095f13e..ede6bb350f 100644 --- a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html +++ b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.html @@ -324,8 +324,8 @@ Learn more about adding professional activities to your ORCID record diff --git a/src/app/shared/pipes/app-panels-add-aria-label/app-panels-add-aria-label.pipe.ts b/src/app/shared/pipes/app-panels-add-aria-label/app-panels-add-aria-label.pipe.ts index e2acec35be..38d4d20fad 100644 --- a/src/app/shared/pipes/app-panels-add-aria-label/app-panels-add-aria-label.pipe.ts +++ b/src/app/shared/pipes/app-panels-add-aria-label/app-panels-add-aria-label.pipe.ts @@ -7,6 +7,8 @@ export class AppPanelsAddAriaLabelPipe implements PipeTransform { transform(panelType: any, args?: any): string { if (panelType == 'employment') { return $localize`:@@shared.employmentAddAriaLabel:Add employment` + } else if (panelType == 'professional-activities') { + return $localize`:@@shared.addProfessionalActivity:Add a professional activity ` } else if (panelType == 'education' || panelType == 'qualification') { return $localize`:@@shared.educationQualificationAddAriaLabel:Add education or qualification` } else if (panelType == 'distinction' || panelType == 'invited-position') { diff --git a/src/app/shared/pipes/app-panels-sort-aria-label/app-panels-sort-aria-label.pipe.ts b/src/app/shared/pipes/app-panels-sort-aria-label/app-panels-sort-aria-label.pipe.ts index 4b20526542..23935626b5 100644 --- a/src/app/shared/pipes/app-panels-sort-aria-label/app-panels-sort-aria-label.pipe.ts +++ b/src/app/shared/pipes/app-panels-sort-aria-label/app-panels-sort-aria-label.pipe.ts @@ -14,6 +14,11 @@ export class AppPanelsSortAriaLabelPipe implements PipeTransform { $localize`:@@shared.employmentSortAriaLabel:Sort your employment` + disabledStr ) + } else if (panelType === 'professional-activities') { + return ( + $localize`:@@shared.sortProfessionalActivities:Sort your professional activities` + + disabledStr + ) } else if (panelType === 'education' || panelType === 'qualification') { return ( $localize`:@@shared.educationQualificationSortAriaLabel:Sort your education and qualifications` + diff --git a/src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.spec.ts b/src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.spec.ts new file mode 100644 index 0000000000..56af4c878e --- /dev/null +++ b/src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.spec.ts @@ -0,0 +1,8 @@ +import { AppPanelsSortByAriaLabelPipe } from './app-panels-sort-by-aria-label.pipe'; + +describe('AppPanelsSortByAriaLabelPipe', () => { + it('create an instance', () => { + const pipe = new AppPanelsSortByAriaLabelPipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.ts b/src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.ts new file mode 100644 index 0000000000..170cef667a --- /dev/null +++ b/src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.ts @@ -0,0 +1,25 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { SortOrderType } from '../../../types/sort' + +@Pipe({ + name: 'appPanelsSortByAriaLabel' +}) +export class AppPanelsSortByAriaLabelPipe implements PipeTransform { + + transform(sortBy: SortOrderType): string { + switch (sortBy) { + case 'title': + return $localize`:@@shared.sortTitle:Sort by title` + case 'start': + return $localize`:@@shared.sortStart:Sort by start date` + case 'end': + return $localize`:@@shared.sortEnd:Sort by end date` + case 'date': + return $localize`:@@shared.sortDate:Sort by type` + case 'type': + return $localize`:@@shared.sortType:Sort by type` + case 'order': + return $localize`:@@shared.sortOrder:Sort by order` + } + } +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index d614ad45d8..bc52a8a249 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -48,7 +48,8 @@ import { AppPanelActivityActionAriaLabelPipe } from './pipes/app-panel-activity- import { SortByPipe } from './pipes/sort-by/sort-by.pipe' import { AffiliationLabelPipe } from './pipes/affiliation-label.pipe' import { AffiliationTypePipe } from './pipes/affiliation-type/affiliation-type.pipe' -import { ScopePathTypePipe } from './pipes/scope-path-type/scope-path-type.pipe' +import { ScopePathTypePipe } from './pipes/scope-path-type/scope-path-type.pipe'; +import { AppPanelsSortByAriaLabelPipe } from './pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe' @NgModule({ imports: [ CommonModule, @@ -97,6 +98,7 @@ import { ScopePathTypePipe } from './pipes/scope-path-type/scope-path-type.pipe' AffiliationLabelPipe, AffiliationTypePipe, ScopePathTypePipe, + AppPanelsSortByAriaLabelPipe, ], exports: [ CommonModule, @@ -143,6 +145,7 @@ import { ScopePathTypePipe } from './pipes/scope-path-type/scope-path-type.pipe' SortByPipe, AffiliationTypePipe, ScopePathTypePipe, + AppPanelsSortByAriaLabelPipe, ], providers: [], // Should not provide anything }) diff --git a/src/locale/properties/developer-tools/developer-tools.en.properties b/src/locale/properties/developer-tools/developer-tools.en.properties index 100ee8178f..36b0f638e4 100644 --- a/src/locale/properties/developer-tools/developer-tools.en.properties +++ b/src/locale/properties/developer-tools/developer-tools.en.properties @@ -61,7 +61,7 @@ developerTools.providesAnAccess=Provides an access token that can be used to rea developerTools.moreInformation=More information on OpenID Connect Endpoint developerTools.responseType=Response type developerTools.clientId=Client ID -developerTools.exampleCode=Example code +developerTools.exampleCode=example code developerTools.ariaLabelWebsiteDelete=Delete redirect URI developerTools.labelAuthorizeRequest=Authorize request developerTools.labelTokenRequest=Token request diff --git a/src/locale/properties/shared/shared.en.properties b/src/locale/properties/shared/shared.en.properties index 613988d3f0..b38b7b0bea 100644 --- a/src/locale/properties/shared/shared.en.properties +++ b/src/locale/properties/shared/shared.en.properties @@ -598,3 +598,11 @@ share.selfService=Self Service - ORCID share.orcidTitle=- ORCID share.myOrcidTitle=- My ORCID share.developerTools=Developer tools - ORCID +shared.addProfessionalActivity=Add a professional activity +shared.sortProfessionalActivities=Sort your professional activities +shared.sortTitle=Sort by title +shared.sortStart=Sort by start date +shared.sortEnd=Sort by end date +shared.sortType=Sort by type +shared.sortDate=Sort by type +shared.sortOrder=Sort by order