Skip to content

Commit fc871dd

Browse files
authored
Dissolve the lib/upgrades module (#37215)
1 parent bce0874 commit fc871dd

File tree

46 files changed

+516
-561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+516
-561
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
/client/lib/store-transactions/ @Automattic/payments
8989
/client/lib/stripe/ @Automattic/payments
9090
/client/lib/transaction/ @Automattic/payments
91-
/client/lib/upgrades/ @Automattic/payments
9291
/client/me/billing-history/ @Automattic/payments
9392
/client/me/memberships/ @Automattic/payments
9493
/client/me/pending-payments/ @Automattic/payments

client/components/data/domain-management/index.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ import { connect } from 'react-redux';
1313
*/
1414
import CartStore from 'lib/cart/store';
1515
import DnsStore from 'lib/domains/dns/store';
16+
import { fetchDns } from 'lib/domains/dns/actions';
1617
import { fetchUsers } from 'lib/users/actions';
1718
import { getCurrentUser } from 'state/current-user/selectors';
1819
import { getPlansBySite } from 'state/sites/plans/selectors';
1920
import { getSelectedSite } from 'state/ui/selectors';
2021
import { getDecoratedSiteDomains, isRequestingSiteDomains } from 'state/sites/domains/selectors';
2122
import { getProductsList } from 'state/products-list/selectors';
2223
import NameserversStore from 'lib/domains/nameservers/store';
23-
import { fetchDns, fetchNameservers, fetchWapiDomainInfo } from 'lib/upgrades/actions';
24+
import { fetchNameservers } from 'lib/domains/nameservers/actions';
2425
import PageViewTracker from 'lib/analytics/page-view-tracker';
2526
import QueryContactDetailsCache from 'components/data/query-contact-details-cache';
2627
import QueryProductsList from 'components/data/query-products-list';
@@ -30,6 +31,7 @@ import SiteRedirectStore from 'lib/domains/site-redirect/store';
3031
import StoreConnection from 'components/data/store-connection';
3132
import UsersStore from 'lib/users/store';
3233
import WapiDomainInfoStore from 'lib/domains/wapi-domain-info/store';
34+
import { fetchWapiDomainInfo } from 'lib/domains/wapi-domain-info/actions';
3335

3436
function getStateFromStores( props ) {
3537
return {

client/components/marketing-survey/cancel-auto-renewal-form/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import FormButtonsBar from 'components/forms/form-buttons-bar';
1616
import FormFieldset from 'components/forms/form-fieldset';
1717
import FormLabel from 'components/forms/form-label';
1818
import FormRadio from 'components/forms/form-radio';
19-
import { submitSurvey } from 'lib/upgrades/actions';
19+
import { submitSurvey } from 'lib/purchases/actions';
2020
import { isDomainRegistration, isPlan } from 'lib/products-values';
2121
import enrichedSurveyData from 'components/marketing-survey/cancel-purchase-form/enriched-survey-data';
2222
import PrecancellationChatButton from 'components/marketing-survey/cancel-purchase-form/precancellation-chat-button';

client/components/marketing-survey/cancel-purchase-form/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { getCurrencyDefaults } from '@automattic/format-currency';
1212
* Internal Dependencies
1313
*/
1414
import config from 'config';
15-
import { submitSurvey } from 'lib/upgrades/actions';
15+
import { submitSurvey } from 'lib/purchases/actions';
1616
import Dialog from 'components/dialog';
1717
import FormFieldset from 'components/forms/form-fieldset';
1818
import FormLegend from 'components/forms/form-legend';
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
export const DNS_ADD = 'DNS_ADD';
2+
export const DNS_ADD_COMPLETED = 'DNS_ADD_COMPLETED';
3+
export const DNS_ADD_FAILED = 'DNS_ADD_FAILED';
4+
export const DNS_APPLY_TEMPLATE_COMPLETED = 'DNS_APPLY_TEMPLATE_COMPLETED';
5+
export const DNS_DELETE = 'DNS_DELETE';
6+
export const DNS_DELETE_COMPLETED = 'DNS_DELETE_COMPLETED';
7+
export const DNS_DELETE_FAILED = 'DNS_DELETE_FAILED';
8+
export const DNS_FETCH = 'DNS_FETCH';
9+
export const DNS_FETCH_COMPLETED = 'DNS_FETCH_COMPLETED';
10+
export const DNS_FETCH_FAILED = 'DNS_FETCH_FAILED';

client/lib/domains/dns/actions.js

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
/**
2+
* Internal dependencies
3+
*/
4+
import Dispatcher from 'dispatcher';
5+
import wpcom from 'lib/wp';
6+
import {
7+
DNS_ADD,
8+
DNS_ADD_COMPLETED,
9+
DNS_ADD_FAILED,
10+
DNS_APPLY_TEMPLATE_COMPLETED,
11+
DNS_DELETE,
12+
DNS_DELETE_COMPLETED,
13+
DNS_DELETE_FAILED,
14+
DNS_FETCH,
15+
DNS_FETCH_COMPLETED,
16+
DNS_FETCH_FAILED,
17+
} from './action-types';
18+
import DnsStore from './store';
19+
import { isBeingProcessed } from '.';
20+
21+
export function fetchDns( domainName ) {
22+
const dns = DnsStore.getByDomainName( domainName );
23+
24+
if ( dns.isFetching || dns.hasLoadedFromServer ) {
25+
return;
26+
}
27+
28+
Dispatcher.handleViewAction( {
29+
type: DNS_FETCH,
30+
domainName,
31+
} );
32+
33+
wpcom.undocumented().fetchDns( domainName, ( error, data ) => {
34+
if ( ! error ) {
35+
Dispatcher.handleServerAction( {
36+
type: DNS_FETCH_COMPLETED,
37+
records: data && data.records,
38+
domainName,
39+
} );
40+
} else {
41+
Dispatcher.handleServerAction( {
42+
type: DNS_FETCH_FAILED,
43+
domainName,
44+
} );
45+
}
46+
} );
47+
}
48+
49+
export function addDns( domainName, record, onComplete ) {
50+
Dispatcher.handleServerAction( {
51+
type: DNS_ADD,
52+
domainName,
53+
record,
54+
} );
55+
56+
const dns = DnsStore.getByDomainName( domainName );
57+
58+
wpcom.undocumented().updateDns( domainName, dns.records, error => {
59+
const type = ! error ? DNS_ADD_COMPLETED : DNS_ADD_FAILED;
60+
Dispatcher.handleServerAction( {
61+
type,
62+
domainName,
63+
record,
64+
} );
65+
66+
onComplete( error );
67+
} );
68+
}
69+
70+
export function deleteDns( domainName, record, onComplete ) {
71+
if ( isBeingProcessed( record ) ) {
72+
return;
73+
}
74+
75+
Dispatcher.handleServerAction( {
76+
type: DNS_DELETE,
77+
domainName,
78+
record,
79+
} );
80+
81+
const dns = DnsStore.getByDomainName( domainName );
82+
83+
wpcom.undocumented().updateDns( domainName, dns.records, error => {
84+
const type = ! error ? DNS_DELETE_COMPLETED : DNS_DELETE_FAILED;
85+
86+
Dispatcher.handleServerAction( {
87+
type,
88+
domainName,
89+
record,
90+
} );
91+
92+
onComplete( error );
93+
} );
94+
}
95+
96+
export function applyDnsTemplate( domainName, provider, service, variables, onComplete ) {
97+
wpcom
98+
.undocumented()
99+
.applyDnsTemplate( domainName, provider, service, variables, ( error, data ) => {
100+
if ( ! error ) {
101+
Dispatcher.handleServerAction( {
102+
type: DNS_APPLY_TEMPLATE_COMPLETED,
103+
records: data && data.records,
104+
domainName,
105+
} );
106+
}
107+
onComplete( error );
108+
} );
109+
}

client/lib/domains/dns/reducer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
DNS_FETCH,
2222
DNS_FETCH_COMPLETED,
2323
DNS_FETCH_FAILED,
24-
} from 'lib/upgrades/action-types';
24+
} from './action-types';
2525
import { addMissingWpcomRecords, removeDuplicateWpcomRecords } from './';
2626

2727
function updateDomainState( state, domainName, dns ) {

client/lib/domains/dns/test/reducer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { pick } from 'lodash';
1111
*/
1212
import { reducer } from '../reducer';
1313
import { DOMAIN_NAME, RECORD_A, RECORD_NS, RECORD_TXT } from './data';
14-
import { DNS_DELETE_COMPLETED } from 'lib/upgrades/action-types';
14+
import { DNS_DELETE_COMPLETED } from '../action-types';
1515

1616
describe( 'reducer', () => {
1717
test( 'should return the same state when no matching record passed in the delete action', () => {

client/lib/domains/index.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,14 @@ function getDomainSuggestionSearch( search, minLength = 2 ) {
345345
return cleanedSearch;
346346
}
347347

348+
function resendIcannVerification( domainName, onComplete ) {
349+
return wpcom.undocumented().resendIcannVerification( domainName, onComplete );
350+
}
351+
352+
function requestGdprConsentManagementLink( domainName, onComplete ) {
353+
return wpcom.undocumented().requestGdprConsentManagementLink( domainName, onComplete );
354+
}
355+
348356
export {
349357
canRedirect,
350358
checkAuthCode,
@@ -373,4 +381,6 @@ export {
373381
startInboundTransfer,
374382
getAvailableTlds,
375383
getDomainSuggestionSearch,
384+
resendIcannVerification,
385+
requestGdprConsentManagementLink,
376386
};
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
export const NAMESERVERS_FETCH = 'NAMESERVERS_FETCH';
2+
export const NAMESERVERS_FETCH_COMPLETED = 'NAMESERVERS_FETCH_COMPLETED';
3+
export const NAMESERVERS_FETCH_FAILED = 'NAMESERVERS_FETCH_FAILED';
4+
export const NAMESERVERS_UPDATE_COMPLETED = 'NAMESERVERS_UPDATE_COMPLETED';

0 commit comments

Comments
 (0)