merged development

mlrun · Nov 14, 2024 · 8b9f6cd · 8b9f6cd
2 parents d03d453 + c4efbff
commit 8b9f6cd
Show file tree

Hide file tree

Showing 149 changed files with 5,453 additions and 2,681 deletions.
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "final-form-arrays": "^3.1.0",
     "fs-extra": "^10.0.0",
     "identity-obj-proxy": "^3.0.0",
-    "iguazio.dashboard-react-controls": "2.2.3",
+    "iguazio.dashboard-react-controls": "2.2.5",
     "is-wsl": "^1.1.0",
     "js-base64": "^2.5.2",
     "js-yaml": "^4.1.0",
@@ -128,7 +128,7 @@
     "body-parser": "^1.19.0",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "chai": "^4.3.4",
-    "chromedriver": "^128.0.0",
+    "chromedriver": "^130.0.0",
     "css-loader": "^6.5.1",
     "cucumber-html-reporter": "^5.3.0",
     "eslint": "^8.57.0",

diff --git a/src/App.js b/src/App.js
@@ -59,7 +59,7 @@ import 'igz-controls/scss/common.scss'
 import './scss/main.scss'
 import { createPortal } from 'react-dom'
 
-import Notification from './common/Notification/Notification'
+import Notifications from './common/Notifications/Notifications'
 
 const Page = lazyRetry(() => import('./layout/Page/Page'))
 const Datasets = lazyRetry(() => import('./components/Datasets/Datasets'))
@@ -298,7 +298,7 @@ const App = () => {
         <Suspense fallback={<LoaderForSuspenseFallback />}>
           <RouterProvider router={router} />
         </Suspense>
-        {createPortal(<Notification />, document.getElementById('overlay_container'))}
+        {createPortal(<Notifications />, document.getElementById('overlay_container'))}
       </div>
     </div>
   )

diff --git a/src/actions/featureStore.js b/src/actions/featureStore.js
@@ -66,7 +66,9 @@ import {
   SET_NEW_FEATURE_SET_TARGET,
   SET_NEW_FEATURE_SET_VERSION,
   START_FEATURE_SET_INGEST_BEGIN,
-  START_FEATURE_SET_INGEST_SUCCESS
+  START_FEATURE_SET_INGEST_SUCCESS,
+  FETCH_FEATURE_SET_BEGIN,
+  FETCH_FEATURE_SET_FAILURE
 } from '../constants'
 import { CONFLICT_ERROR_STATUS_CODE, FORBIDDEN_ERROR_STATUS_CODE } from 'igz-controls/constants'
 import { parseFeatureVectors } from '../utils/parseFeatureVectors'
@@ -204,14 +206,14 @@ const featureStoreActions = {
     type: FETCH_FEATURE_SETS_SUCCESS,
     payload: featureSets
   }),
