From 75e35610758897b0bb90ff113cb6b98b59699fb9 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 14 Feb 2024 12:01:45 +0100 Subject: [PATCH] M #-: Change registration time for version in marketplace app (#2941) Signed-off-by: David Carracedo (cherry picked from commit e774e41c6daf6b686d2ed7e54d7f39cba4f3c675) --- .../components/Cards/MarketplaceAppCard.js | 16 ++++++---------- .../components/Tables/MarketplaceApps/columns.js | 2 +- .../Tabs/MarketplaceApp/Info/information.js | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js b/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js index 766d67c57a..22ddb5beba 100644 --- a/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js +++ b/src/fireedge/src/client/components/Cards/MarketplaceAppCard.js @@ -21,17 +21,12 @@ import { Typography } from '@mui/material' import { useViews } from 'client/features/Auth' import MultipleTags from 'client/components/MultipleTags' -import Timer from 'client/components/Timer' import { StatusCircle, StatusChip } from 'client/components/Status' import { Tr } from 'client/components/HOC' import { rowStyles } from 'client/components/Tables/styles' import { getState, getType } from 'client/models/MarketplaceApp' -import { - timeFromMilliseconds, - getUniqueLabels, - getColorFromString, -} from 'client/models/Helper' +import { getUniqueLabels, getColorFromString } from 'client/models/Helper' import { prettyBytes } from 'client/utils' import { T, @@ -63,7 +58,7 @@ const MarketplaceAppCard = memo( UNAME, GNAME, LOCK, - REGTIME, + VERSION, MARKETPLACE, ZONE_ID, SIZE, @@ -73,7 +68,6 @@ const MarketplaceAppCard = memo( const state = useMemo(() => getState(app), [app?.STATE]) const { color: stateColor, name: stateName } = state - const time = useMemo(() => timeFromMilliseconds(+REGTIME), [REGTIME]) const type = useMemo(() => getType(app), [app?.TYPE]) const labels = useMemo( @@ -104,8 +98,10 @@ const MarketplaceAppCard = memo(
{`#${ID}`} - time.toFormat('ff'), [REGTIME])}> - + + + {Tr(T.Version)}: {VERSION} + diff --git a/src/fireedge/src/client/components/Tables/MarketplaceApps/columns.js b/src/fireedge/src/client/components/Tables/MarketplaceApps/columns.js index 01b4187f01..a6489ac272 100644 --- a/src/fireedge/src/client/components/Tables/MarketplaceApps/columns.js +++ b/src/fireedge/src/client/components/Tables/MarketplaceApps/columns.js @@ -33,7 +33,7 @@ const COLUMNS = [ accessor: 'TEMPLATE.LABELS', filter: 'includesSome', }, - { Header: T.RegistrationTime, id: 'time', accessor: 'REGTIME' }, + { Header: T.Version, id: 'version', accessor: 'VERSION' }, { Header: T.Marketplace, id: 'marketplace', accessor: 'MARKETPLACE' }, { Header: T.Zone, id: 'zone', accessor: 'ZONE_ID' }, ] diff --git a/src/fireedge/src/client/components/Tabs/MarketplaceApp/Info/information.js b/src/fireedge/src/client/components/Tabs/MarketplaceApp/Info/information.js index 1986a4a7c7..9a15bbf4f8 100644 --- a/src/fireedge/src/client/components/Tabs/MarketplaceApp/Info/information.js +++ b/src/fireedge/src/client/components/Tabs/MarketplaceApp/Info/information.js @@ -74,7 +74,7 @@ const InformationPanel = ({ app = {}, actions }) => { generatePath(PATH.STORAGE.MARKETPLACES.DETAIL, { id: MARKETPLACE_ID }), }, { - name: T.StartTime, + name: T.RegistrationTime, value: timeToString(REGTIME), }, { name: T.Type, value: },