Merge branch 'main' into revert-2078-revert-2077-angular-update-15-16t

ORCID · Oct 30, 2023 · 5de1200 · 5de1200
2 parents 87972f5 + cdcc1f1
commit 5de1200
Show file tree

Hide file tree

Showing 14 changed files with 3,570 additions and 3,178 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+## v2.46.0 - 2023-10-25
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.45.0...v2.46.0)
+
+### Fix
+
+- Add missing private orcid id in sorting method an invert selfAsserted and validated in sort by source (#2089)
+
+## v2.45.0 - 2023-10-25
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.44.0...v2.45.0)
+
+- [#2087](https://github.com/ORCID/orcid-angular/pull/2087): Feature/dynamic sub domains
+- [#2086](https://github.com/ORCID/orcid-angular/pull/2086): fix build issues
+- [#2085](https://github.com/ORCID/orcid-angular/pull/2085): Feature/dynamic sub domains
+- [#2084](https://github.com/ORCID/orcid-angular/pull/2084): Fix function issues
+
+## v2.44.0 - 2023-10-24
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.43.5...v2.44.0)
+
+- [#2083](https://github.com/ORCID/orcid-angular/pull/2083): feature/dynamic-sub-domains
+
 ## v2.43.5 - 2023-10-20
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.43.4...v2.43.5)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -43,11 +43,39 @@ export class AppModule {
   }
 
   private initializeApp() {
-    environment.BASE_URL = this.getCurrentDomain()
+    environment.API_WEB = environment.API_WEB.replace(
+      '<SUBDOMAIN>',
+      this.getSubDomain()
+    )
+    environment.BASE_URL = environment.BASE_URL.replace(
+      '<SUBDOMAIN>',
+      this.getSubDomain()
+    )
+    environment.API_PUB = environment.API_PUB.replace(
+      '<SUBDOMAIN>',
+      this.getSubDomain()
+    )
+    environment.API_WEB = environment.API_WEB.replace(
+      '<DOMAIN>',
+      this.getCurrentLeanDomain()
+    )
+    environment.BASE_URL = environment.BASE_URL.replace(
+      '<DOMAIN>',
+      this.getCurrentLeanDomain()
+    )
+    environment.API_PUB = environment.API_PUB.replace(
+      '<DOMAIN>',
+      this.getCurrentLeanDomain()
+    )
   }
 
-  getCurrentDomain() {
+  getCurrentLeanDomain() {
     const port = window.location.port ? ':' + window.location.port : ''
-    return '//' + window.location.hostname + port + '/'
+    return window.location.hostname.split('.').slice(-2).join('.') + port
+  }
+
+  getSubDomain() {
+    const subdomain = window.location.hostname.split('.').slice(0, -2).join('.')
+    return subdomain ? subdomain + '.' : ''
   }
 }
diff --git a/src/app/cdk/platform-info/browserlist.regexp.ts b/src/app/cdk/platform-info/browserlist.regexp.ts
@@ -1,3 +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+)(?:[_.]\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]*)?)/
+  /((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]*)?)/
diff --git a/src/app/core/record-affiliations-sort/record-affiliations-sort.service.ts b/src/app/core/record-affiliations-sort/record-affiliations-sort.service.ts
@@ -101,8 +101,8 @@ export class AffiliationsSortService {
               'validated'
             )
             x.affiliationGroup = ascending
-              ? [...selfAsserted, ...validated]
-              : [...validated, ...selfAsserted]
+              ? [...validated, ...selfAsserted]
+              : [...selfAsserted, ...validated]
           }
         }
       })

