From 326b74fc39f63f47c71359276601ea93f7345dc6 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 15 Sep 2017 14:36:37 +0200 Subject: Shrink buttons of experiment and simulation rows --- .../experiments/ExperimentRowComponent.js | 4 +-- .../simulations/SimulationActionButtons.js | 19 +++++++++++--- src/store/denormalizer.js | 30 ---------------------- 3 files changed, 17 insertions(+), 36 deletions(-) delete mode 100644 src/store/denormalizer.js (limited to 'src') diff --git a/src/components/experiments/ExperimentRowComponent.js b/src/components/experiments/ExperimentRowComponent.js index b7468ac7..4fb8cbc1 100644 --- a/src/components/experiments/ExperimentRowComponent.js +++ b/src/components/experiments/ExperimentRowComponent.js @@ -12,13 +12,13 @@ const ExperimentRowComponent = ({experiment, simulationId, onDelete}) => (
onDelete(experiment.id)} > diff --git a/src/components/simulations/SimulationActionButtons.js b/src/components/simulations/SimulationActionButtons.js index 448944c8..c9a8a151 100644 --- a/src/components/simulations/SimulationActionButtons.js +++ b/src/components/simulations/SimulationActionButtons.js @@ -4,14 +4,25 @@ import {Link} from "react-router-dom"; const SimulationActionButtons = ({simulationId, onViewUsers, onDelete}) => ( - + -
onViewUsers(simulationId)}> +
onViewUsers(simulationId)} + >
-
onDelete(simulationId)}> +
onDelete(simulationId)} + >
diff --git a/src/store/denormalizer.js b/src/store/denormalizer.js deleted file mode 100644 index e6583ae7..00000000 --- a/src/store/denormalizer.js +++ /dev/null @@ -1,30 +0,0 @@ -const EXCLUDED_IDENTIFIERS = [ - "objectId", - "googleId", -]; - -export function denormalize(state, objectType, id) { - return denormalizeWithRecursionCheck(state, objectType, id, undefined); -} - -function denormalizeWithRecursionCheck(state, objectType, id, previousType) { - const object = Object.assign({}, state.objects[objectType][id]); - - for (let prop in object) { - if (prop.indexOf(previousType) !== -1) { - continue; - } - - if (prop.endsWith("Id") && EXCLUDED_IDENTIFIERS.indexOf(prop) === -1) { - const propType = prop.replace("Id", ""); - object[propType] = denormalizeWithRecursionCheck(state, propType, object[prop], objectType); - } - - if (prop.endsWith("Ids")) { - const propType = prop.replace("Ids", ""); - object[propType + "s"] = object[prop].map(id => denormalizeWithRecursionCheck(state, propType, id, objectType)); - } - } - - return object; -} -- cgit v1.2.3