diff --git a/src/app/cdk/platform-info/browserlist.regexp.ts b/src/app/cdk/platform-info/browserlist.regexp.ts index dd011b22dc..954be17405 100644 --- a/src/app/cdk/platform-info/browserlist.regexp.ts +++ b/src/app/cdk/platform-info/browserlist.regexp.ts @@ -1,3 +1,2 @@ // 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+)(?:[_.]\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+)(?:\.\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+)(?:[_.]\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+)(?:\.\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]*)?)/ diff --git a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html index 13484aeeda..2855fb2c70 100644 --- a/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html +++ b/src/app/trusted-summary/pages/trusted-summary/trusted-summary.component.html @@ -8,7 +8,27 @@ >
- + + + + +

+ + Name is private or limited + {{ + trustedSummary.name + }} + + + This record is locked + + + This record has been deprecated + + Name is private or limited - {{ - trustedSummary.name - }} + This record has been deactivated +

@@ -90,53 +131,51 @@

[moreLabelSingular]="labelMoreAffiliation" > - -

KEY DATES

-
-
    -
  • -
    - - - -
    -
    • -
  • -
    - +

    + KEY DATES +

    +
    +
      +
    • +
      - - -
      -
      • -
    -
    + + +
    +
    • +
  • +
    + + + +
    +
    • +
+
+
{ return { verified: id.validated, @@ -184,7 +185,7 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy { (this.works.length > 0 || this.funds.length > 0 || this.peerReviews.length > 0) && - (this.externalIdentifiers.length > 0 || + (this.externalIdentifiers?.length > 0 || this.trustedSummary.professionalActivitiesCount > 0 || this.trustedSummary.externalIdentifiers.length > 0) ) { @@ -193,7 +194,7 @@ export class TrustedSummaryComponent implements OnInit, OnDestroy { this.works.length > 0 || this.funds.length > 0 || this.peerReviews.length > 0 || - this.externalIdentifiers.length > 0 || + this.externalIdentifiers?.length > 0 || this.trustedSummary.professionalActivitiesCount > 0 ) { this.twoColumns = true diff --git a/src/app/types/trust-summary.ts b/src/app/types/trust-summary.ts index 7baf7d3d50..8cd12c538b 100644 --- a/src/app/types/trust-summary.ts +++ b/src/app/types/trust-summary.ts @@ -16,6 +16,7 @@ export interface TrustedSummary { professionalActivities: ActivitySummary[] professionalActivitiesCount: number externalIdentifiers: ExternalIdentifierSummary[] + status: "locked" | "deprecated" | "deactivated" | "active" } export interface ActivitySummary { diff --git a/src/assets/vectors/orcid.logo-deactivated.icon.svg b/src/assets/vectors/orcid.logo-deactivated.icon.svg new file mode 100644 index 0000000000..0c55154811 --- /dev/null +++ b/src/assets/vectors/orcid.logo-deactivated.icon.svg @@ -0,0 +1,21 @@ + + + + Orcid logo + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/vectors/orcid.logo-deprecated.icon.svg b/src/assets/vectors/orcid.logo-deprecated.icon.svg new file mode 100644 index 0000000000..9a3903e254 --- /dev/null +++ b/src/assets/vectors/orcid.logo-deprecated.icon.svg @@ -0,0 +1,21 @@ + + + + Orcid logo + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/vectors/orcid.logo-locked.icon.svg b/src/assets/vectors/orcid.logo-locked.icon.svg new file mode 100644 index 0000000000..3600ee7bb5 --- /dev/null +++ b/src/assets/vectors/orcid.logo-locked.icon.svg @@ -0,0 +1,21 @@ + + + + Orcid logo + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/locale/properties/summary/summary.en.properties b/src/locale/properties/summary/summary.en.properties index cb5d7382b2..a05307bb9a 100644 --- a/src/locale/properties/summary/summary.en.properties +++ b/src/locale/properties/summary/summary.en.properties @@ -29,3 +29,7 @@ summary.moreProfessionalActivities=more Professional activities summary.moreOtherIdentifiers=more Other Identifiers summary.moreProfessionalActivitie=more Professional activity summary.moreOtherIdentifier=more Other Identifier +summary.nameIsPrivateOrLimited=Name is private or limited +summary.recordIsLocked=This record is locked +summary.recordIsDeprecated=This record has been deprecated +summary.recordIsDeactivated=This record has been deactivated \ No newline at end of file