From c4e61bffe50af91da4ad8af5191bd61c3d90f3b7 Mon Sep 17 00:00:00 2001 From: pinis-gini-apps Date: Tue, 16 Jan 2024 15:58:21 +0200 Subject: [PATCH 1/3] [Artifacts] different file size on the preview and list view --- src/elements/PreviewModal/PreviewModal.js | 12 ++++++------ src/elements/PreviewModal/previewModal.scss | 3 +++ src/elements/TableCell/TableCell.js | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/elements/PreviewModal/PreviewModal.js b/src/elements/PreviewModal/PreviewModal.js index dfdbcfbfe..bbe530167 100644 --- a/src/elements/PreviewModal/PreviewModal.js +++ b/src/elements/PreviewModal/PreviewModal.js @@ -74,7 +74,7 @@ const PreviewModal = ({ artifact }) => { {(artifact.ui.size || artifact.size) && (
- size: + size: {artifact.ui.size ? artifact.ui.size : typeof artifact.size === 'string' @@ -94,11 +94,11 @@ const PreviewModal = ({ artifact }) => {
{artifact.header_original_length && - artifact.header_original_length > preview[0]?.data?.headers?.length && ( -
- This table presents partial data. To view complete data, download it. -
- )} + artifact.header_original_length > preview[0]?.data?.headers?.length && ( +
+ This table presents partial data. To view complete data, download it. +
+ )}
{preview[0]?.hidden && artifact.extra_data?.length > 0 ? null : ( diff --git a/src/elements/PreviewModal/previewModal.scss b/src/elements/PreviewModal/previewModal.scss index 5a3793fda..c1892a776 100644 --- a/src/elements/PreviewModal/previewModal.scss +++ b/src/elements/PreviewModal/previewModal.scss @@ -76,6 +76,9 @@ &__path { flex: 2; } + &__size { + margin-right: 5px; + } } } } diff --git a/src/elements/TableCell/TableCell.js b/src/elements/TableCell/TableCell.js index d7d344f32..39bcac6b8 100644 --- a/src/elements/TableCell/TableCell.js +++ b/src/elements/TableCell/TableCell.js @@ -20,6 +20,7 @@ such restriction. import React from 'react' import PropTypes from 'prop-types' import { useDispatch } from 'react-redux' +import prettyBytes from 'pretty-bytes' import classnames from 'classnames' import ChipCell from '../../common/ChipCell/ChipCell' @@ -185,7 +186,7 @@ const TableCell = ({ className="text_small" template={} > - {data.value} + {data.headerId === 'size' ? prettyBytes(item.size) : data.value} ) From ab4b6beaa3d9f2e2f9e09d7ea32cb3afbe1b266d Mon Sep 17 00:00:00 2001 From: pinis-gini-apps Date: Tue, 23 Jan 2024 18:24:58 +0200 Subject: [PATCH 2/3] the convertBytes method is updated to prettyBytes in createArtifactsContent. The prettyBytes is removed from TableCell component --- src/elements/TableCell/TableCell.js | 3 +-- src/utils/createArtifactsContent.js | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/elements/TableCell/TableCell.js b/src/elements/TableCell/TableCell.js index 39bcac6b8..d7d344f32 100644 --- a/src/elements/TableCell/TableCell.js +++ b/src/elements/TableCell/TableCell.js @@ -20,7 +20,6 @@ such restriction. import React from 'react' import PropTypes from 'prop-types' import { useDispatch } from 'react-redux' -import prettyBytes from 'pretty-bytes' import classnames from 'classnames' import ChipCell from '../../common/ChipCell/ChipCell' @@ -186,7 +185,7 @@ const TableCell = ({ className="text_small" template={} > - {data.headerId === 'size' ? prettyBytes(item.size) : data.value} + {data.value} ) diff --git a/src/utils/createArtifactsContent.js b/src/utils/createArtifactsContent.js index d49241748..94b37719a 100644 --- a/src/utils/createArtifactsContent.js +++ b/src/utils/createArtifactsContent.js @@ -31,7 +31,7 @@ import { } from '../constants' import { parseKeyValues } from './object' import { formatDatetime } from './datetime' -import { convertBytes } from './convertBytes' +import prettyBytes from 'pretty-bytes' import { parseUri } from './parseUri' import { generateFunctionDetailsLink } from './generateFunctionDetailsLink' import { generateLinkToDetailsPanel } from './generateLinkToDetailsPanel' @@ -347,7 +347,7 @@ export const createFilesRowData = (artifact, project, frontendSpec, showExpandBu id: `size.${artifact.ui.identifierUnique}`, headerId: 'size', headerLabel: 'Size', - value: isNumber(artifact.size) && artifact.size >= 0 ? convertBytes(artifact.size) : 'N/A', + value: isNumber(artifact.size) && artifact.size >= 0 ? prettyBytes(artifact.size) : 'N/A', className: 'table-cell-1' } ] @@ -557,7 +557,7 @@ export const createDatasetsRowData = (artifact, project, frontendSpec, showExpan id: `size.${artifact.ui.identifierUnique}`, headerId: 'size', headerLabel: 'Size', - value: isNumber(artifact.size) && artifact.size >= 0 ? convertBytes(artifact.size) : 'N/A', + value: isNumber(artifact.size) && artifact.size >= 0 ? prettyBytes(artifact.size) : 'N/A', className: 'table-cell-1' }, { From 6aa04c8c493003f29296a8316c1f7734bfe1a1f7 Mon Sep 17 00:00:00 2001 From: pinis-gini-apps Date: Wed, 24 Jan 2024 12:07:09 +0200 Subject: [PATCH 3/3] fix spacing lines --- src/elements/PreviewModal/previewModal.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/elements/PreviewModal/previewModal.scss b/src/elements/PreviewModal/previewModal.scss index c1892a776..6175fd39b 100644 --- a/src/elements/PreviewModal/previewModal.scss +++ b/src/elements/PreviewModal/previewModal.scss @@ -76,6 +76,7 @@ &__path { flex: 2; } + &__size { margin-right: 5px; }