From b08515d72201de6505d5a1ac74d95ef57e35be2d Mon Sep 17 00:00:00 2001
From: esikkala <esko.ikkala@aalto.fi>
Date: Fri, 16 Nov 2018 14:41:54 +0200
Subject: [PATCH] Rename "transaction" -> "observation"
---
src/client/components/ResultTable.js | 31 ++++++++++++++----------
src/client/components/ResultTableHead.js | 6 ++---
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/client/components/ResultTable.js b/src/client/components/ResultTable.js
index b9c74e0e..e6e8699d 100644
--- a/src/client/components/ResultTable.js
+++ b/src/client/components/ResultTable.js
@@ -10,7 +10,7 @@ import Typography from '@material-ui/core/Typography';
import CircularProgress from '@material-ui/core/CircularProgress';
import purple from '@material-ui/core/colors/purple';
import ResultTableHead from './ResultTableHead';
-import { has, orderBy } from 'lodash';
+import { orderBy } from 'lodash';
const styles = (theme) => ({
tableContainer: {
@@ -61,19 +61,21 @@ class ResultTable extends React.Component {
}
idRenderer = (row) => {
- let sdbmLink = '';
- let id = row.id.replace('http://ldf.fi/mmm/manifestation_singleton/', '');
- id = id.replace('orphan_', '');
- id = id.replace('part_', '');
- if (has(row, 'manuscriptRecord') && row.manuscriptRecord !== '-') {
- sdbmLink = row.manuscriptRecord;
- } else {
- sdbmLink = 'https://sdbm.library.upenn.edu/entries/' + id;
- }
+ // let sdbmLink = '';
+ // let id = row.id.replace('http://ldf.fi/mmm/manifestation_singleton/', '');
+ // id = id.replace('orphan_', '');
+ // id = id.replace('part_', '');
+ // if (has(row, 'manuscriptRecord') && row.manuscriptRecord !== '-') {
+ // sdbmLink = row.manuscriptRecord;
+ // } else {
+ // sdbmLink = 'https://sdbm.library.upenn.edu/entries/' + id;
+ // }
+ const sdbmLink = row.sdbmLink;
+ const id = sdbmLink.substring(sdbmLink.lastIndexOf('/') + 1);
return (
<div className={this.props.classes.tableColumn}>
- <a target='_blank' rel='noopener noreferrer' href={sdbmLink}>{id}</a>
+ <a target='_blank' rel='noopener noreferrer' href={row.sdbmLink}>{id}</a>
</div>
);
};
@@ -139,7 +141,7 @@ class ResultTable extends React.Component {
}
};
- transactionRenderer = cell => {
+ observationRenderer = cell => {
if (Array.isArray(cell)) {
cell = orderBy(cell, 'date');
const items = cell.map((item, i) => {
@@ -179,6 +181,9 @@ class ResultTable extends React.Component {
};
ownerRenderer = cell => {
+ if (cell == null || cell === '-'){
+ return '-';
+ }
if (Array.isArray(cell)) {
cell.map(item => {
Array.isArray(item.order) ? item.earliestOrder = item.order[0] : item.earliestOrder = item.order;
@@ -257,7 +262,7 @@ class ResultTable extends React.Component {
{this.stringListRenderer(row.material)}
</TableCell>*/}
<TableCell className={classes.withFilter}>
- {this.transactionRenderer(row.acquisition)}
+ {this.observationRenderer(row.observation)}
</TableCell>
<TableCell className={classes.withFilter}>
{this.ownerRenderer(row.owner)}
diff --git a/src/client/components/ResultTableHead.js b/src/client/components/ResultTableHead.js
index df1d5336..3b420dd5 100644
--- a/src/client/components/ResultTableHead.js
+++ b/src/client/components/ResultTableHead.js
@@ -59,9 +59,9 @@ const columns = [
// desc: 'Material description'
// },
{
- label: 'Transaction',
- property: 'acquisition',
- desc: 'Transaction description'
+ label: 'Observation',
+ property: 'observation',
+ desc: 'Observation description'
},
{
label: 'Owner',
--
GitLab