projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16719-collection-version-basic-ui'
[arvados-workbench2.git]
/
src
/
common
/
formatters.ts
diff --git
a/src/common/formatters.ts
b/src/common/formatters.ts
index 60e6cd59c53e284a929cd6143c618020537ffd3a..55fb050738af1d670984b9c6b38cc3f8bafb7ddc 100644
(file)
--- a/
src/common/formatters.ts
+++ b/
src/common/formatters.ts
@@
-3,11
+3,18
@@
// SPDX-License-Identifier: AGPL-3.0
import { PropertyValue } from "~/models/search-bar";
// SPDX-License-Identifier: AGPL-3.0
import { PropertyValue } from "~/models/search-bar";
+import { Vocabulary, getTagKeyLabel, getTagValueLabel } from "~/models/vocabulary";
-export const formatDate = (isoDate?: string | null) => {
+export const formatDate = (isoDate?: string | null
, utc: boolean = false
) => {
if (isoDate) {
const date = new Date(isoDate);
if (isoDate) {
const date = new Date(isoDate);
- const text = date.toLocaleString();
+ let text: string;
+ if (utc) {
+ text = date.toUTCString();
+ }
+ else {
+ text = date.toLocaleString();
+ }
return text === 'Invalid Date' ? "(none)" : text;
}
return "(none)";
return text === 'Invalid Date' ? "(none)" : text;
}
return "(none)";
@@
-21,13
+28,18
@@
export const formatFileSize = (size?: number) => {
}
}
}
}
}
}
- return "";
+ return "
0 B
";
};
};
-export const formatTime = (time: number) => {
+export const formatTime = (time: number
, seconds?: boolean
) => {
const minutes = Math.floor(time / (1000 * 60) % 60).toFixed(0);
const hours = Math.floor(time / (1000 * 60 * 60)).toFixed(0);
const minutes = Math.floor(time / (1000 * 60) % 60).toFixed(0);
const hours = Math.floor(time / (1000 * 60 * 60)).toFixed(0);
+ if (seconds) {
+ const seconds = Math.floor(time / (1000) % 60).toFixed(0);
+ return hours + "h " + minutes + "m " + seconds + "s";
+ }
+
return hours + "h " + minutes + "m";
};
return hours + "h " + minutes + "m";
};
@@
-70,7
+82,10
@@
const FILE_SIZES = [
}
];
}
];
-export const formatPropertyValue = (pv: PropertyValue) => {
+export const formatPropertyValue = (pv: PropertyValue, vocabulary?: Vocabulary) => {
+ if (vocabulary && pv.keyID && pv.valueID) {
+ return `${getTagKeyLabel(pv.keyID, vocabulary)}: ${getTagValueLabel(pv.keyID, pv.valueID!, vocabulary)}`;
+ }
if (pv.key) {
return pv.value
? `${pv.key}: ${pv.value}`
if (pv.key) {
return pv.value
? `${pv.key}: ${pv.value}`