//
// SPDX-License-Identifier: AGPL-3.0
-import { formatUploadSpeed } from "./formatters";
+import { formatUploadSpeed, formatContainerCost } from "./formatters";
describe('formatUploadSpeed', () => {
it('should show speed less than 1MB/s', () => {
// then
expect(result).toBe('5.23 MB/s');
- });
-});
\ No newline at end of file
+ });
+});
+
+describe('formatContainerCost', () => {
+ it('should correctly round to tenth of a cent', () => {
+ expect(formatContainerCost(0.0)).toBe('$0');
+ expect(formatContainerCost(0.125)).toBe('$0.125');
+ expect(formatContainerCost(0.1254)).toBe('$0.125');
+ expect(formatContainerCost(0.1255)).toBe('$0.126');
+ });
+
+ it('should round up any smaller value to 0.001', () => {
+ expect(formatContainerCost(0.0)).toBe('$0');
+ expect(formatContainerCost(0.001)).toBe('$0.001');
+ expect(formatContainerCost(0.0001)).toBe('$0.001');
+ expect(formatContainerCost(0.00001)).toBe('$0.001');
+ });
+});
import React from "react";
import { Grid, StyleRulesCallback, withStyles } from "@material-ui/core";
import { Dispatch } from 'redux';
-import { formatDate } from "common/formatters";
+import { formatContainerCost, formatDate } from "common/formatters";
import { resourceLabel } from "common/labels";
import { DetailsAttribute } from "components/details-attribute/details-attribute";
import { ResourceKind } from "models/resource";
import { ArvadosTheme } from "common/custom-theme";
import { ProcessRuntimeStatus } from "views-components/process-runtime-status/process-runtime-status";
import { getPropertyChip } from "views-components/resource-properties-form/property-chip";
+import { ContainerRequestResource } from "models/container-request";
+import { filterResources } from "store/resources/resources";
type CssRules = 'link' | 'propertyTag';
});
const mapStateToProps = (state: RootState, props: { request: ProcessResource }) => {
+ const process = getProcess(props.request.uuid)(state.resources);
return {
- container: getProcess(props.request.uuid)(state.resources)?.container,
+ container: process?.container,
+ subprocesses: filterResources((resource: ContainerRequestResource) =>
+ resource.kind === ResourceKind.CONTAINER_REQUEST &&
+ resource.requestingContainerUuid === process?.containerRequest.containerUuid
+ )(state.resources),
};
};
export const ProcessDetailsAttributes = withStyles(styles, { withTheme: true })(
connect(mapStateToProps, mapDispatchToProps)(
- (props: { request: ProcessResource, container?: ContainerResource, twoCol?: boolean, hideProcessPanelRedundantFields?: boolean, classes: Record<CssRules, string> } & ProcessDetailsAttributesActionProps) => {
+ (props: { request: ProcessResource, container?: ContainerResource, subprocesses: ContainerRequestResource[], twoCol?: boolean, hideProcessPanelRedundantFields?: boolean, classes: Record<CssRules, string> } & ProcessDetailsAttributesActionProps) => {
const containerRequest = props.request;
const container = props.container;
+ const subprocesses = props.subprocesses;
const classes = props.classes;
const mdSize = props.twoCol ? 6 : 12;
const filteredPropertyKeys = Object.keys(containerRequest.properties)
<CollectionName className={classes.link} uuid={containerRequest.outputUuid} />
</span>}
</Grid>
+ {container && container.cost && <Grid item xs={12} md={mdSize}>
+ <DetailsAttribute label='Container Cost ' value={formatContainerCost(container.cost)} />
+ </Grid>}
+ {containerRequest && containerRequest.cumulativeCost && subprocesses.length > 0 && <Grid item xs={12} md={mdSize}>
+ <DetailsAttribute label='Container & Subprocess Cost' value={formatContainerCost(containerRequest.cumulativeCost)} />
+ </Grid>}
{containerRequest.properties.template_uuid &&
<Grid item xs={12} md={mdSize}>
<span onClick={() => props.openWorkflow(containerRequest.properties.template_uuid)}>