From fed6fa0b4479a9e30853f59175ab0adef743a689 Mon Sep 17 00:00:00 2001
From: Jose Manuel Serrano Amaut <a20122128@pucp.pe>
Date: Tue, 21 Mar 2023 10:31:27 -0500
Subject: [PATCH] [REF]: Hide size formatted if not set or false
---
src/files-ui/components/file-card/FileCard.tsx | 4 +---
.../FileMosaicInfoLayer/FileMosaicInfoLayerProps.ts | 2 +-
.../FileMosaicMainLayer.tsx/FileMosaicMainLayer.tsx | 7 +++++--
.../FileMosaicMainLayerProps.ts | 2 +-
.../file-mosaic/components/file-mosaic/FileMosaic.tsx | 11 +++--------
src/files-ui/core/utils/fileSizeFormatter.ts | 4 ++--
6 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/files-ui/components/file-card/FileCard.tsx b/src/files-ui/components/file-card/FileCard.tsx
index 1af0ffb..625e4d4 100644
--- a/src/files-ui/components/file-card/FileCard.tsx
+++ b/src/files-ui/components/file-card/FileCard.tsx
@@ -147,9 +147,7 @@ const FileCard: React.FC<FileCardProps> = (props: FileCardProps) => {
videoUrl
);
//The size formatted and rounded in 2 decimals
- const sizeFormatted: string = localSize
- ? fileSizeFormater(localSize)
- : "0 KB";
+ const sizeFormatted: string | undefined = fileSizeFormater(localSize);
//alwaysActive
const [showInfo, setShowInfo] = React.useState<boolean>(false);
diff --git a/src/files-ui/components/file-mosaic/components/FileMosaicInfoLayer/FileMosaicInfoLayerProps.ts b/src/files-ui/components/file-mosaic/components/FileMosaicInfoLayer/FileMosaicInfoLayerProps.ts
index 6587467..c4ad738 100644
--- a/src/files-ui/components/file-mosaic/components/FileMosaicInfoLayer/FileMosaicInfoLayerProps.ts
+++ b/src/files-ui/components/file-mosaic/components/FileMosaicInfoLayer/FileMosaicInfoLayerProps.ts
@@ -8,6 +8,6 @@ export type FileMosaicInfoLayerProps = {
onCloseInfo?:Function;
localName: string;
- sizeFormatted: string;
+ sizeFormatted?: string;
localType?: string;
}
\ No newline at end of file
diff --git a/src/files-ui/components/file-mosaic/components/FileMosaicMainLayer.tsx/FileMosaicMainLayer.tsx b/src/files-ui/components/file-mosaic/components/FileMosaicMainLayer.tsx/FileMosaicMainLayer.tsx
index c2680da..6555401 100644
--- a/src/files-ui/components/file-mosaic/components/FileMosaicMainLayer.tsx/FileMosaicMainLayer.tsx
+++ b/src/files-ui/components/file-mosaic/components/FileMosaicMainLayer.tsx/FileMosaicMainLayer.tsx
@@ -14,7 +14,8 @@ const FileMosaicMainLayer: React.FC<FileMosaicMainLayerProps> = (
props: FileMosaicMainLayerProps
) => {
const {
- darkMode,deleteIcon,
+ darkMode,
+ deleteIcon,
downloadIcon,
imageIcon,
infoIcon,
@@ -52,7 +53,9 @@ const FileMosaicMainLayer: React.FC<FileMosaicMainLayerProps> = (
uploadStatus={uploadStatus}
localization={localization}
/>
- {isActive && <FileMosaicSize sizeFormatted={sizeFormatted} />}
+ {isActive && sizeFormatted && (
+ <FileMosaicSize sizeFormatted={sizeFormatted} />
+ )}
</div>
<div className="file-mosaic-footer-right">
{isActive && (
diff --git a/src/files-ui/components/file-mosaic/components/FileMosaicMainLayer.tsx/FileMosaicMainLayerProps.ts b/src/files-ui/components/file-mosaic/components/FileMosaicMainLayer.tsx/FileMosaicMainLayerProps.ts
index 7f8fcfa..d1858a2 100644
--- a/src/files-ui/components/file-mosaic/components/FileMosaicMainLayer.tsx/FileMosaicMainLayerProps.ts
+++ b/src/files-ui/components/file-mosaic/components/FileMosaicMainLayer.tsx/FileMosaicMainLayerProps.ts
@@ -10,7 +10,7 @@ export interface FileMosaicMainLayerProps {
uploadStatus?: UPLOADSTATUS;
localization?: Localization;
- sizeFormatted: string;
+ sizeFormatted?: string;
imageIcon: boolean;
onSee: ((imageSource: string | undefined) => void) | undefined;
diff --git a/src/files-ui/components/file-mosaic/components/file-mosaic/FileMosaic.tsx b/src/files-ui/components/file-mosaic/components/file-mosaic/FileMosaic.tsx
index 1d68513..7fb983d 100644
--- a/src/files-ui/components/file-mosaic/components/file-mosaic/FileMosaic.tsx
+++ b/src/files-ui/components/file-mosaic/components/file-mosaic/FileMosaic.tsx
@@ -65,10 +65,9 @@ const FileMosaic: React.FC<FileMosaicProps> = (props: FileMosaicProps) => {
onDoubleClick,
onClick,
onRightClick,
- smartImgFit="orientation",
+ smartImgFit = "orientation",
} = props;
-//localizers
-
+ //localizers
//ref for anchor download element
const downloadRef = React.useRef<HTMLAnchorElement>(null);
@@ -116,10 +115,7 @@ const FileMosaic: React.FC<FileMosaicProps> = (props: FileMosaicProps) => {
);
//The size formatted and rounded in 2 decimals
- const sizeFormatted: string = localSize
- ? fileSizeFormater(localSize)
- : "0 KB";
-
+ const sizeFormatted: string| undefined = fileSizeFormater(localSize);
//alwaysActive
const [showInfo, setShowInfo] = React.useState<boolean>(false);
@@ -210,7 +206,6 @@ const FileMosaic: React.FC<FileMosaicProps> = (props: FileMosaicProps) => {
onAbort?.(id);
};
-
if (isReady)
return (
<div
diff --git a/src/files-ui/core/utils/fileSizeFormatter.ts b/src/files-ui/core/utils/fileSizeFormatter.ts
index 6e19ce5..ac23dff 100644
--- a/src/files-ui/core/utils/fileSizeFormatter.ts
+++ b/src/files-ui/core/utils/fileSizeFormatter.ts
@@ -2,10 +2,10 @@
* Gives a XX.XX format in Bytes KB, MB, GB or TB
* @param fileSize file size to give format in Bytes
*/
- export const fileSizeFormater = (fileSize?: number): string => {
+ export const fileSizeFormater = (fileSize?: number | false): string| undefined => {
let result = "";
if (!fileSize) {
- return 0 + " Bytes";
+ return undefined;
}
if (fileSize < 1024) {
result = fileSize + " Bytes"
--
GitLab