-  fetchFeatureSet: (project, featureSet, tag) => dispatch => {
+  fetchExpandedFeatureSet: (project, featureSet, tag) => dispatch => {
     return featureStoreApi
-      .getFeatureSet(project, featureSet, tag)
+      .getExpandedFeatureSet(project, featureSet, tag)
       .then(response => {
         const generatedFeatureSets = parseFeatureSets(response.data?.feature_sets)
 
         dispatch(
-          featureStoreActions.fetchFeatureSetSuccess({
+          featureStoreActions.fetchExpandedFeatureSetSuccess({
             [getFeatureSetIdentifier(generatedFeatureSets[0])]: generatedFeatureSets
           })
         )
@@ -222,10 +224,35 @@ const featureStoreActions = {
         throw error
       })
   },
-  fetchFeatureSetSuccess: featureSets => ({
+  fetchExpandedFeatureSetSuccess: featureSets => ({
     type: FETCH_FEATURE_SET_SUCCESS,
     payload: featureSets
   }),
+  fetchFeatureSet: (project, featureSet, tag) => dispatch => {
+    dispatch(featureStoreActions.fetchFeatureSetBegin())
+
+    return featureStoreApi
+      .getFeatureSet(project, featureSet, tag)
+      .then(response => {
+        dispatch(featureStoreActions.fetchFeatureSetSuccess())
+
+        return parseFeatureSets(response.data?.feature_sets)[0]
+      })
+      .catch(error => {
+        dispatch(featureStoreActions.fetchFeatureSetFailure(error.message))
+        throw error
+      })
+  },
+  fetchFeatureSetBegin: () => ({
+    type: FETCH_FEATURE_SET_BEGIN
+  }),
+  fetchFeatureSetFailure: error => ({
+    type: FETCH_FEATURE_SET_FAILURE,
+    payload: error
+  }),
+  fetchFeatureSetSuccess: () => ({
+    type: FETCH_FEATURE_SET_SUCCESS
+  }),
   fetchFeatureVector: (project, featureVector, tag) => dispatch => {
     return featureStoreApi
       .getFeatureVector(project, featureVector, tag)

diff --git a/src/actions/projects.js b/src/actions/projects.js
@@ -580,23 +580,25 @@ const projectsAction = {
         return summaryData
       })
       .catch(err => {
-        if (!firstServerErrorTimestamp) {
-          firstServerErrorTimestamp = new Date()
+        if (mlrunUnhealthyErrors.includes(err.response?.status)) {
+          if (!firstServerErrorTimestamp) {
+            firstServerErrorTimestamp = new Date()
 
-          dispatch(projectsAction.setMlrunUnhealthyRetrying(true))
-        }
+            dispatch(projectsAction.setMlrunUnhealthyRetrying(true))
+          }
 
-        const threeMinutesPassed = (new Date() - firstServerErrorTimestamp) / 1000 > 180
+          const threeMinutesPassed = (new Date() - firstServerErrorTimestamp) / 1000 > 180
 
-        if (mlrunUnhealthyErrors.includes(err.response?.status) && !threeMinutesPassed) {
-          setTimeout(() => {
-            dispatch(projectsAction.fetchProjectsSummary(signal, refresh))
-          }, 3000)
-        }
+          if (!threeMinutesPassed) {
+            setTimeout(() => {
+              dispatch(projectsAction.fetchProjectsSummary(signal, refresh))
+            }, 3000)
+          }
 
-        if (threeMinutesPassed) {
-          dispatch(projectsAction.setMlrunIsUnhealthy(true))
-          dispatch(projectsAction.setMlrunUnhealthyRetrying(true))
+          if (threeMinutesPassed) {
+            dispatch(projectsAction.setMlrunIsUnhealthy(true))
+            dispatch(projectsAction.setMlrunUnhealthyRetrying(true))
+          }
         }
 
         dispatch(projectsAction.fetchProjectsSummaryFailure(err))

diff --git a/src/api/featureStore-api.js b/src/api/featureStore-api.js
@@ -27,7 +27,7 @@ import {
 } from '../constants'
 
 const fetchFeatureStoreContent = (path, filters, config = {}, withLatestTag, apiV2) => {
-  const params = {}
+  const params = { ...config.params }
   const httpClient = apiV2 ? mainHttpClientV2 : mainHttpClient
 
   if (filters?.labels) {
@@ -66,7 +66,8 @@ const featureStoreApi = {
     mainHttpClient.post(`/projects/${data.metadata.project}/feature-vectors`, data),
   deleteFeatureVector: (project, featureVector) =>
     mainHttpClient.delete(`/projects/${project}/feature-vectors/${featureVector}`),
-  fetchFeatureSetsTags: (project, config) => mainHttpClient.get(`/projects/${project}/feature-sets/*/tags`, config),
+  fetchFeatureSetsTags: (project, config) =>
+    mainHttpClient.get(`/projects/${project}/feature-sets/*/tags`, config),
   fetchFeatureVectorsTags: (project, config) =>
     mainHttpClient.get(`/projects/${project}/feature-vectors/*/tags`, config),
   getEntity: (project, entity) =>
@@ -75,9 +76,10 @@ const featureStoreApi = {
     }),
   getEntities: (project, filters, config) =>
     fetchFeatureStoreContent(`/projects/${project}/entities`, filters, config ?? {}, true, true),
-  getFeatureSet: (project, featureSet, tag) => {
+  getExpandedFeatureSet: (project, featureSet, tag) => {
     const params = {
-      name: featureSet
+      name: featureSet,
+      format: 'minimal'
     }
 
     if (tag !== TAG_FILTER_ALL_ITEMS) {
@@ -88,6 +90,13 @@ const featureStoreApi = {
       params
     })
   },
+  getFeatureSet: (project, featureSet, tag) => {
+    const params = { name: featureSet, tag }
+
+    return mainHttpClient.get(`/projects/${project}/feature-sets`, {
+      params
+    })
+  },
   getFeatureSets: (project, filters, config) => {
     return fetchFeatureStoreContent(
       `/projects/${project}/${FEATURE_SETS_TAB}`,
@@ -125,7 +134,13 @@ const featureStoreApi = {
       params: { name: feature }
     }),
   getFeatures: (project, filters, config) =>
-    fetchFeatureStoreContent(`/projects/${project}/${FEATURES_TAB}`, filters, config ?? {}, true, true),
+    fetchFeatureStoreContent(
+      `/projects/${project}/${FEATURES_TAB}`,
+      filters,
+      config ?? {},
+      true,
+      true
+    ),
   startIngest: (project, featureSet, reference, data) =>
     mainHttpClient.post(
       `/projects/${project}/feature-sets/${featureSet}/references/${reference}/ingest`,

diff --git a/src/api/workflow-api.js b/src/api/workflow-api.js
@@ -108,6 +108,9 @@ const workflowsApi = {
     }
 
     return mainHttpClient.get(`/projects/${project}/pipelines`, newConfig)
+  },
+  rerunWorkflow: (project, workflowId) => {
+    return mainHttpClient.post(`projects/${project}/pipelines/${workflowId}/retry`)
   }
 }
 

diff --git a/src/common/Accordion/Accordion.js b/src/common/Accordion/Accordion.js
@@ -17,7 +17,7 @@ illegal under applicable law, and the grant of the foregoing license
 under the Apache 2.0 license is conditioned upon your compliance with
 such restriction.
 */
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect, useCallback, useRef } from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 
@@ -35,7 +35,7 @@ const Accordion = ({
   openByDefault = false
 }) => {
   const [open, setOpen] = useState(openByDefault)
-  const accordionRef = React.createRef()
+  const accordionRef = useRef()
 
   const handleOnBlur = useCallback(
     event => {