Merge pull request #7 from StevenAskwith/timekeeper-wizard

More bug fixes and formating
aws-solutions-library-samples · May 30, 2024 · 6e2238f · 6e2238f
2 parents 68f668a + de828f1
commit 6e2238f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/website/src/admin/uploadToCarStatusTableConfig.js b/website/src/admin/uploadToCarStatusTableConfig.js
@@ -1,6 +1,6 @@
 //import i18next from '../i18n';
-//import { formatAwsDateTime } from '../support-functions/time';
 import { useTranslation } from 'react-i18next';
+import { formatAwsDateTime } from '../support-functions/time';
 
 export const ColumnConfiguration = () => {
  const { t } = useTranslation();
@@ -12,6 +12,7 @@ export const ColumnConfiguration = () => {
  'startTime',
  'uploadStartTime',
  'endTime',
+ 'duration',
  ],
  visibleContentOptions: [
  {
@@ -83,23 +84,23 @@ export const ColumnConfiguration = () => {
  {
  id: 'startTime',
  header: t('carmodelupload.startTime'),
- cell: (item) => item.startTime || '-',
+ cell: (item) => formatAwsDateTime(item.startTime) || '-',
  sortingField: 'startTime',
  width: 220,
  minWidth: 220,
  },
  {
  id: 'uploadStartTime',
  header: t('carmodelupload.uploadStartTime'),
- cell: (item) => item.uploadStartTime || '-',
+ cell: (item) => formatAwsDateTime(item.uploadStartTime) || '-',
  sortingField: 'uploadStartTime',
  width: 220,
  minWidth: 220,
  },
  {
  id: 'endTime',
  header: t('carmodelupload.endTime'),
- cell: (item) => item.endTime || '-',
+ cell: (item) => formatAwsDateTime(item.endTime) || '-',
  sortingField: 'endTime',
  width: 220,
  minWidth: 220,

diff --git a/website/src/components/tableModelsConfigOperator.jsx b/website/src/components/tableModelsConfigOperator.jsx
@@ -90,7 +90,7 @@ export const ColumnConfigurationOperator = () => {
  {
  id: 'uploadedDateTime',
  header: i18next.t('models.upload-date'),
- cell: (item) => formatAwsDateTime(item.fileMetaData.uploadedDateTime) || '-',
+ cell: (item) => String(formatAwsDateTime(item.fileMetaData.uploadedDateTime)) || '-',
  sortingField: 'uploadedDateTime',
  width: 240,
  minWidth: 150,

diff --git a/website/src/pages/timekeeper/components/carSelector.jsx b/website/src/pages/timekeeper/components/carSelector.jsx
@@ -79,10 +79,10 @@ export const CarSelector = ({
  header={tabeleHeaderContent}
  itemsIsLoading={false}
  //isItemDisabled={(item) => !['AVAILABLE', 'OPTIMIZED'].includes(item.status)}
- loadingText={t('models.loading-models')}
- localStorageKey="models-table-preferences"
+ loadingText={t('cars.loading-models')}
+ localStorageKey="cars-table-preferences"
  filteringProperties={filteringProperties}
- filteringI18nStringsName="models"
+ filteringI18nStringsName="cars"
  query={query}
  />
  );

diff --git a/website/src/pages/timekeeper/components/modelSelector.jsx b/website/src/pages/timekeeper/components/modelSelector.jsx
@@ -1,5 +1,5 @@
 import { Box, SpaceBetween, Toggle } from '@cloudscape-design/components';
-import React, { useState } from 'react';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { PageTable } from '../../../components/pageTable';
 import { TableHeader } from '../../../components/tableConfig';
@@ -21,8 +21,8 @@ export const ModelSelector = ({
  'help-model-management',
  'help-admin-model-management',
  ]);
- const [columnConfiguration, setColumnConfiguration] = useState(ColumnConfigurationOperator());
- const [filteringProperties, setFilteringProperties] = useState(FilteringPropertiesOperator());
+ const columnConfiguration = ColumnConfigurationOperator();
+ const filteringProperties = FilteringPropertiesOperator();
  // const [selectedModels, setSelectedModels] = useState([]);
  const [state] = useStore();
  const models = state.models.models;

diff --git a/website/src/pages/timekeeper/components/uploadModelsToCar.jsx b/website/src/pages/timekeeper/components/uploadModelsToCar.jsx
@@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react';
 import * as mutations from '../../../graphql/mutations';
 // import * as subscriptions from '../graphql/subscriptions'
 import { useTranslation } from 'react-i18next';
+import { formatAwsDateTime } from '../../../support-functions/time';
 
 import {
  Alert,
@@ -216,23 +217,23 @@ export function UploadModelToCar(props) {
  {
  id: 'startTime',
  header: t('carmodelupload.startTime'),
- cell: (item) => item.startTime || '-',
+ cell: (item) => formatAwsDateTime(item.startTime) || '-',
  sortingField: 'startTime',
  width: 180,
  minWidth: 180,
  },
  {
  id: 'uploadStartTime',
  header: t('carmodelupload.uploadStartTime'),
- cell: (item) => item.uploadStartTime || '-',
+ cell: (item) => formatAwsDateTime(item.uploadStartTime) || '-',
  sortingField: 'uploadStartTime',
  width: 180,
  minWidth: 180,
  },
  {
  id: 'endTime',
  header: t('carmodelupload.endTime'),
- cell: (item) => item.endTime || '-',
+ cell: (item) => formatAwsDateTime(item.endTime) || '-',
  sortingField: 'endTime',
  width: 180,
  minWidth: 180,

diff --git a/website/src/support-functions/time.js b/website/src/support-functions/time.js
@@ -16,7 +16,12 @@ dayjs.extend(relativeTime);
  * @return {string} string representation YYYY-MM-DD HH:mm:ss (z)
  */
 export const formatAwsDateTime = (dateTime) => {
- return dayjs(dateTime).format('YYYY-MM-DD HH:mm:ss (z)');
+ const result = dayjs(dateTime).format('YYYY-MM-DD HH:mm:ss (z)');
+ if (result === 'Invalid Date') {
+ return;
+ } else {
+ return result;
+ }
 };
 
 /**