feat: swap evidence and with columns

fix #70
dictyBase · Dec 4, 2018 · daf011e · daf011e
1 parent 0f56519
commit daf011e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/features/Ontology/Table/DisplayTable.js b/src/features/Ontology/Table/DisplayTable.js
@@ -62,8 +62,8 @@ export class DisplayTable extends Component<Props> {
           <colgroup>
             <col style={{ width: "25%" }} />
             <col style={{ width: "20%" }} />
-            <col style={{ width: "15%" }} />
             <col style={{ width: "10%" }} />
+            <col style={{ width: "15%" }} />
             <col style={{ width: "10%" }} />
             <col style={{ width: "10%" }} />
             <col style={{ width: "10%" }} />
@@ -81,6 +81,7 @@ export class DisplayTable extends Component<Props> {
                   <TableCell component="th" scope="row">
                     {qualifierFormatter(item.qualifier)} {item.goterm}
                   </TableCell>
+
                   <TableCell>
                     {item.extensions !== null &&
                       item.extensions.map((item: Object, i: string) => (
@@ -114,6 +115,15 @@ export class DisplayTable extends Component<Props> {
                       ))}
                   </TableCell>
 
+                  <TableCell>
+                    <a
+                      className={classes.link}
+                      href={evidenceLinkGenerator(item.evidence_code)}
+                      target="_blank">
+                      {item.evidence_code}
+                    </a>
+                  </TableCell>
+
                   <TableCell>
                     {item.with !== null &&
                       item.with.map((item: Object, i: string) => (
@@ -144,14 +154,7 @@ export class DisplayTable extends Component<Props> {
                         </Fragment>
                       ))}
                   </TableCell>
-                  <TableCell>
-                    <a
-                      className={classes.link}
-                      href={evidenceLinkGenerator(item.evidence_code)}
-                      target="_blank">
-                      {item.evidence_code}
-                    </a>
-                  </TableCell>
+
                   <TableCell>
                     <a
                       className={classes.link}
@@ -160,7 +163,9 @@ export class DisplayTable extends Component<Props> {
                       {item.publication}
                     </a>
                   </TableCell>
+
                   <TableCell>{dateConverter(item.date)}</TableCell>
+
                   <TableCell>
                     <a
                       className={classes.link}

diff --git a/src/features/Ontology/Table/EnhancedTableHead.js b/src/features/Ontology/Table/EnhancedTableHead.js
@@ -14,8 +14,8 @@ const columnData = [
     label: "Qualifier + GO Term",
   },
   { id: "extensions", label: "Extensions" },
-  { id: "with", label: "With" },
   { id: "evidence_code", label: "Evidence" },
+  { id: "with", label: "With" },
   {
     id: "publication",
     label: "Reference",