Skip to content

Commit 04a0659

Browse files
ptkachptkach
authored
Disable console whois (#2741)
1 parent 7001088 commit 04a0659

28 files changed

+121
-221
lines changed

‎console-webapp/src/app/app-routing.module.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import { ResourcesComponent } from './resources/resources.component';
2424
import ContactComponent from './settings/contact/contact.component';
2525
import SecurityComponent from './settings/security/security.component';
2626
import { SettingsComponent } from './settings/settings.component';
27-
import WhoisComponent from './settings/whois/whois.component';
2827
import { SupportComponent } from './support/support.component';
28+
import RdapComponent from './settings/rdap/rdap.component';
2929

3030
export interface RouteWithIcon extends Route {
3131
iconName?: string;
@@ -83,9 +83,9 @@ export const routes: RouteWithIcon[] = [
8383
title: 'Contacts',
8484
},
8585
{
86-
path: WhoisComponent.PATH,
87-
component: WhoisComponent,
88-
title: 'WHOIS Info',
86+
path: RdapComponent.PATH,
87+
component: RdapComponent,
88+
title: 'RDAP Info',
8989
},
9090
{
9191
path: SecurityComponent.PATH,

‎console-webapp/src/app/app.module.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ import EppPasswordEditComponent from './settings/security/eppPasswordEdit.compon
4747
import SecurityComponent from './settings/security/security.component';
4848
import SecurityEditComponent from './settings/security/securityEdit.component';
4949
import { SettingsComponent } from './settings/settings.component';
50-
import WhoisComponent from './settings/whois/whois.component';
51-
import WhoisEditComponent from './settings/whois/whoisEdit.component';
5250
import { NotificationsComponent } from './shared/components/notifications/notifications.component';
5351
import { SelectedRegistrarWrapper } from './shared/components/selectedRegistrarWrapper/selectedRegistrarWrapper.component';
5452
import { LocationBackDirective } from './shared/directives/locationBack.directive';
@@ -60,6 +58,8 @@ import { SnackBarModule } from './snackbar.module';
6058
import { SupportComponent } from './support/support.component';
6159
import { TldsComponent } from './tlds/tlds.component';
6260
import { ForceFocusDirective } from './shared/directives/forceFocus.directive';
61+
import RdapComponent from './settings/rdap/rdap.component';
62+
import RdapEditComponent from './settings/rdap/rdapEdit.component';
6363

6464
@NgModule({
6565
declarations: [SelectedRegistrarWrapper],
@@ -76,30 +76,30 @@ export class SelectedRegistrarModule {}
7676
ContactDetailsComponent,
7777
DomainListComponent,
7878
EppPasswordEditComponent,
79+
ForceFocusDirective,
7980
HeaderComponent,
8081
HomeComponent,
8182
LocationBackDirective,
82-
ForceFocusDirective,
83-
UserLevelVisibility,
8483
NavigationComponent,
8584
NewRegistrarComponent,
8685
NotificationsComponent,
86+
RdapComponent,
87+
RdapEditComponent,
88+
ReasonDialogComponent,
8789
RegistrarComponent,
8890
RegistrarDetailsComponent,
89-
RegistryLockComponent,
9091
RegistrarSelectorComponent,
92+
RegistryLockComponent,
9193
RegistryLockVerifyComponent,
9294
ResourcesComponent,
95+
ResponseDialogComponent,
9396
SecurityComponent,
9497
SecurityEditComponent,
9598
SettingsComponent,
9699
SettingsContactComponent,
97100
SupportComponent,
98101
TldsComponent,
99-
WhoisComponent,
100-
WhoisEditComponent,
101-
ReasonDialogComponent,
102-
ResponseDialogComponent,
102+
UserLevelVisibility,
103103
],
104104
bootstrap: [AppComponent],
105105
imports: [
@@ -108,8 +108,8 @@ export class SelectedRegistrarModule {}
108108
BrowserModule,
109109
FormsModule,
110110
MaterialModule,
111-
SnackBarModule,
112111
SelectedRegistrarModule,
112+
SnackBarModule,
113113
],
114114
providers: [
115115
BackendService,

‎console-webapp/src/app/registrar/newRegistrar.component.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export default class NewRegistrarComponent {
4848
this.newRegistrar = {
4949
registrarId: '',
5050
url: '',
51-
whoisServer: '',
5251
registrarName: '',
5352
icannReferralEmail: '',
5453
localizedAddress: {

‎console-webapp/src/app/registrar/registrar.service.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,16 @@ export interface SecuritySettings
5050
ipAddressAllowList?: Array<IpAllowListItem>;
5151
}
5252

53-
export interface WhoisRegistrarFields {
53+
export interface RdapRegistrarFields {
5454
ianaIdentifier?: number;
5555
icannReferralEmail: string;
5656
localizedAddress: Address;
5757
registrarId: string;
5858
url: string;
59-
whoisServer: string;
6059
}
6160

6261
export interface Registrar
63-
extends WhoisRegistrarFields,
62+
extends RdapRegistrarFields,
6463
SecuritySettingsBackendModel {
6564
allowedTlds?: string[];
6665
billingAccountMap?: object;

‎console-webapp/src/app/settings/contact/contact.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export type contactType =
2424
| 'LEGAL'
2525
| 'MARKETING'
2626
| 'TECH'
27-
| 'WHOIS';
27+
| 'RDAP';
2828

2929
type contactTypesToUserFriendlyTypes = { [type in contactType]: string };
3030

@@ -35,7 +35,7 @@ export const contactTypeToTextMap: contactTypesToUserFriendlyTypes = {
3535
LEGAL: 'Legal contact',
3636
MARKETING: 'Marketing contact',
3737
TECH: 'Technical contact',
38-
WHOIS: 'WHOIS-Inquiry contact',
38+
RDAP: 'RDAP-Inquiry contact',
3939
};
4040

4141
type UserFriendlyType = (typeof contactTypeToTextMap)[contactType];

‎console-webapp/src/app/settings/contact/contactDetails.component.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,29 +97,29 @@ <h1>Contact Type</h1>
9797
</section>
9898

9999
<section>
100-
<h1>WHOIS Preferences</h1>
100+
<h1>RDAP Preferences</h1>
101101
<div>
102102
<mat-checkbox
103103
[(ngModel)]="contactService.contactInEdit.visibleInWhoisAsAdmin"
104104
[ngModelOptions]="{ standalone: true }"
105-
>Show in Registrar WHOIS record as admin contact</mat-checkbox
105+
>Show in Registrar RDAP record as admin contact</mat-checkbox
106106
>
107107
</div>
108108

109109
<div>
110110
<mat-checkbox
111111
[(ngModel)]="contactService.contactInEdit.visibleInWhoisAsTech"
112112
[ngModelOptions]="{ standalone: true }"
113-
>Show in Registrar WHOIS record as technical contact</mat-checkbox
113+
>Show in Registrar RDAP record as technical contact</mat-checkbox
114114
>
115115
</div>
116116

117117
<div>
118118
<mat-checkbox
119119
[(ngModel)]="contactService.contactInEdit.visibleInDomainWhoisAsAbuse"
120120
[ngModelOptions]="{ standalone: true }"
121-
>Show Phone and Email in Domain WHOIS Record as registrar abuse
122-
contact (per CL&D requirements)</mat-checkbox
121+
>Show Phone and Email in Domain RDAP Record as registrar abuse contact
122+
(per CL&D requirements)</mat-checkbox
123123
>
124124
</div>
125125
</section>
@@ -176,13 +176,13 @@ <h2>Contact details</h2>
176176
<mat-card-content>
177177
<mat-list role="list">
178178
<mat-list-item role="listitem">
179-
<h2>WHOIS Preferences</h2>
179+
<h2>RDAP Preferences</h2>
180180
</mat-list-item>
181181
@if(contactService.contactInEdit.visibleInWhoisAsAdmin) {
182182
<mat-divider></mat-divider>
183183
<mat-list-item role="listitem">
184184
<span class="console-app__list-value"
185-
>Show in Registrar WHOIS record as admin contact</span
185+
>Show in Registrar RDAP record as admin contact</span
186186
>
187187
</mat-list-item>
188188
} @if(contactService.contactInEdit.visibleInWhoisAsTech) {
@@ -192,14 +192,14 @@ <h2>WHOIS Preferences</h2>
192192
*ngIf="contactService.contactInEdit.visibleInWhoisAsTech"
193193
>
194194
<span class="console-app__list-value"
195-
>Show in Registrar WHOIS record as technical contact</span
195+
>Show in Registrar RDAP record as technical contact</span
196196
>
197197
</mat-list-item>
198198
} @if(contactService.contactInEdit.visibleInDomainWhoisAsAbuse) {
199199
<mat-divider></mat-divider>
200200
<mat-list-item role="listitem">
201201
<span class="console-app__list-value"
202-
>Show Phone and Email in Domain WHOIS Record as registrar abuse
202+
>Show Phone and Email in Domain RDAP Record as registrar abuse
203203
contact (per CL&D requirements)</span
204204
>
205205
</mat-list-item>

console-webapp/src/app/settings/whois/whois.component.html renamed to console-webapp/src/app/settings/rdap/rdap.component.html

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
@if(whoisService.editing) {
2-
<app-whois-edit></app-whois-edit>
1+
@if(rdapService.editing) {
2+
<app-rdap-edit></app-rdap-edit>
33
} @else {
4-
<div class="console-app__whois">
5-
<div class="console-app__whois-controls">
4+
<div class="console-app__rdap">
5+
<div class="console-app__rdap-controls">
66
<span>
7-
General registrar information for your WHOIS record. This information is
8-
always visible in WHOIS.
7+
General registrar information for your RDAP record. This information is
8+
always visible in RDAP.
99
</span>
1010
<div class="spacer"></div>
1111
<button
1212
mat-flat-button
1313
color="primary"
14-
aria-label="Edit WHOIS record"
15-
(click)="whoisService.editing = true"
14+
aria-label="Edit RDAP record"
15+
(click)="rdapService.editing = true"
1616
>
1717
<mat-icon>edit</mat-icon>
1818
Edit
@@ -61,45 +61,5 @@ <h2>Personal Info</h2>
6161
</mat-list>
6262
</mat-card-content>
6363
</mat-card>
64-
65-
<mat-card appearance="outlined">
66-
<mat-card-content>
67-
<mat-list role="list">
68-
<mat-list-item role="listitem">
69-
<h2>Technical Info</h2>
70-
</mat-list-item>
71-
<mat-divider></mat-divider>
72-
<mat-list-item role="listitem">
73-
<span class="console-app__list-key">IANA Identifier</span>
74-
<span class="console-app__list-value">{{
75-
registrarService.registrar()?.ianaIdentifier
76-
}}</span>
77-
</mat-list-item>
78-
<mat-divider></mat-divider>
79-
<mat-list-item role="listitem">
80-
<div>
81-
<span class="console-app__list-key">ICANN Referral Email</span>
82-
<span class="console-app__list-value">{{
83-
registrarService.registrar()?.icannReferralEmail
84-
}}</span>
85-
</div>
86-
</mat-list-item>
87-
<mat-divider></mat-divider>
88-
<mat-list-item role="listitem">
89-
<span class="console-app__list-key">WHOIS server</span>
90-
<span class="console-app__list-value">{{
91-
registrarService.registrar()?.whoisServer
92-
}}</span>
93-
</mat-list-item>
94-
<mat-divider></mat-divider>
95-
<mat-list-item role="listitem">
96-
<span class="console-app__list-key">Referral URL</span>
97-
<span class="console-app__list-value">{{
98-
registrarService.registrar()?.url
99-
}}</span>
100-
</mat-list-item>
101-
</mat-list>
102-
</mat-card-content>
103-
</mat-card>
10464
</div>
10565
}

console-webapp/src/app/settings/whois/whois.component.scss renamed to console-webapp/src/app/settings/rdap/rdap.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.console-app__whois {
1+
.console-app__rdap {
22
max-width: 616px;
33

44
&-controls {

console-webapp/src/app/settings/whois/whois.component.spec.ts renamed to console-webapp/src/app/settings/rdap/rdap.component.spec.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
2020
import { MaterialModule } from 'src/app/material.module';
2121
import { RegistrarService } from 'src/app/registrar/registrar.service';
2222
import { BackendService } from 'src/app/shared/services/backend.service';
23-
import WhoisComponent from './whois.component';
23+
import RdapComponent from './rdap.component';
2424

25-
describe('WhoisComponent', () => {
26-
let component: WhoisComponent;
27-
let fixture: ComponentFixture<WhoisComponent>;
25+
describe('RdapComponent', () => {
26+
let component: RdapComponent;
27+
let fixture: ComponentFixture<RdapComponent>;
2828

2929
beforeEach(async () => {
3030
await TestBed.configureTestingModule({
31-
declarations: [WhoisComponent],
31+
declarations: [RdapComponent],
3232
imports: [MaterialModule, BrowserAnimationsModule],
3333
providers: [
3434
BackendService,
@@ -45,7 +45,7 @@ describe('WhoisComponent', () => {
4545
],
4646
}).compileComponents();
4747

48-
fixture = TestBed.createComponent(WhoisComponent);
48+
fixture = TestBed.createComponent(RdapComponent);
4949
component = fixture.componentInstance;
5050
fixture.detectChanges();
5151
});

console-webapp/src/app/settings/whois/whois.component.ts renamed to console-webapp/src/app/settings/rdap/rdap.component.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,16 @@
1414

1515
import { Component, computed } from '@angular/core';
1616
import { RegistrarService } from 'src/app/registrar/registrar.service';
17-
18-
import { WhoisService } from './whois.service';
17+
import { RdapService } from './rdap.service';
1918

2019
@Component({
21-
selector: 'app-whois',
22-
templateUrl: './whois.component.html',
23-
styleUrls: ['./whois.component.scss'],
20+
selector: 'app-rdap',
21+
templateUrl: './rdap.component.html',
22+
styleUrls: ['./rdap.component.scss'],
2423
standalone: false,
2524
})
26-
export default class WhoisComponent {
27-
public static PATH = 'whois';
25+
export default class RdapComponent {
26+
public static PATH = 'rdap';
2827
formattedAddress = computed(() => {
2928
let result = '';
3029
const registrar = this.registrarService.registrar();
@@ -47,7 +46,7 @@ export default class WhoisComponent {
4746
});
4847

4948
constructor(
50-
public whoisService: WhoisService,
49+
public rdapService: RdapService,
5150
public registrarService: RegistrarService
5251
) {}
5352
}

0 commit comments

Comments
 (0)