Skip to content

Commit

Permalink
batch-fixes (#2403)
Browse files Browse the repository at this point in the history
* batch-fixes

* batch-fixes
  • Loading branch information
leomendoza123 authored Nov 26, 2024
1 parent e1b9ad8 commit a23689b
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 13 deletions.
6 changes: 3 additions & 3 deletions src/app/authorize/pages/authorize/authorize.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/app/cdk/interstitials/interstitials.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
@import './share-emails-domains.component.scss';

mat-card-header.authorize-header {
mat-card-title {
margin: 0 0 32px 0 !important;
display: flex;
flex-direction: column;
align-items: center;
h1 {
text-align: center;
}
}
}
:host {

:host.columns-12 {
padding: 48px;
display: block;
}
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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,
Expand All @@ -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[]) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions src/app/record/components/top-bar/top-bar.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,7 @@ app-top-bar-actions {
margin-top: 0 !important;
}
}

app-warning-message {
margin-bottom: 16px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/record/components/top-bar/top-bar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion src/app/record/pages/my-orcid/my-orcid.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit a23689b

Please sign in to comment.