fix: corrected color representations/added red to removed links

Chia-Network · Apr 20, 2022 · bf177bb · bf177bb
1 parent 2faa026
commit bf177bb
Showing 1 changed file with 44 additions and 10 deletions.
diff --git a/src/utils/functionUtils.js b/src/utils/functionUtils.js
@@ -13,6 +13,7 @@ export const handleClickLink = link => {
 };
 
 export const detailsViewData = (type, detailData, dataType, changeColor) => {
+  console.log(detailData)
   //all detail view data
   if (type === 'data') {
     return (
@@ -60,6 +61,12 @@ export const detailsViewData = (type, detailData, dataType, changeColor) => {
           </Body>
         </>
       );
+    } else if (detailData[dataType]?.changes[0] === '') {
+      return (
+        <>
+          <Body>{detailData[dataType]?.original}</Body>
+        </>
+      );
     } else {
       return (
         <Body color={changeColor(dataType, 'INSERT')}>
@@ -102,10 +109,20 @@ export const detailsViewData = (type, detailData, dataType, changeColor) => {
     ) {
       //show new form data not changed staging detail view
       return (
-        <Body color={changeColor(dataType, 'INSERT')}>
+        <Body>
           {detailData && detailData[dataType] && detailData[dataType].original}
         </Body>
       );
+    } else if (
+      !detailData[dataType]?.changes[0] &&
+      !detailData[dataType]?.original
+    ) {
+      //show new form data not changed staging detail view
+      return (
+        <Body>
+          ---
+        </Body>
+      );
     } else {
       // show formdata that has no changes or original
       return <Body color={changeColor(dataType, 'INSERT')}>---</Body>;
@@ -129,9 +146,7 @@ export const detailsViewData = (type, detailData, dataType, changeColor) => {
       //show subform data that was kept and not deleted
       return (
         <>
-          <Body color={changeColor(dataType, 'INSERT')}>
-            {detailData[dataType]?.original}
-          </Body>
+          <Body>{detailData[dataType]?.original}</Body>
         </>
       );
     } else if (
@@ -168,7 +183,9 @@ export const detailsViewData = (type, detailData, dataType, changeColor) => {
       //show subform original in staging view
       return (
         <Body color={changeColor(dataType, 'INSERT')}>
-          {detailData && detailData[dataType] && detailData[dataType].original}
+          {detailData && detailData[dataType] && detailData[dataType].original
+            ? detailData[dataType].original
+            : '0'}
         </Body>
       );
     }
@@ -217,8 +234,9 @@ export const detailsViewData = (type, detailData, dataType, changeColor) => {
             </a>
           </Body>
           {detailData[dataType]?.changes[0] && detailData[dataType]?.original && (
-            <Body color={changeColor(dataType, 'DELETE')}>
+            <Body>
               <a
+                style={{ color: 'red' }}
                 href={handleClickLink(detailData[dataType]?.original)}
                 target="_blank"
                 rel="noreferrer noopener">
@@ -273,8 +291,9 @@ export const detailsViewData = (type, detailData, dataType, changeColor) => {
     } else if (detailData[dataType]?.changes[0] === null) {
       // show deleted subform links
       return (
-        <Body color={changeColor(dataType, 'DELETE')}>
+        <Body>
           <a
+            style={{ color: 'red' }}
             href={handleClickLink(detailData[dataType]?.original)}
             target="_blank"
             rel="noreferrer noopener">
@@ -295,6 +314,7 @@ export const detailsViewData = (type, detailData, dataType, changeColor) => {
       !_.isEmpty(detailData[dataType]?.changes) &&
       _.some(detailData[dataType]?.changes)
     ) {
+      //subform link changes
       return (
         <>
           <Body color={changeColor(dataType, 'INSERT')}>
@@ -317,8 +337,9 @@ export const detailsViewData = (type, detailData, dataType, changeColor) => {
             </a>
           </Body>
           {detailData[dataType]?.changes[0] && detailData[dataType]?.original && (
-            <Body color={changeColor(dataType, 'DELETE')}>
+            <Body>
               <a
+                style={{ color: 'red' }}
                 href={handleClickLink(detailData[dataType]?.original)}
                 target="_blank"
                 rel="noreferrer noopener">
@@ -353,8 +374,21 @@ export const detailsViewData = (type, detailData, dataType, changeColor) => {
           </a>
         </Body>
       );
-    } else if (!_.some(detailData[dataType]?.changes)) {
-      return <Body color={changeColor(dataType, 'INSERT')}>---</Body>;
+    } else if (
+      _.isEmpty(detailData[dataType]?.changes) &&
+      detailData[dataType]?.original
+    ) {
+      return (
+        <Body color={changeColor(dataType, 'INSERT')}>
+          {detailData[dataType].original}
+        </Body>
+      );
+    } else if (
+      !detailData[dataType]?.changes[0] &&
+      !detailData[dataType]?.original
+    ) {
+      //show new form data not changed staging detail view
+      return <Body>---</Body>;
     } else {
       return (
         <Body color={changeColor(dataType, 'INSERT')}>