- Found mismatches in .ee registry between contact names and business/citizenship registries. Please confirm to update {contactUpdateCount} contact records for your .ee domain registrations
- Update contacts
-
- )}
+ return (
+
+ Found mismatches in .ee registry between contact names and business/citizenship
+ registries. Please confirm to update {contactUpdateCount} contact records for your
+ .ee domain registrations
+ Update contacts
+
+ );
+ };
return (
diff --git a/src/components/WhoIsEdit/WhoIsEdit.jsx b/src/components/WhoIsEdit/WhoIsEdit.jsx
index e653859..dff69f6 100644
--- a/src/components/WhoIsEdit/WhoIsEdit.jsx
+++ b/src/components/WhoIsEdit/WhoIsEdit.jsx
@@ -1,7 +1,7 @@
/* eslint-disable camelcase */
import React from 'react';
import { FormattedMessage } from 'react-intl';
-import { Form, Checkbox } from 'semantic-ui-react';
+import { Form, Checkbox, Popup, Icon } from 'semantic-ui-react';
import PropTypes from 'prop-types';
import Roles from '../Roles/Roles';
@@ -24,9 +24,8 @@ function WhoIsEdit({ contacts, isOpen, checkAll, onChange, domain }) {
}
return disclosed_attributes.size;
})(),
- isCheckedAll:
- domain.registrant.org || disclosed_attributes.size === contactsList.length * 2,
- totalCount: acc.totalCount + 2,
+ isCheckedAll: disclosed_attributes.size === contactsList.length * 3,
+ totalCount: acc.totalCount + 3,
}),
{
checkedCount: 0,
@@ -40,12 +39,22 @@ function WhoIsEdit({ contacts, isOpen, checkAll, onChange, domain }) {
const handleChange = (checked, ids, type) => {
const changedContacts = ids.reduce((acc, id) => {
const { disclosed_attributes } = contacts[id];
+ const { registrant_publishable } = contacts[id];
const attributes = new Set(disclosed_attributes);
+ let publishable = registrant_publishable
+
+ if (domain.registrant.org) {
+ attributes.add('name');
+ attributes.add('email');
+ }
+
type.forEach((attr) => {
- if (checked) {
- attributes.add(attr);
+ if (attr === 'registrant_publishable') {
+ publishable = checked;
+ } else if (checked) {
+ attributes.add(attr);
} else {
- attributes.delete(attr);
+ attributes.delete(attr);
}
});
return {
@@ -53,6 +62,7 @@ function WhoIsEdit({ contacts, isOpen, checkAll, onChange, domain }) {
[id]: {
...contacts[id],
disclosed_attributes: attributes,
+ registrant_publishable: publishable,
},
};
}, {});
@@ -102,16 +112,19 @@ function WhoIsEdit({ contacts, isOpen, checkAll, onChange, domain }) {
return (
<>
- {checkAll && (
+ {checkAll && !isCompany && (
@@ -177,6 +190,48 @@ function WhoIsEdit({ contacts, isOpen, checkAll, onChange, domain }) {
value={item.email}
/>
+
+
+
+ {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
+
+
+
))}
@@ -186,17 +241,17 @@ function WhoIsEdit({ contacts, isOpen, checkAll, onChange, domain }) {
export default WhoIsEdit;
-WhoIsEdit.propTypes = {
- isOpen: PropTypes.bool,
- checkAll: PropTypes.bool,
- onChange: PropTypes.func,
- contacts: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
- domain: PropTypes.object.isRequired,
-};
+// WhoIsEdit.propTypes = {
+// isOpen: PropTypes.bool,
+// checkAll: PropTypes.bool,
+// onChange: PropTypes.func,
+// contacts: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+// domain: PropTypes.object.isRequired,
+// };
-WhoIsEdit.defaultProps = {
- isOpen: false,
- checkAll: false,
- onChange: () => {},
- contacts: [],
-};
+// WhoIsEdit.defaultProps = {
+// isOpen: false,
+// checkAll: false,
+// onChange: () => {},
+// contacts: [],
+// };
diff --git a/src/pages/DomainEditPage/DomainEditPage.jsx b/src/pages/DomainEditPage/DomainEditPage.jsx
index 1d3b7e0..940ce49 100644
--- a/src/pages/DomainEditPage/DomainEditPage.jsx
+++ b/src/pages/DomainEditPage/DomainEditPage.jsx
@@ -113,6 +113,7 @@ const DomainEditPage = ({
if (contact.ident.code === user.ident) {
return updateContact(contact.id, {
disclosed_attributes: [...contact.disclosed_attributes],
+ registrant_publishable: contact.registrant_publishable,
email: contact.email,
phone: contact.phone,
});
@@ -125,8 +126,9 @@ const DomainEditPage = ({
}
return updateContact(contact.id, {
disclosed_attributes: [...contact.disclosed_attributes],
- email: contact.email,
- phone: contact.phone,
+ registrant_publishable: contact.registrant_publishable,
+ email: contact.email,
+ phone: contact.phone,
});
})
);
diff --git a/src/pages/DomainPage/DomainPage.jsx b/src/pages/DomainPage/DomainPage.jsx
index cb770fe..25db91f 100644
--- a/src/pages/DomainPage/DomainPage.jsx
+++ b/src/pages/DomainPage/DomainPage.jsx
@@ -99,7 +99,10 @@ const DomainPage = ({
for (let i = 0; i < user_contacts_keys.length; i += 1) {
for (let j = 0; j < domain_contacts_keys.length; j += 1) {
if (user_contacts_keys[i] === domain_contacts_keys[j]) {
- if (JSON.stringify(domain.contacts[domain_contacts_keys[j]].roles) === JSON.stringify(['tech']))
+ if (
+ JSON.stringify(domain.contacts[domain_contacts_keys[j]].roles) ===
+ JSON.stringify(['tech'])
+ )
break;
lockableFlag = true;
}
@@ -118,11 +121,12 @@ const DomainPage = ({
const handleWhoIsChange = (data) => {
setUserContacts((prevState) =>
Object.entries(data).reduce(
- (acc, [id, { disclosed_attributes }]) => ({
+ (acc, [id, { disclosed_attributes, registrant_publishable }]) => ({
...acc,
[id]: {
...prevState[id],
disclosed_attributes,
+ registrant_publishable,
},
}),
{}
@@ -138,6 +142,7 @@ const DomainPage = ({
Object.values(userContacts || {}).map((contact) => {
const form = {
disclosed_attributes: [...contact.disclosed_attributes],
+ registrant_publishable: contact.registrant_publishable,
};
return updateContact(contact.id, form);
})
@@ -705,23 +710,23 @@ const mapDispatchToProps = (dispatch) =>
export default connect(mapStateToProps, mapDispatchToProps)(DomainPage);
-DomainPage.propTypes = {
- companies: PropTypes.object,
- contacts: PropTypes.object,
- domains: PropTypes.object,
- fetchCompanies: PropTypes.func.isRequired,
- fetchDomain: PropTypes.func.isRequired,
- isLoading: PropTypes.bool.isRequired,
- lockDomain: PropTypes.func.isRequired,
- match: PropTypes.object.isRequired,
- ui: PropTypes.object.isRequired,
- unlockDomain: PropTypes.func.isRequired,
- updateContact: PropTypes.func.isRequired,
- user: PropTypes.object.isRequired,
-};
+// DomainPage.propTypes = {
+// companies: PropTypes.object,
+// contacts: PropTypes.object,
+// domains: PropTypes.object,
+// fetchCompanies: PropTypes.func.isRequired,
+// fetchDomain: PropTypes.func.isRequired,
+// isLoading: PropTypes.bool.isRequired,
+// lockDomain: PropTypes.func.isRequired,
+// match: PropTypes.object.isRequired,
+// ui: PropTypes.object.isRequired,
+// unlockDomain: PropTypes.func.isRequired,
+// updateContact: PropTypes.func.isRequired,
+// user: PropTypes.object.isRequired,
+// };
-DomainPage.defaultProps = {
- companies: [],
- contacts: [],
- domains: [],
-};
+// DomainPage.defaultProps = {
+// companies: [],
+// contacts: [],
+// domains: [],
+// };
diff --git a/src/pages/HomePage/HomePage.jsx b/src/pages/HomePage/HomePage.jsx
index b0b8195..93dbd54 100644
--- a/src/pages/HomePage/HomePage.jsx
+++ b/src/pages/HomePage/HomePage.jsx
@@ -126,7 +126,7 @@ const mapStateToProps = ({ domains, ui, user, filters }) => {
totalDomains: domains.data.count,
ui,
user: user.data,
- isUpdateContact: false
+ isUpdateContact: false,
};
};
diff --git a/src/pages/WhoIsPage/WhoIsPage.jsx b/src/pages/WhoIsPage/WhoIsPage.jsx
index fe0a83d..282ba8e 100644
--- a/src/pages/WhoIsPage/WhoIsPage.jsx
+++ b/src/pages/WhoIsPage/WhoIsPage.jsx
@@ -156,6 +156,7 @@ const WhoIsPage = ({
...contact,
changed: true,
disclosed_attributes: data[id].disclosed_attributes,
+ registrant_publishable: data[id].registrant_publishable,
},
};
}
@@ -181,6 +182,7 @@ const WhoIsPage = ({
.map((contact) => {
const form = {
disclosed_attributes: [...contact.disclosed_attributes],
+ registrant_publishable: contact.registrant_publishable,
};
return updateContact(contact.id, form);
})
diff --git a/src/redux/reducers/contacts.js b/src/redux/reducers/contacts.js
index e29b1b3..2f836c5 100644
--- a/src/redux/reducers/contacts.js
+++ b/src/redux/reducers/contacts.js
@@ -300,4 +300,13 @@ export default function reducer(state = initialState, { payload, type }) {
}
}
-export { initialState, fetchContact, fetchContacts, updateContact, receiveContacts, receiveUpdateContact, fetchUpdateContacts, updateContactsConfirm };
+export {
+ initialState,
+ fetchContact,
+ fetchContacts,
+ updateContact,
+ receiveContacts,
+ receiveUpdateContact,
+ fetchUpdateContacts,
+ updateContactsConfirm,
+};
diff --git a/src/redux/reducers/domains.js b/src/redux/reducers/domains.js
index 422d088..f231eab 100644
--- a/src/redux/reducers/domains.js
+++ b/src/redux/reducers/domains.js
@@ -32,8 +32,6 @@ const parseDomain = (domain, shouldFetchContacts = false, simplify = false) => {
(a, b) => domainStatuses[a].priority - domainStatuses[b].priority
);
- console.log(statuses);
-
const contacts = (simplify
? [
...(registrant && [
@@ -271,15 +269,11 @@ export default function reducer(state = initialState, { payload, type, simplify
};
case FETCH_DOMAINS_SUCCESS:
- // console.log(payload.count);
- // console.log(payload.domains);
let d = {
dod: payload.domains.forEach(domain => {
parseDomain(domain, true, simplify)
}) }
- console.log(d);
-
return {
...state,
data: {
diff --git a/src/translations/en.json b/src/translations/en.json
index 53dfa2f..c42c9fc 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -238,11 +238,15 @@
"whois.content.title": "WHOIS data",
"whois.domain": "Domain",
"whois.domain.detailInfo": "Detailed info",
+ "whois.public.text": "Publicly available",
+ "whois.public.tooltip": "By default the contact data becomes available only on internet.ee webpage behind captcha check to prevent bots collecting your data. This option makes the data avaialble everywhere.",
"whois.edit.checkAll": "({count}/{countOf}) All information visible",
"whois.edit.checkNone": "({count}/{countOf}) All information hidden",
"whois.edit.checkSome": "({count}/{countOf}) Some information hidden",
+ "whois.edit.phone": "Phone public ({contactPhone})",
"whois.edit.email": "E-mail public ({contactEmail})",
"whois.edit.name": "Name public ({contactName})",
+ "whois.edit.registrant_publishable": "Yes, I allow my data to be available without captcha check",
"whois.none.message.title": "You currently don't own any domain",
"whois.page_title": "WHOIS Privacy Settings | .ee registrant portal",
"whois.publicInfo": "Info public",
diff --git a/src/translations/et.json b/src/translations/et.json
index 9a57e6b..5878984 100644
--- a/src/translations/et.json
+++ b/src/translations/et.json
@@ -238,11 +238,15 @@
"whois.content.title": "WHOIS andmed",
"whois.domain": "Domeen",
"whois.domain.detailInfo": "Detailne info",
+ "whois.public.text": "Avalikult kättesaadav",
+ "whois.public.tooltip": "Kontaktandmed muutuvad vaikimisi kättesaadavaks ainult internet.ee lehel captcha checki taga, et vältida sinu andmete kogumist. See valik muudab andmed kõikjal kättesaadavaks.",
"whois.edit.checkAll": "({count}/{countOf}) Kõik info nähtav",
"whois.edit.checkNone": "({count}/{countOf}) Kõik info peidetud",
"whois.edit.checkSome": "({count}/{countOf}) Osa info peidetud",
+ "whois.edit.phone": "Telefon avalik ({contactPhone})",
"whois.edit.email": "E-mail avalik ({contactEmail})",
"whois.edit.name": "Nimi avalik ({contactName})",
+ "whois.edit.registrant_publishable": "Jah, ma luban oma andmed ilma captcha kontrollita kättesaadavaks teha",
"whois.none.message.title": "Teile ei kuulu hetkel ühtegi domeeni",
"whois.page_title": "WHOIS Privaatsusseaded | EIS Registreerijaportaal",
"whois.publicInfo": "Info avalik",
diff --git a/src/utils/helpers.js b/src/utils/helpers.js
index 2c158c0..1f837a8 100644
--- a/src/utils/helpers.js
+++ b/src/utils/helpers.js
@@ -71,6 +71,7 @@ export default {
acc.push({
code: item.code,
disclosed_attributes: new Set(item.disclosed_attributes),
+ registrant_publishable: item.registrant_publishable,
email: item.email,
id: item.id,
ident: item.ident,
@@ -101,7 +102,9 @@ export default {
...contact,
...domain.contacts[contact.id],
disclosed_attributes: new Set(contact.disclosed_attributes),
+ registrant_publishable: contact.registrant_publishable,
initialEmail: contact.email,
+ initialPhone: contact.phone,
initialName: contact.name,
},
}),
@@ -122,6 +125,8 @@ export default {
...contact,
...domain.contacts[key],
disclosed_attributes: new Set(contact.disclosed_attributes),
+ registrant_publishable: contact.registrant_publishable,
+ initialPhone: contact.phone,
initialEmail: contact.email,
initialName: contact.name,
},