Merge branch 'main' into feat/yarn-docker-container-registry-caching

CHANGELOG.md

@@ -1,3 +1,13 @@
+## v2.107.17 - 2024-11-26
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.16...v2.107.17)
+
+- [#2404](https://github.com/ORCID/orcid-angular/pull/2404): Lmendoza/singin interstitial 2
+
+## v2.107.16 - 2024-11-26
+
+[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.15...v2.107.16)
+
 ## v2.107.15 - 2024-11-25
 
 [Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.107.14...v2.107.15)

src/app/authorize/pages/authorize/authorize.component.ts

@@ -59,13 +59,13 @@ export class AuthorizeComponent {
         userInfo.userInfo.EFFECTIVE_USER_ORCID
     })
     this._interstitials
-      .getInterstitialsViewed('OAUTH_DOMAIN_INTERSTITIAL')
+      .getInterstitialsViewed('DOMAIN_INTERSTITIAL')
       .subscribe((value) => {
         return (this.domainInterstitialHasBeenViewed = value)
       })
 
     this._togglz
-      .getStateOf('OAUTH_DOMAINS_INTERSTITIAL')
+      .getStateOf('DOMAINS_INTERSTITIAL')
       .pipe(take(1))
       .subscribe((value) => {
         this.oauthDomainsInterstitialEnabled = value
@@ -104,7 +104,7 @@ export class AuthorizeComponent {
       this.showAuthorizationComponent = false
       this.showInterstital = true
       this._interstitials
-        .setInterstitialsViewed('OAUTH_DOMAIN_INTERSTITIAL')
+        .setInterstitialsViewed('DOMAIN_INTERSTITIAL')
         .subscribe()
     } else {
       this.finishRedirect()

src/app/cdk/interstitials/interstitials.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'
 import { userInfo } from 'os'
 import { map } from 'rxjs/operators'
 import { UserService } from 'src/app/core'
-type Interstitials = 'OAUTH_DOMAIN_INTERSTITIAL' | 'SIGN_IN_DOMAIN_INTERSTITIAL'
+type Interstitials = 'DOMAIN_INTERSTITIAL'
 
 @Injectable({
   providedIn: 'root',

src/app/cdk/interstitials/share-emails-domains/share-emails-domains-dialog.component.scss

@@ -1,12 +1,21 @@
+@import './share-emails-domains.component.scss';
+
 mat-card-header.authorize-header {
   mat-card-title {
-    margin: 0 0 32px 0 !important;
+    margin: 0 0 24px 0 !important;
     display: flex;
     flex-direction: column;
     align-items: center;
+    h1 {
+      text-align: center;
+    }
+  }
+  mat-icon {
+    margin-bottom: 8px;
   }
 }
-:host {
-  padding: 48px;
+
+:host.columns-12 {
+  padding: 40px;
   display: block;
 }

src/app/cdk/interstitials/share-emails-domains/share-emails-domains-dialog.component.ts

@@ -1,4 +1,11 @@
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core'
+import {
+  Component,
+  EventEmitter,
+  HostBinding,
+  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'
@@ -20,12 +27,13 @@ export type ShareEmailsDomainsComponentDialogInput = {
 @Component({
   templateUrl: './share-emails-domains.component.html',
   styleUrls: [
-    './share-emails-domains.component.scss',
-    './share-emails-domains.component.scss-theme.scss',
     './share-emails-domains-dialog.component.scss',
+    './share-emails-domains.component.scss-theme.scss',
   ],
 })
 export class ShareEmailsDomainsDialogComponent extends ShareEmailsDomainsComponent {
+  @HostBinding('class.columns-12') desktop: boolean = false
+
   constructor(
     platformInfo: PlatformInfoService,
     fb: FormBuilder,
@@ -40,6 +48,9 @@ export class ShareEmailsDomainsDialogComponent extends ShareEmailsDomainsCompone
       this.userEmailsJson = this.data.userEmailsJson
       this.organizationName = this.data.organizationName
     }
+    platformInfo.get().subscribe((data) => {
+      this.desktop = data.desktop
+    })
   }
 
   override finishIntertsitial(emails?: string[]) {

src/app/core/login-interstitials/login-interstitials.service.ts

@@ -25,7 +25,7 @@ export class LoginInterstitialsService {
     private toggleService: TogglzService
   ) {
     this.interstitialService
-      .getInterstitialsViewed('SIGN_IN_DOMAIN_INTERSTITIAL')
+      .getInterstitialsViewed('DOMAIN_INTERSTITIAL')
       .subscribe((viewed) => {
         this.alreadySawSignDomainInterstitial = viewed
       })
@@ -56,7 +56,7 @@ export class LoginInterstitialsService {
       ) {
         this.alreadySawSignDomainInterstitial = true
         this.interstitialService
-          .setInterstitialsViewed('SIGN_IN_DOMAIN_INTERSTITIAL')
+          .setInterstitialsViewed('DOMAIN_INTERSTITIAL')
           .subscribe()
         const data: ShareEmailsDomainsComponentDialogInput = {
           userEmailsJson: userRecord.emails,

src/app/record/components/top-bar/top-bar.component.scss

@@ -146,3 +146,7 @@ app-top-bar-actions {
     margin-top: 0 !important;
   }
 }
+
+app-warning-message {
+  margin-bottom: 16px;
+}

src/app/record/components/top-bar/top-bar.component.scss-theme.scss

@@ -9,7 +9,7 @@
   $background: map-get($theme, background);
 
   .green-url {
-    color: $brand-primary-dark;
+    color: mat.get-color-from-palette($accent, 900);
   }
   .published-name {
     color: $text-dark-high;

src/app/record/components/top-bar/top-bar.component.ts

@@ -48,7 +48,7 @@ export class TopBarComponent implements OnInit, OnDestroy {
   checkEmailValidated: boolean
   inDelegationMode: boolean
 
-  @Input() newlySharedDomains: string[] = ['test']
+  @Input() newlySharedDomains: string[] = []
   @Input() loadingUserRecord = true
 
   regionNames = $localize`:@@topBar.names:Names`

src/app/record/pages/my-orcid/my-orcid.component.ts

@@ -82,7 +82,7 @@ export class MyOrcidComponent implements OnInit, OnDestroy {
   regionActivities = $localize`:@@shared.activities:Activities`
   readyForIndexing: boolean
   fragment: string
-  newlySharedDomains: string[]
+  newlySharedDomains: string[] = []
 
   constructor(
     _userInfoService: UserInfoService,