Fix [Model-endpoints] Time is wrong in model endpoint

mlrun · Dec 15, 2022 · 8405309 · 8405309
1 parent ec7ea43
commit 8405309
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 22 deletions.
diff --git a/src/components/Details/DetailsView.js b/src/components/Details/DetailsView.js
@@ -149,7 +149,7 @@ const DetailsView = React.forwardRef(
                       stateValue === 'aborted' ? 'N/A' : 'Not yet started'
                     )
                   : selectedItem?.updated
-                  ? formatDatetime(new Date(selectedItem?.updated), 'N/A')
+                  ? formatDatetime(selectedItem?.updated, 'N/A')
                   : selectedItem?.spec?.model.includes(':') // 'model-key:model-tag'
                   ? selectedItem.spec.model.replace(/^.*:/, '') // remove key
                   : selectedItem?.spec?.model

diff --git a/src/components/Details/details.util.js b/src/components/Details/details.util.js
@@ -103,7 +103,7 @@ export const generateArtifactsContent = (
           : ''
       },
       last_prediction: {
-        value: formatDatetime(new Date(selectedItem?.status?.last_request), '-')
+        value: formatDatetime(selectedItem?.status?.last_request, '-')
       },
       error_count: {
         value: selectedItem?.status?.error_count ?? '-'
@@ -163,7 +163,7 @@ export const generateArtifactsContent = (
         value: selectedItem.tree
       },
       updated: {
-        value: formatDatetime(new Date(selectedItem.updated), 'N/A')
+        value: formatDatetime(selectedItem.updated, 'N/A')
       },
       framework: {
         value: detailsType === MODELS_TAB ? selectedItem.framework ?? '' : null
@@ -262,7 +262,7 @@ export const generateFunctionsContent = selectedItem => ({
     value: selectedItem.build.code_origin ?? ''
   },
   updated: {
-    value: formatDatetime(new Date(selectedItem.updated), 'N/A')
+    value: formatDatetime(selectedItem.updated, 'N/A')
   },
   command: {
     value: selectedItem.command
@@ -428,7 +428,7 @@ export const generateFeatureSetsOverviewContent = (
     value: selectedItem.tag
   },
   updated: {
-    value: formatDatetime(new Date(selectedItem.updated), 'N/A')
+    value: formatDatetime(selectedItem.updated, 'N/A')
   },
   usage_example: {
     value: selectedItem.usage_example ?? ''
@@ -467,7 +467,7 @@ export const generateFeatureVectorsOverviewContent = selectedItem => ({
     copyToClipboard: true
   },
   updated: {
-    value: formatDatetime(new Date(selectedItem.updated), 'N/A')
+    value: formatDatetime(selectedItem.updated, 'N/A')
   },
   entities: {
     value: selectedItem.index_keys?.join(', ')

diff --git a/src/components/DetailsInfo/detailsInfo.util.js b/src/components/DetailsInfo/detailsInfo.util.js
@@ -43,7 +43,7 @@ export const generateArtifactsInfoContent = (page, pageTab, selectedItem) => {
       selectedItem.size ?? '',
       selectedItem.target_path,
       selectedItem.tree,
-      formatDatetime(new Date(selectedItem.updated), 'N/A'),
+      formatDatetime(selectedItem.updated, 'N/A'),
       page === MODELS_PAGE ? selectedItem.framework ?? '' : null,
       selectedItem.labels ?? [],
       selectedItem.sources

diff --git a/src/components/Project/ProjectMonitorView.js b/src/components/Project/ProjectMonitorView.js
@@ -108,7 +108,7 @@ const ProjectMonitorView = ({
                   <div className="row-value">
                     <span className="row-label">Created at:</span>
                     <span className="row-name">
-                      {formatDatetime(new Date(project.data.metadata.created), '-')}
+                      {formatDatetime(project.data.metadata.created, '-')}
                     </span>
                   </div>
                 </div>

diff --git a/src/elements/PreviewModal/PreviewModal.js b/src/elements/PreviewModal/PreviewModal.js
@@ -89,7 +89,7 @@ const PreviewModal = ({ item }) => {
               </div>
             )}
             <div className="item-data">
-              {formatDatetime(new Date(item.updated || item.date), 'N/A')}
+              {formatDatetime(item.updated || item.date, 'N/A')}
             </div>
             <div className="preview-body__download">
               <Tooltip template={<TextTooltipTemplate text="Download" />}>

diff --git a/src/utils/createArtifactsContent.js b/src/utils/createArtifactsContent.js
@@ -87,7 +87,7 @@ const createArtifactsRowData = artifact => {
       type: 'owner'
     },
     updated: {
-      value: artifact.updated ? formatDatetime(new Date(artifact.updated), 'N/A') : 'N/A',
+      value: artifact.updated ? formatDatetime(artifact.updated, 'N/A') : 'N/A',
       class: 'artifacts_small'
     },
     buttonPopout: {
@@ -162,7 +162,7 @@ export const createModelsRowData = (artifact, project, showExpandButton) => {
       {
         id: `updated.${artifact.ui.identifierUnique}`,
         header: 'Updated',
-        value: artifact.updated ? formatDatetime(new Date(artifact.updated), 'N/A') : 'N/A',
+        value: artifact.updated ? formatDatetime(artifact.updated, 'N/A') : 'N/A',
         class: 'artifacts_small'
       },
       {
@@ -293,7 +293,7 @@ export const createFilesRowData = (artifact, project, showExpandButton) => {
       {
         id: `updated.${artifact.ui.identifierUnique}`,
         header: 'Updated',
-        value: artifact.updated ? formatDatetime(new Date(artifact.updated), 'N/A') : 'N/A',
+        value: artifact.updated ? formatDatetime(artifact.updated, 'N/A') : 'N/A',
         class: 'artifacts_small'
       },
       {
@@ -407,13 +407,13 @@ export const createModelEndpointsRowData = (artifact, project) => {
       {
         id: `firstRequest.${artifact.ui.identifierUnique}`,
         header: 'Uptime',
-        value: formatDatetime(new Date(artifact.status?.first_request), '-'),
+        value: formatDatetime(artifact.status?.first_request, '-'),
         class: 'artifacts_small'
       },
       {
         id: `lastRequest.${artifact.ui.identifierUnique}`,
         header: 'Last prediction',
-        value: formatDatetime(new Date(artifact.status?.last_request), '-'),
+        value: formatDatetime(artifact.status?.last_request, '-'),
         class: 'artifacts_small'
       },
       {
@@ -498,7 +498,7 @@ export const createDatasetsRowData = (artifact, project, showExpandButton) => {
       {
         id: `updated.${artifact.ui.identifierUnique}`,
         header: 'Updated',
-        value: artifact.updated ? formatDatetime(new Date(artifact.updated), 'N/A') : 'N/A',
+        value: artifact.updated ? formatDatetime(artifact.updated, 'N/A') : 'N/A',
         class: 'artifacts_small'
       },
       {

diff --git a/src/utils/createFeatureStoreContent.js b/src/utils/createFeatureStoreContent.js
@@ -315,7 +315,7 @@ export const createFeatureVectorsRowData = (featureVector, pageTab, project, sho
         id: `updated.${featureVector.ui.identifierUnique}`,
         header: 'Updated',
         value: featureVector.updated
-          ? formatDatetime(new Date(featureVector.updated), 'N/A')
+          ? formatDatetime(featureVector.updated, 'N/A')
           : 'N/A',
         class: 'table-cell-2',
         showTag: true,

diff --git a/src/utils/createFunctionsContent.js b/src/utils/createFunctionsContent.js
@@ -45,7 +45,7 @@ const createFunctionsContent = (functions, pageTab, projectName, showExpandButto
               showTag: true,
               showStatus: true,
               expandedCellContent: {
-                value: formatDatetime(new Date(func.updated), 'N/A'),
+                value: formatDatetime(func.updated, 'N/A'),
                 class: 'functions_medium',
                 type: 'date',
                 showTag: true,
@@ -70,7 +70,7 @@ const createFunctionsContent = (functions, pageTab, projectName, showExpandButto
             },
             {
               id: `updated.${func.ui.identifierUnique}`,
-              value: formatDatetime(new Date(func.updated), 'N/A'),
+              value: formatDatetime(func.updated, 'N/A'),
               class: 'functions_medium',
               type: 'date',
               showTag: true,
@@ -93,7 +93,7 @@ const createFunctionsContent = (functions, pageTab, projectName, showExpandButto
                 return `/projects/${projectName}/functions/${hash}${`/${DETAILS_OVERVIEW_TAB}`}`
               },
               expandedCellContent: {
-                value: formatDatetime(new Date(func.updated), 'N/A'),
+                value: formatDatetime(func.updated, 'N/A'),
                 class: 'functions_medium',
                 type: 'date',
                 showTag: true,
@@ -120,7 +120,7 @@ const createFunctionsContent = (functions, pageTab, projectName, showExpandButto
             {
               id: `updated.${func.ui.identifierUnique}`,
               header: 'Updated',
-              value: formatDatetime(new Date(func.updated), 'N/A'),
+              value: formatDatetime(func.updated, 'N/A'),
               class: 'functions_small',
               type: 'date',
               showTag: true,

diff --git a/src/utils/createJobsContent.js b/src/utils/createJobsContent.js
@@ -368,14 +368,14 @@ export const createJobsWorkflowsTabContent = (
               {
                 header: 'Created at',
                 id: `createdAt.${identifierUnique}`,
-                value: formatDatetime(new Date(job.created_at), 'N/A'),
+                value: formatDatetime(job.created_at, 'N/A'),
                 class: 'table-cell-1',
                 hidden: isSelectedItem
               },
               {
                 header: 'Finished at',
                 id: `finishedAt.${identifierUnique}`,
-                value: formatDatetime(new Date(job.finished_at), 'N/A'),
+                value: formatDatetime(job.finished_at, 'N/A'),
                 class: 'table-cell-1',
                 hidden: isSelectedItem
               },

diff --git a/src/utils/datetime.js b/src/utils/datetime.js
@@ -20,6 +20,10 @@ such restriction.
 import moment from 'moment'
 
 export const formatDatetime = (datetime, invalidDateMessage) => {
+  if (!datetime) {
+    return invalidDateMessage
+  }
+
   const date = new Date(datetime)
 
   return typeof date !== 'object' || !(date instanceof Date) || isNaN(date)