diff --git a/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts b/src/app/record/components/affiliation-stacks-groups/affiliation-stacks-groups.component.ts
@@ -162,6 +162,8 @@ export class AffiliationStacksGroupsComponent implements OnInit {
 
   sortEvent(event: SortData, type: string) {
     this.userRecordContext.publicRecordId = this.isPublicRecord
+    this.userRecordContext.privateRecordId =
+      this.userRecord?.userInfo?.EFFECTIVE_USER_ORCID
     this.userRecordContext.sort = event.type
     this.userRecordContext.sortAsc = event.direction === 'asc'
     this._recordAffiliationService.changeUserRecordContext(

diff --git a/src/environments/environment.int.ts b/src/environments/environment.int.ts
@@ -3,9 +3,9 @@ export const environment = {
   debugger: true,
   ROBOTS: 'noindex, nofollow',
   API_NEWS: 'https://info.int.orcid.org/feed/',
-  API_PUB: '//pub.int.orcid.org/v3.0',
-  API_WEB: '//int.orcid.org/',
-  BASE_URL: '',
+  API_PUB: `//pub.<SUBDOMAIN><DOMAIN>/v3.0`,
+  API_WEB: `//<SUBDOMAIN><DOMAIN>/`,
+  BASE_URL: '//<SUBDOMAIN><DOMAIN>/',
   INFO_SITE: 'https://info.qa.orcid.org/',
   GOOGLE_ANALYTICS_TESTING_MODE: true,
   GOOGLE_TAG_MANAGER: 'GTM-0000000',

diff --git a/src/environments/environment.local-with-proxy.ts b/src/environments/environment.local-with-proxy.ts
@@ -3,9 +3,9 @@ export const environment = {
   debugger: true,
   ROBOTS: 'all',
   API_NEWS: 'https://www.mocky.io/v2/5dced45b3000007300931ce8',
-  API_PUB: '/v3.0',
-  API_WEB: '/',
-  BASE_URL: '',
+  API_PUB: `//<SUBDOMAIN><DOMAIN>/v3.0`,
+  API_WEB: `//<SUBDOMAIN><DOMAIN>/`,
+  BASE_URL: '//<SUBDOMAIN><DOMAIN>/',
   INFO_SITE: 'https://info.orcid.org/',
   GOOGLE_ANALYTICS_TESTING_MODE: true,
   GOOGLE_TAG_MANAGER: 'GTM-0000000',

diff --git a/src/environments/environment.local.tomcat.ts b/src/environments/environment.local.tomcat.ts
@@ -1,5 +1,3 @@
-import { EnvironmentBannerModule } from 'src/app/environment-banner/environment-banner.module'
-
 export const environment = {
   production: true,
   debugger: true,

diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts
@@ -3,9 +3,9 @@ export const environment = {
   debugger: true,
   ROBOTS: 'all',
   API_NEWS: 'https://www.mocky.io/v2/5dced45b3000007300931ce8',
-  API_PUB: '//pub.dev.orcid.org/v3.0',
-  API_WEB: '//dev.orcid.org/',
-  BASE_URL: '',
+  API_PUB: `//pub.<SUBDOMAIN><DOMAIN>/v3.0`,
+  API_WEB: `//<SUBDOMAIN><DOMAIN>/`,
+  BASE_URL: '//<SUBDOMAIN><DOMAIN>/',
   INFO_SITE: 'https://info.orcid.org/',
   GOOGLE_ANALYTICS_TESTING_MODE: true,
   GOOGLE_TAG_MANAGER: 'GTM-0000000',

diff --git a/src/environments/environment.local.with.sandbox.ts b/src/environments/environment.local.with.sandbox.ts
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
@@ -3,9 +3,9 @@ export const environment = {
   debugger: false,
   ROBOTS: 'all',
   API_NEWS: 'https://info.orcid.org/feed/',
-  API_PUB: '//pub.orcid.org/v3.0',
-  API_WEB: '//orcid.org/',
-  BASE_URL: '',
+  API_PUB: `//pub.<SUBDOMAIN><DOMAIN>/v3.0`,
+  API_WEB: `//<SUBDOMAIN><DOMAIN>/`,
+  BASE_URL: '//<SUBDOMAIN><DOMAIN>/',
   INFO_SITE: 'https://info.orcid.org/',
   SHOW_TEST_WARNING_BANNER: false,
   GOOGLE_ANALYTICS_TESTING_MODE: false,

diff --git a/src/environments/environment.qa.ts b/src/environments/environment.qa.ts
@@ -3,9 +3,9 @@ export const environment = {
   debugger: true,
   ROBOTS: 'noindex, nofollow',
   API_NEWS: 'https://info.qa.orcid.org/feed/',
-  API_PUB: '//pub.qa.orcid.org/v3.0',
-  API_WEB: '//qa.orcid.org/',
-  BASE_URL: '',
+  API_PUB: `//pub.<SUBDOMAIN><DOMAIN>/v3.0`,
+  API_WEB: `//<SUBDOMAIN><DOMAIN>/`,
+  BASE_URL: '//<SUBDOMAIN><DOMAIN>/',
   INFO_SITE: 'https://info.qa.orcid.org/',
   GOOGLE_ANALYTICS_TESTING_MODE: true,
   GOOGLE_TAG_MANAGER: 'GTM-TRLHLRZ',

diff --git a/src/environments/environment.sandbox.ts b/src/environments/environment.sandbox.ts
@@ -3,9 +3,9 @@ export const environment = {
   debugger: false,
   ROBOTS: 'noindex, nofollow',
   API_NEWS: 'https://info.qa.orcid.org/feed/',
-  API_PUB: '//pub.sandbox.orcid.org/v3.0',
-  API_WEB: '//sandbox.orcid.org/',
-  BASE_URL: '',
+  API_PUB: `//pub.<SUBDOMAIN><DOMAIN>/v3.0`,
+  API_WEB: `//<SUBDOMAIN><DOMAIN>/`,
+  BASE_URL: '//<SUBDOMAIN><DOMAIN>/',
   INFO_SITE: 'https://info.qa.orcid.org/',
   GOOGLE_ANALYTICS_TESTING_MODE: false,
   GOOGLE_TAG_MANAGER: 'GTM-M9Z7DHS',