Skip to content

Commit

Permalink
Merge branch 'main' into lmendoza/new-relic
Browse files Browse the repository at this point in the history
  • Loading branch information
leomendoza123 authored Sep 4, 2024
2 parents 0ca7720 + 82bcefc commit 4fb20ea
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 10 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## v2.104.12 - 2024-09-04

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.11...v2.104.12)

- [#2343](https://github.com/ORCID/orcid-angular/pull/2343): new-relic

## v2.104.11 - 2024-09-03

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.10...v2.104.11)

- [#2342](https://github.com/ORCID/orcid-angular/pull/2342): Lmendoza/new relic

## v2.104.10 - 2024-09-02

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.104.9...v2.104.10)
Expand Down
1 change: 0 additions & 1 deletion scripts/new-relic.postbuild.ts

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/app/cdk/platform-info/browserlist.regexp.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
// tslint:disable-next-line: max-line-length
export const BROWSERLIST_REGEXP = /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
export const BROWSERLIST_REGEXP =
/((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
12 changes: 6 additions & 6 deletions src/app/core/new-relic/new-relic.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import { WINDOW } from 'src/app/cdk/window'
providedIn: 'root',
})
export class NewRelicService {

constructor( @Inject(WINDOW) private window: Window,
) {}
constructor(@Inject(WINDOW) private window: Window) {}

public init() {
if ((window as any)?.newrelic?.start && typeof (window as any).newrelic.start === 'function' ) {
(window as any).newrelic.start()
if (
(window as any)?.newrelic?.start &&
typeof (window as any).newrelic.start === 'function'
) {
;(window as any).newrelic.start()
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export class InstitutionalComponent implements OnInit {
environment.INSTITUTIONAL_AUTOCOMPLETE_DISPLAY_AMOUNT
? []
: institutionsFiltered
}),
})
)
})
}
Expand Down Expand Up @@ -151,7 +151,10 @@ export class InstitutionalComponent implements OnInit {
this.institution = institutionSelected
this.entityID = this.institution.entityID

if (!this.userSelectedInstitutions || !this.userSelectedInstitutions.length) {
if (
!this.userSelectedInstitutions ||
!this.userSelectedInstitutions.length
) {
this.displayDefaultImage = false
this.imageLoadingTimeOut = false
this.imageLoadingFinish = false
Expand Down

0 comments on commit 4fb20ea

Please sign in to comment.