chore(components): Prevented render object and report error

PeculiarVentures · Jun 7, 2020 · da2b4e3 · da2b4e3
1 parent 2b4f610
commit da2b4e3
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/components/info/index.jsx b/src/components/info/index.jsx
@@ -45,7 +45,6 @@ const InfoContainer = styled.div`
 `;
 
 export default class Info extends Component {
-
   static contextTypes = {
     dispatch: PropTypes.func,
     handleRootAction: PropTypes.func,
@@ -106,6 +105,10 @@ export default class Info extends Component {
     return item;
   }
 
+  componentDidCatch(error) {
+    console.error(error);
+  }
+
   renderInfoContent(type, item) {
     switch (type) {
       case 'certificate':

diff --git a/src/components/info/info_certificate.jsx b/src/components/info/info_certificate.jsx
@@ -13,6 +13,13 @@ const CertificateInfo = (props, context) => {
 
   const renderRowContainer = (title, value, index, monospace) => {
     if (value && title !== 'name') {
+      const isLink = value.toString().indexOf('http') === 0;
+      let valueElement = value;
+
+      if (Object.prototype.toString.call(valueElement) === '[object Object]') {
+        valueElement = null;
+      }
+
       return (
         <RowCertInfo
           key={index}
@@ -21,11 +28,11 @@ const CertificateInfo = (props, context) => {
             {title}{title === 'None' ? '' : ':'}
           </ColCert>
           <ColCert monospace={monospace}>
-            {value.toString().indexOf('http') === 0 ? (
-              <a href={value} target="_blank" rel="noopener noreferrer">
-                {value}
+            {isLink ? (
+              <a href={valueElement} target="_blank" rel="noopener noreferrer">
+                {valueElement}
               </a>
-            ) : value}
+            ) : valueElement}
           </ColCert>
         </RowCertInfo>
       );
@@ -126,7 +133,7 @@ const CertificateInfo = (props, context) => {
           </RowCert>
         )}
       </Row>
-    </Root >
+    </Root>
   );
 };
 

diff --git a/src/components/info/info_request.jsx b/src/components/info/info_request.jsx
@@ -12,13 +12,19 @@ const RequestInfo = (props, context) => {
 
   const renderRowContainer = (title, value, monospace) => {
     if (value && title !== 'name') {
+      let valueElement = value;
+
+      if (Object.prototype.toString.call(valueElement) === '[object Object]') {
+        valueElement = null;
+      }
+
       return (
         <RowCertInfo>
           <ColCert>
             {title}:
           </ColCert>
           <ColCert monospace={monospace}>
-            {value}
+            {valueElement}
           </ColCert>
         </RowCertInfo>
       );