Skip to content
Snippets Groups Projects
Commit 124d29fa authored by Lewis Liu's avatar Lewis Liu
Browse files

Added how this is calculated to metric details page

parent d8dfaff3
No related branches found
No related tags found
No related merge requests found
......@@ -55,7 +55,7 @@ const validate = (values, props) => props.hasRevisionHistory ?
@connect(mapStateToProps, mapDispatchToProps)
@reduxForm({
form: 'details',
fields: ['name', 'display_name', 'description', 'revision_message', 'points_of_interest', 'caveats'],
fields: ['name', 'display_name', 'description', 'revision_message', 'points_of_interest', 'caveats', 'how_is_this_calculated'],
validate
})
export default class EntityItem extends Component {
......@@ -67,7 +67,7 @@ export default class EntityItem extends Component {
render() {
const {
fields: { name, display_name, description, revision_message, points_of_interest, caveats },
fields: { name, display_name, description, revision_message, points_of_interest, caveats, how_is_this_calculated },
style,
section,
entity,
......@@ -228,6 +228,18 @@ export default class EntityItem extends Component {
field={caveats}
/>
</li>
{ section.type === 'metric' &&
<li className="relative">
<Item
id="caveats"
name={`How this ${section.type} is calculated`}
description={entity.how_is_this_calculated}
placeholder="Nothing on how it's calculated yet"
isEditing={isEditing}
field={how_is_this_calculated}
/>
</li>
}
</List>
</div>
}
......
......@@ -36,20 +36,21 @@
(defendpoint PUT "/:id"
"Update a `Metric` with ID."
[id :as {{:keys [name description caveats points_of_interest definition revision_message]} :body}]
[id :as {{:keys [name description caveats points_of_interest how_is_this_calculated definition revision_message]} :body}]
{name [Required NonEmptyString]
revision_message [Required NonEmptyString]
definition [Required Dict]}
(check-superuser)
(check-404 (metric/exists? id))
(metric/update-metric!
{:id id
:name name
:description description
:caveats caveats
:points_of_interest points_of_interest
:definition definition
:revision_message revision_message}
{:id id
:name name
:description description
:caveats caveats
:points_of_interest points_of_interest
:how_is_this_calculated how_is_this_calculated
:definition definition
:revision_message revision_message}
*current-user-id*))
(defendpoint PUT "/:id/important_fields"
......
......@@ -118,7 +118,7 @@
"Update an existing `Metric`.
Returns the updated `Metric` or throws an Exception."
[{:keys [id name description caveats points_of_interest definition revision_message]} user-id]
[{:keys [id name description caveats points_of_interest how_is_this_calculated definition revision_message]} user-id]
{:pre [(integer? id)
(string? name)
(map? definition)
......@@ -126,11 +126,12 @@
(string? revision_message)]}
;; update the metric itself
(db/update! Metric id
:name name
:description description
:caveats caveats
:points_of_interest points_of_interest
:definition definition)
:name name
:description description
:caveats caveats
:points_of_interest points_of_interest
:how_is_this_calculated how_is_this_calculated
:definition definition)
(u/prog1 (retrieve-metric id)
(events/publish-event :metric-update (assoc <> :actor_id user-id, :revision_message revision_message))))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment