From 55d704c522a68fe2ddc5093c194fb6f20493f0aa Mon Sep 17 00:00:00 2001 From: leomendoza123 Date: Mon, 3 Jul 2023 16:48:14 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=A4=96=20GITHUB=20ACTIONS=20i18n=20ge?= =?UTF-8?q?nerator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../properties/developer-tools/developer-tools.en.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/locale/properties/developer-tools/developer-tools.en.properties b/src/locale/properties/developer-tools/developer-tools.en.properties index a82ff24260..5c72e14e83 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 @@ -75,4 +75,3 @@ developerTools.expand=Expand developerTools.replaceWithRedirect=REPLACE WITH REDIRECT URI developerTools.replaceWithOauth=REPLACE WITH OAUTH CODE developerTools.backToMyRecod=Back to my record -developerTools.exampleCode=example code From 834a60c6c4e174ec5a9497138d37fc6b4b9476ed Mon Sep 17 00:00:00 2001 From: github actions Date: Mon, 3 Jul 2023 17:01:05 +0000 Subject: [PATCH 2/6] v2.33.3 changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32acbedf96..77b3cd017c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 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) From 57c8d8e6a3a975363e4a951176c62d8014359516 Mon Sep 17 00:00:00 2001 From: Daniel Palafox Date: Tue, 4 Jul 2023 20:05:40 +0700 Subject: [PATCH 3/6] fix: Temporarily remove onetrust link from footer --- src/app/layout/footer/footer.component.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/app/layout/footer/footer.component.html b/src/app/layout/footer/footer.component.html index d1f16fc391..5786844d6c 100644 --- a/src/app/layout/footer/footer.component.html +++ b/src/app/layout/footer/footer.component.html @@ -79,6 +79,13 @@ > Accessibility Statement + + +
+
Brand Guidelines + + Cookie Settings +
From 709b3c7060c51d62c515dd890bd8931cfdc4a119 Mon Sep 17 00:00:00 2001 From: Daniel Palafox Date: Tue, 4 Jul 2023 20:26:45 +0700 Subject: [PATCH 4/6] fix: Update professional activities link section --- .../affiliation-stacks-groups.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 667d99269ab3f650a2c28693e584dc0bf9930223 Mon Sep 17 00:00:00 2001 From: Daniel Palafox Date: Tue, 4 Jul 2023 22:58:53 +0700 Subject: [PATCH 5/6] fix: Add missing assistive text to professional activities and sort type --- .../cdk/panel/panels/panels.component.html | 1 + .../app-panels-add-aria-label.pipe.ts | 2 ++ .../app-panels-sort-aria-label.pipe.ts | 5 ++++ ...app-panels-sort-by-aria-label.pipe.spec.ts | 8 ++++++ .../app-panels-sort-by-aria-label.pipe.ts | 25 +++++++++++++++++++ src/app/shared/shared.module.ts | 5 +++- .../properties/shared/shared.en.properties | 8 ++++++ 7 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.spec.ts create mode 100644 src/app/shared/pipes/app-panels-sort-by-aria-label/app-panels-sort-by-aria-label.pipe.ts 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 }} { + 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/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 From d20c745522bfec1dd40a32f8deb1feb7e9c3e49f Mon Sep 17 00:00:00 2001 From: github actions Date: Wed, 5 Jul 2023 23:13:31 +0000 Subject: [PATCH 6/6] v2.34.0 changelog update --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77b3cd017c..34f28abc35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +## 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)