From a9cfa4e807b1c18ad23e68903b99bb5888f84370 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:27:35 +0000 Subject: [PATCH 01/18] Bump rollup from 3.29.4 to 3.29.5 Bumps [rollup](https://github.com/rollup/rollup) from 3.29.4 to 3.29.5. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v3.29.4...v3.29.5) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 54027b35c..24456a326 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14291,9 +14291,9 @@ robots-parser@^2.0.1: integrity sha512-oO8f2SI04dJk3pbj2KOMJ4G6QfPAgqcGmrYGmansIcpRewIPT2ljWEt5I+ip6EgiyaLo+RXkkUWw74M25HDkMA== rollup@^3.25.2: - version "3.29.4" - resolved "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz" - integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw== + version "3.29.5" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.5.tgz#8a2e477a758b520fb78daf04bca4c522c1da8a54" + integrity sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w== optionalDependencies: fsevents "~2.3.2" From 7200489d55e923e44774ec459304cc3b4b3aea6c Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:20:14 +0200 Subject: [PATCH 02/18] scroll to top on email interstitial --- .../share-emails-domains/share-emails-domains.component.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts index 37394b38c..be75d51a8 100644 --- a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts +++ b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.ts @@ -1,9 +1,10 @@ -import { Component, EventEmitter, Input, Output } from '@angular/core' +import { Component, EventEmitter, Inject, Input, Output } from '@angular/core' import { PlatformInfoService } from '../../platform-info' import { AssertionVisibilityString, EmailsEndpoint } from 'src/app/types' import { FormBuilder, FormControl, FormGroup } from '@angular/forms' import { RecordEmailsService } from 'src/app/core/record-emails/record-emails.service' import { error } from 'console' +import { WINDOW } from '../../window' @Component({ selector: 'app-share-emails-domains', @@ -23,12 +24,14 @@ export class ShareEmailsDomainsComponent { constructor( public platformInfo: PlatformInfoService, private fb: FormBuilder, - private recordEmailsService: RecordEmailsService + private recordEmailsService: RecordEmailsService, + @Inject(WINDOW) private window: Window ) {} public loadingEmails = true @Output() finish = new EventEmitter() ngOnInit() { + this.window.scrollTo(0, 0) this.userPrivateDomains = this.getTop3MostRecentPrivateDomains( this.userEmailsJson ) From 3ca10ef1abf62fe70deec93d1d92a11dede156ce Mon Sep 17 00:00:00 2001 From: andrej romanov <50377758+auumgn@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:35:55 +0200 Subject: [PATCH 03/18] fix test --- .../share-emails-domains.component.spec.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.spec.ts b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.spec.ts index fd7032fe5..cb70bcf5b 100644 --- a/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.spec.ts +++ b/src/app/cdk/interstitials/share-emails-domains/share-emails-domains.component.spec.ts @@ -4,6 +4,8 @@ import { ShareEmailsDomainsComponent } from './share-emails-domains.component' import { FormBuilder, FormControl, FormGroup } from '@angular/forms' import { RecordEmailsService } from 'src/app/core/record-emails/record-emails.service' import { PlatformInfoService } from '../../platform-info' +import { WINDOW_PROVIDERS } from '../../window' +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core' describe('ShareEmailsDomainsComponent', () => { let component: ShareEmailsDomainsComponent @@ -28,7 +30,9 @@ describe('ShareEmailsDomainsComponent', () => { provide: RecordEmailsService, useValue: {}, }, + WINDOW_PROVIDERS, ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], }) fixture = TestBed.createComponent(ShareEmailsDomainsComponent) component = fixture.componentInstance From 4d1bb4a35030b5b4235aab76fb1f73ab4c93912b Mon Sep 17 00:00:00 2001 From: github actions Date: Tue, 12 Nov 2024 19:47:50 +0000 Subject: [PATCH 04/18] 2.107.10 changelog update --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a3150286..85229deb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 2.107.10 - 2024-11-12 + +[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.9...2.107.10) + +- [#2395](https://github.com/ORCID/orcid-angular/pull/2395): scroll to top on email interstitial +- [#2394](https://github.com/ORCID/orcid-angular/pull/2394): convert to matrix format and bump all action versions for node version + ## v2.107.9 - 2024-11-12 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.8...v2.107.9) From 05f130e7c144602c4990a50fabb308789d489ed5 Mon Sep 17 00:00:00 2001 From: Giles Westwood Date: Tue, 12 Nov 2024 23:53:48 +0000 Subject: [PATCH 05/18] missing tagging default --- .github/workflows/bld_test_rel_tag.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/bld_test_rel_tag.yml b/.github/workflows/bld_test_rel_tag.yml index fabce5eee..f256a4002 100644 --- a/.github/workflows/bld_test_rel_tag.yml +++ b/.github/workflows/bld_test_rel_tag.yml @@ -18,6 +18,11 @@ on: required: false default: "default" type: string + rel_tag: + description: Whether to tag the code + type: boolean + required: false + default: true workflow_dispatch: inputs: From e030567c36b3e36e571b5fc23a19fab807a3b941 Mon Sep 17 00:00:00 2001 From: Giles Westwood Date: Tue, 12 Nov 2024 23:59:27 +0000 Subject: [PATCH 06/18] fix: bump linting action versions --- .github/workflows/lint.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 71e520027..f7e9c0d9a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,16 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - name: set PY - run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> "$GITHUB_ENV" - - uses: actions/cache@v3 - with: - path: ~/.cache - key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} - # lockdown all 3rd party repos to git shas - #- uses: cloudposse/github-action-pre-commit@32acf3179b9eda817c0f549e8057477d320827db - # migrate to standard pre-commit - - uses: pre-commit/action@5f528da5c95691c4cf42ff76a4d10854b62cbb82 + - uses: pre-commit/action@576ff52938d158a24ac7e009dfa94b1455e7df99 From 819199163fe3c23da824dd2c414382d130b509ff Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Wed, 13 Nov 2024 10:54:44 -0600 Subject: [PATCH 07/18] 9497-resolve-the-issues-integrators-are-having-when-embedding-summaries-into-iframes --- .../trusted-summary.component.scss | 1 + .../environment-banner.component.ts | 4 +- summary-iframe-implementation-sample.html | 219 ++++++++++++++++++ 3 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 summary-iframe-implementation-sample.html diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.scss b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.scss index b1b65eadf..c2220e801 100644 --- a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.scss +++ b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.scss @@ -17,6 +17,7 @@ main.inside-iframe { align-content: start; grid-gap: 0; box-sizing: border-box; + height: 100vh; .panel-body { padding-top: 16px; diff --git a/src/app/environment-banner/environment-banner/environment-banner.component.ts b/src/app/environment-banner/environment-banner/environment-banner.component.ts index 522b8a7a7..2a76ce4fa 100644 --- a/src/app/environment-banner/environment-banner/environment-banner.component.ts +++ b/src/app/environment-banner/environment-banner/environment-banner.component.ts @@ -14,12 +14,14 @@ export class EnvironmentBannerComponent implements OnInit { canDismiss = environment['CAN_DISABLE_TEST_WARNING_BANNER'] @HostBinding('style.display') display = 'none' labelWarning = $localize`:@@environmentBanner.ariaLabelWarning:Warning, testing website` + notInsideIframe: boolean constructor( @Inject(WINDOW) private window: Window, private _cookieService: CookieService ) { + this.notInsideIframe = window.self === window.top this.hostUrl = window.location.host - if (!this._cookieService.get('testWarningCookie') || !this.canDismiss) { + if ((!this._cookieService.get('testWarningCookie') || !this.canDismiss) && this.notInsideIframe) { this.display = 'auto' } } diff --git a/summary-iframe-implementation-sample.html b/summary-iframe-implementation-sample.html new file mode 100644 index 000000000..99f7cb5d9 --- /dev/null +++ b/summary-iframe-implementation-sample.html @@ -0,0 +1,219 @@ + + + + + + Dynamic Dialogs with URL Validation + + + + +
+ + + +
+ + +
+ + + + +
+ + +
+ + +
+ + + + From 9703bdba1523c03a43e0948bf002ab097d60211c Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Wed, 13 Nov 2024 11:09:18 -0600 Subject: [PATCH 08/18] 9497-resolve-the-issues-integrators-are-having-when-embedding-summaries-into-iframes --- summary-iframe-implementation-sample.html | 152 +++++++++++++--------- 1 file changed, 91 insertions(+), 61 deletions(-) diff --git a/summary-iframe-implementation-sample.html b/summary-iframe-implementation-sample.html index 99f7cb5d9..8eca03e18 100644 --- a/summary-iframe-implementation-sample.html +++ b/summary-iframe-implementation-sample.html @@ -1,3 +1,14 @@ + + @@ -64,9 +75,30 @@ .close-button:hover { background: #ff3d3d; } + .header { + text-align: center; + margin-bottom: 30px; + } + h1 { + margin: 0; + font-size: 2em; + } + p { + margin: 10px 0 0; + font-size: 1.2em; + color: #555; + } +
+

ORCID iFrame Display Tester

+

+ This tool allows you to display ORCID IDs within iframes of various + sizes. Test how the content adapts to different iframe dimensions. +

+
+
@@ -81,7 +113,7 @@ - +
@@ -93,127 +125,125 @@ From 13c173a026dd2463943a5f7a8160e6b57dac8383 Mon Sep 17 00:00:00 2001 From: Leonardo Mendoza Fernadez Date: Wed, 13 Nov 2024 11:13:42 -0600 Subject: [PATCH 09/18] 9497-resolve-the-issues-integrators-are-having-when-embedding-summaries-into-iframes --- summary-iframe-implementation-sample.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/summary-iframe-implementation-sample.html b/summary-iframe-implementation-sample.html index 8eca03e18..27f1dfcb8 100644 --- a/summary-iframe-implementation-sample.html +++ b/summary-iframe-implementation-sample.html @@ -14,7 +14,7 @@ - Dynamic Dialogs with URL Validation + ORCID Summary iFrame Display Tester