Skip to content

Commit 51d0d03

Browse files
cryptalithcryptalith
committed
PD-3822
1 parent 80acfaa commit 51d0d03

34 files changed

+57
-38
lines changed

‎src/app/app.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { TitleService } from './core/title-service/title.service'
1616
import { ZendeskService } from './core/zendesk/zendesk.service'
1717
import { ERROR_REPORT } from './errors'
1818
import { TogglzService } from './core/togglz/togglz.service'
19-
import { TogglzFlag } from './core/togglz/togglz-flags.enum'
19+
import { TogglzFlag } from './types/config.endpoint'
2020
import { NewRelicService } from './core/new-relic/new-relic.service'
2121

2222
@Component({

‎src/app/authorize/components/form-authorize/form-authorize.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import { GoogleTagManagerService } from '../../../core/google-tag-manager/google
3737
import { Title } from '@angular/platform-browser'
3838
import { TogglzService } from 'src/app/core/togglz/togglz.service'
3939
import { OauthURLSessionManagerService } from 'src/app/core/oauth-urlsession-manager/oauth-urlsession-manager.service'
40-
import { TogglzFlag } from 'src/app/core/togglz/togglz-flags.enum'
40+
import { TogglzFlag } from 'src/app/types/config.endpoint'
4141

4242
@Component({
4343
selector: 'app-form-authorize',

‎src/app/authorize/components/oauth-error/oauth-error.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { LegacyOauthRequestInfoForm as RequestInfoForm } from 'src/app/types/req
1010
import { UserSession } from 'src/app/types/session.local'
1111
import { RumJourneyEventService } from 'src/app/rum/service/customEvent.service'
1212
import { JourneyType } from 'src/app/rum/journeys/types'
13-
import { TogglzFlag } from 'src/app/core/togglz/togglz-flags.enum'
13+
import { TogglzFlag } from 'src/app/types/config.endpoint'
1414

1515
@Component({
1616
selector: 'app-oauth-error',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { UserSession } from 'src/app/types/session.local'
2222
import { CdkPortalOutlet, ComponentPortal } from '@angular/cdk/portal'
2323
import { OauthURLSessionManagerService } from 'src/app/core/oauth-urlsession-manager/oauth-urlsession-manager.service'
2424
import { FeatureLoggerService } from 'src/app/core/logging/feature-logger.service'
25-
import { TogglzFlag } from 'src/app/core/togglz/togglz-flags.enum'
25+
import { TogglzFlag } from 'src/app/types/config.endpoint'
2626

2727
@Component({
2828
templateUrl: './authorize.component.html',

‎src/app/cdk/recaptcha/recaptcha.directive.spec.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
import { RecaptchaDirective } from './recaptcha.directive'
22

33
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'
4+
import { of } from 'rxjs'
5+
import { TogglzService } from 'src/app/core/togglz/togglz.service'
6+
import { ErrorHandlerService } from 'src/app/core/error-handler/error-handler.service'
7+
import { ConfigMessageKey } from 'src/app/types/config.endpoint'
8+
import { WINDOW } from '../window'
49

510
describe('RecaptchaDirective', () => {
611
it('should create an instance', () => {
7-
const directive = new RecaptchaDirective(null, null, null, null, null)
12+
const togglzServiceMock = {
13+
getConfigurationOf: (_key: ConfigMessageKey) => of('key'),
14+
} as unknown as TogglzService
15+
const errorHandlerMock = {
16+
handleError: () => of(null),
17+
} as unknown as ErrorHandlerService
18+
const directive = new RecaptchaDirective(
19+
{} as any,
20+
{} as any,
21+
{} as any,
22+
{} as any,
23+
errorHandlerMock,
24+
togglzServiceMock
25+
)
826
expect(directive).toBeTruthy()
927
})
1028
})

‎src/app/cdk/recaptcha/recaptcha.directive.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export class RecaptchaDirective implements OnInit, ControlValueAccessor {
102102
callback: (response: string) => {
103103
this.ngZone.run(() => this.onSuccess(response))
104104
},
105-
'expired-callback': (response: string) => {
105+
'expired-callback': (_response: string) => {
106106
this.ngZone.run(() => this.onExpired())
107107
},
108108
'error-callback': () => {
@@ -126,7 +126,7 @@ export class RecaptchaDirective implements OnInit, ControlValueAccessor {
126126
const id = this.render(this.element.nativeElement, config)
127127
this.renderId = id
128128
this.captchaLoaded.emit(id)
129-
} catch (err) {
129+
} catch (_err) {
130130
this.handleRenderError('render_exception')
131131
}
132132
}
@@ -139,7 +139,7 @@ export class RecaptchaDirective implements OnInit, ControlValueAccessor {
139139
this.renderId = id
140140
this.captchaLoaded.emit(id)
141141
return
142-
} catch (_) {
142+
} catch (_err) {
143143
// fall through
144144
}
145145
}
@@ -166,7 +166,7 @@ export class RecaptchaDirective implements OnInit, ControlValueAccessor {
166166
this._errorHandler.handleError(new Error(reason)).subscribe()
167167
}
168168

169-
private render(element: HTMLElement, config): number {
169+
private render(element: HTMLElement, config: ReCaptchaConfig): number {
170170
return this.window.grecaptcha.render(element, config)
171171
}
172172

‎src/app/cdk/side-bar/modals/modal-email/modal-email.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { ModalComponent } from 'src/app/cdk/modal/modal/modal.component'
2323
import { PlatformInfoService } from 'src/app/cdk/platform-info'
2424
import { SnackbarService } from 'src/app/cdk/snackbar/snackbar.service'
2525
import { RecordEmailsService } from 'src/app/core/record-emails/record-emails.service'
26-
import { TogglzFlag } from 'src/app/core/togglz/togglz-flags.enum'
26+
import { TogglzFlag } from 'src/app/types/config.endpoint'
2727
import { TogglzService } from 'src/app/core/togglz/togglz.service'
2828
import { UserInfoService } from 'src/app/core/user-info/user-info.service'
2929
import {

‎src/app/cdk/side-bar/side-bar/side-bar.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { ModalWebsitesComponent } from '../modals/modal-websites/modal-websites.
2929
import { ActivatedRoute } from '@angular/router'
3030
import { RecordUtil } from 'src/app/shared/utils/record.util'
3131
import { TogglzService } from 'src/app/core/togglz/togglz.service'
32-
import { TogglzFlag } from 'src/app/core/togglz/togglz-flags.enum'
32+
import { TogglzFlag } from 'src/app/types/config.endpoint'
3333

3434
@Component({
3535
selector: 'app-side-bar',

‎src/app/core/header-compact/header-compact.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
shareReplay,
1111
} from 'rxjs/operators'
1212
import { TogglzService } from '../togglz/togglz.service'
13-
import { TogglzFlag } from '../togglz/togglz-flags.enum'
13+
import { TogglzFlag } from 'src/app/types/config.endpoint'
1414
import { isValidOrcidFormat } from 'src/app/constants'
1515
import { WINDOW } from 'src/app/cdk/window'
1616

‎src/app/core/login-interstitials-manager/abstractions/login-abstract-interstitial-manager.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
BaseInterstitialDialogOutput,
1515
} from './dialog-interface'
1616
import { TogglzService } from '../../togglz/togglz.service'
17-
import { TogglzFlag } from '../../togglz/togglz-flags.enum'
17+
import { TogglzFlag } from 'src/app/types/config.endpoint'
1818

1919
export abstract class LoginBaseInterstitialManagerService<
2020
TInput extends BaseInterstitialDialogInput,

0 commit comments

Comments
 (0)