From aef93ca1b9733ae047e040a84ba680586e9ae92f Mon Sep 17 00:00:00 2001
From: illia-prokopchuk <78905712+illia-prokopchuk@users.noreply.github.com>
Date: Sat, 18 Nov 2023 08:31:19 +0200
Subject: [PATCH 01/14] Fix [Project settings] Fix members tab display logic
 (#2073)

---
 src/api/projects-iguazio-api.js               |  3 ++-
 .../ProjectSettings/ProjectSettings.js        | 26 ++++++++++++++++---
 .../ProjectSettings/projectSettings.util.js   | 14 ++++++++++
 src/elements/MembersPopUp/membersReducer.js   |  8 ++++++
 .../projectSettingsGeneral.scss               |  2 +-
 .../ProjectSettingsMembers.js                 | 10 +++----
 6 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/src/api/projects-iguazio-api.js b/src/api/projects-iguazio-api.js
index 61b52f645..614475ace 100644
--- a/src/api/projects-iguazio-api.js
+++ b/src/api/projects-iguazio-api.js
@@ -53,7 +53,8 @@ const projectsIguazioApi = {
     return iguazioHttpClient.post('/async_transactions', data)
   },
   getScrubbedUsers: config => iguazioHttpClient.get('/scrubbed_users', config),
-  getScrubbedUserGroups: config => iguazioHttpClient.get('/scrubbed_user_groups', config)
+  getScrubbedUserGroups: config => iguazioHttpClient.get('/scrubbed_user_groups', config),
+  getActiveUser: () => iguazioHttpClient.get('/self')
 }
 
 export default projectsIguazioApi
diff --git a/src/components/ProjectSettings/ProjectSettings.js b/src/components/ProjectSettings/ProjectSettings.js
index 033c523cb..fcedb409a 100644
--- a/src/components/ProjectSettings/ProjectSettings.js
+++ b/src/components/ProjectSettings/ProjectSettings.js
@@ -30,7 +30,14 @@ import ContentMenu from '../../elements/ContentMenu/ContentMenu'
 import { setNotification } from '../../reducers/notificationReducer'
 import projectsIguazioApi from '../../api/projects-iguazio-api'
 import { PROJECTS_SETTINGS_MEMBERS_TAB, PROJECTS_SETTINGS_SECRETS_TAB } from '../../constants'
-import { COMPLETED_STATE, generateMembers, page, tabs, validTabs } from './projectSettings.util'
+import {
+  COMPLETED_STATE,
+  generateMembers,
+  isProjectMembersTabShown,
+  page,
+  tabs,
+  validTabs
+} from './projectSettings.util'
 import { isProjectValid } from '../../utils/handleRedirect'
 import {
   initialMembersState,
@@ -53,6 +60,10 @@ const ProjectSettings = ({ frontendSpec, projectStore }) => {
     () => frontendSpec?.feature_flags?.project_membership === 'enabled',
     [frontendSpec]
   )
+  const projectMembersTabIsShown = useMemo(
+    () => isProjectMembersTabShown(projectMembershipIsEnabled, membersState),
+    [membersState, projectMembershipIsEnabled]
+  )
 
   const fetchProjectIdAndOwner = useCallback(() => {
     return projectsIguazioApi
@@ -108,6 +119,14 @@ const ProjectSettings = ({ frontendSpec, projectStore }) => {
         setProjectMembersIsShown(false)
       })
   }
+  const fetchActiveUser = () => {
+    projectsIguazioApi.getActiveUser().then(response => {
+      membersDispatch({
+        type: membersActions.SET_ACTIVE_USER,
+        payload: response.data.data
+      })
+    })
+  }
   const fetchProjectOwnerVisibility = project => {
     projectsIguazioApi
       .getProjectOwnerVisibility(project)
@@ -124,6 +143,7 @@ const ProjectSettings = ({ frontendSpec, projectStore }) => {
       fetchProjectOwnerVisibility(params.projectName)
       fetchProjectIdAndOwner()
         .then(projectId => {
+          fetchActiveUser()
           fetchProjectMembersVisibility(params.projectName)
 
           return fetchProjectMembers(projectId)
@@ -215,9 +235,9 @@ const ProjectSettings = ({ frontendSpec, projectStore }) => {
           activeTab={params.pageTab}
           location={location}
           screen={page}
-          tabs={tabs(projectMembershipIsEnabled)}
+          tabs={tabs(projectMembersTabIsShown)}
         />
-        {params.pageTab === PROJECTS_SETTINGS_MEMBERS_TAB && projectMembershipIsEnabled ? (
+        {params.pageTab === PROJECTS_SETTINGS_MEMBERS_TAB && projectMembersTabIsShown ? (
           <ProjectSettingsMembers
             changeMembersCallback={changeMembersCallback}
             loading={membersState.loading}
diff --git a/src/components/ProjectSettings/projectSettings.util.js b/src/components/ProjectSettings/projectSettings.util.js
index fba50044c..6ff94d344 100644
--- a/src/components/ProjectSettings/projectSettings.util.js
+++ b/src/components/ProjectSettings/projectSettings.util.js
@@ -122,3 +122,17 @@ export const generateMembers = (membersResponse, membersDispatch) => {
     payload: members
   })
 }
+
+export const isProjectMembersTabShown = (
+  projectMembershipIsEnabled,
+  { activeUser, members, projectInfo }
+) => {
+  if (!projectMembershipIsEnabled) {
+    return false
+  }
+
+  const userIsAdmin = members.some(member => member.role === 'Admin' && member.id === activeUser.id)
+  const userIsOwner = activeUser.id === projectInfo.owner.id
+
+  return userIsOwner || userIsAdmin
+}
diff --git a/src/elements/MembersPopUp/membersReducer.js b/src/elements/MembersPopUp/membersReducer.js
index 34b743711..4b072f589 100644
--- a/src/elements/MembersPopUp/membersReducer.js
+++ b/src/elements/MembersPopUp/membersReducer.js
@@ -20,6 +20,7 @@ such restriction.
 import { groupBy } from 'lodash'
 
 /*
+ * - activeUser               : logged in user data
  * - projectInfo              : additional information about the project such as ID and Owner of the project
  *                              (data is received from iguazio API).
  * - projectAuthorizationRoles: the list of modification roles (Admin, Editor, Viewer). Each of them contains the list
@@ -34,6 +35,7 @@ import { groupBy } from 'lodash'
  * - groupedVisibleMembers    : grouped members list by their role, which is used to generate the request body.
  * */
 export const initialMembersState = {
+  activeUser: {},
   projectInfo: {
     id: '',
     owner: {
@@ -57,6 +59,7 @@ export const membersActions = {
   GET_PROJECT_USERS_DATA_BEGIN: 'GET_PROJECT_USERS_DATA_BEGIN',
   GET_PROJECT_USERS_DATA_END: 'GET_PROJECT_USERS_DATA_END',
   RESET_MEMBERS_STATE: 'RESET_MEMBERS_STATE',
+  SET_ACTIVE_USER: 'SET_ACTIVE_USER',
   SET_MEMBERS: 'SET_MEMBERS',
   SET_MEMBERS_ORIGINAL: 'SET_MEMBERS_ORIGINAL',
   SET_PROJECT_AUTHORIZATION_ROLES: 'SET_PROJECT_AUTHORIZATION_ROLES',
@@ -81,6 +84,11 @@ export const membersReducer = (state, { type, payload }) => {
         ...state,
         loading: false
       }
+    case membersActions.SET_ACTIVE_USER:
+      return {
+        ...state,
+        activeUser: payload
+      }
     case membersActions.SET_MEMBERS:
       return {
         ...state,
diff --git a/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.scss b/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.scss
index 109fb4fc3..5094fcc5e 100644
--- a/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.scss
+++ b/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.scss
@@ -1,8 +1,8 @@
 @import '~igz-controls/scss/colors';
 @import '~igz-controls/scss/mixins';
+@import '../../scss/main.scss';
 
 .settings {
-  @import '../../scss/main.scss';
   &__artifact-path,
   &__goals,
   &__description,
diff --git a/src/elements/ProjectSettingsMembers/ProjectSettingsMembers.js b/src/elements/ProjectSettingsMembers/ProjectSettingsMembers.js
index d8d1b7e02..b9c97f965 100644
--- a/src/elements/ProjectSettingsMembers/ProjectSettingsMembers.js
+++ b/src/elements/ProjectSettingsMembers/ProjectSettingsMembers.js
@@ -35,8 +35,7 @@ const ProjectSettingsMembers = ({
   projectMembersIsShown,
   setNotification
 }) => {
-  const totalMembersInProject =
-    membersState.users.length + membersState.userGroups.length
+  const totalMembersInProject = membersState.users.length + membersState.userGroups.length
   return (
     <div className="settings__card">
       {loading ? (
@@ -48,11 +47,8 @@ const ProjectSettingsMembers = ({
               <span className="settings__members-summary_icon">
                 <Users />
               </span>
-              <span className="settings__members-summary_amount">
-                {totalMembersInProject}
-              </span>
-              member{totalMembersInProject !== 1 ? 's have' : ' has'} access to
-              this project
+              <span className="settings__members-summary_amount">{totalMembersInProject}</span>
+              {totalMembersInProject !== 1 ? 'members have' : 'member has'} access to this project
             </div>
             {projectMembersIsShown && (
               <MembersPopUp

From 464b92eb1c965a698cb78c926f9d5484ddd7210c Mon Sep 17 00:00:00 2001
From: Andrew Mavdryk <andrii.mavdryk@globallogic.com>
Date: Sat, 18 Nov 2023 08:32:59 +0200
Subject: [PATCH 02/14] Fix [Project] Validation on project's description in UI
 (#2076)

---
 src/components/Project/ProjectDescription/ProjectDescription.js | 2 +-
 .../ProjectsPage/CreateProjectDialog/CreateProjectDialog.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Project/ProjectDescription/ProjectDescription.js b/src/components/Project/ProjectDescription/ProjectDescription.js
index 9af885df9..f30594959 100644
--- a/src/components/Project/ProjectDescription/ProjectDescription.js
+++ b/src/components/Project/ProjectDescription/ProjectDescription.js
@@ -40,7 +40,7 @@ const ProjectDescription = ({
       <TextArea
         floatingLabel
         label="Project description"
-        maxLength={500}
+        maxLength={255}
         onBlur={() => handleOnBlur(DESCRIPTION)}
         onChange={value => handleOnChangeProject(DESCRIPTION, value)}
         type="text"
diff --git a/src/components/ProjectsPage/CreateProjectDialog/CreateProjectDialog.js b/src/components/ProjectsPage/CreateProjectDialog/CreateProjectDialog.js
index 1d3123741..0cc303aff 100644
--- a/src/components/ProjectsPage/CreateProjectDialog/CreateProjectDialog.js
+++ b/src/components/ProjectsPage/CreateProjectDialog/CreateProjectDialog.js
@@ -74,7 +74,7 @@ const CreateProjectDialog = ({
                 />
               </div>
               <div className="form-row">
-                <FormTextarea name="description" label="Description" maxLength={500} />
+                <FormTextarea name="description" label="Description" maxLength={255} />
               </div>
               <div className="form-row">
                 <FormChipCell

From 4dabcd26732fd3bcea1385ee784301e019e34f6f Mon Sep 17 00:00:00 2001
From: Ilank <63646693+ilan7empest@users.noreply.github.com>
Date: Sat, 18 Nov 2023 14:33:28 +0800
Subject: [PATCH 03/14] Fix [Quick actions] Add breadcrumbs to Quick actions
 page (#2077)

---
 src/common/Breadcrumbs/breadcrumbs.util.js    |  2 +-
 .../ProjectDetailsHeader.js                   | 70 +++++++++-------
 .../ProjectDetailsHeader.scss                 |  3 +-
 .../ProjectOverview/ProjectOverview.js        | 84 +++++++++----------
 src/components/ProjectsPage/ProjectsView.js   |  4 -
 src/components/ProjectsPage/projects.scss     |  2 +-
 6 files changed, 85 insertions(+), 80 deletions(-)

diff --git a/src/common/Breadcrumbs/breadcrumbs.util.js b/src/common/Breadcrumbs/breadcrumbs.util.js
index 90c8f9fd1..b8f9339c5 100644
--- a/src/common/Breadcrumbs/breadcrumbs.util.js
+++ b/src/common/Breadcrumbs/breadcrumbs.util.js
@@ -41,7 +41,7 @@ export const generateProjectScreens = params => [
     label: 'Quick actions',
     id: PROJECT_QUICK_ACTIONS_PAGE
   },
-  { label: 'Feature Store', id: 'feature-store' },
+  { label: 'Feature store', id: 'feature-store' },
   { label: 'Datasets', id: 'datasets' },
   { label: 'Artifacts', id: 'files' },
   { label: 'Models', id: 'models' },
diff --git a/src/common/ProjectDetailsHeader/ProjectDetailsHeader.js b/src/common/ProjectDetailsHeader/ProjectDetailsHeader.js
index 63bca4622..cf4634eae 100644
--- a/src/common/ProjectDetailsHeader/ProjectDetailsHeader.js
+++ b/src/common/ProjectDetailsHeader/ProjectDetailsHeader.js
@@ -35,38 +35,46 @@ const ProjectDetailsHeader = ({ projectData, projectName }) => {
           <div className="project-details__header">
             <span className="project-details__title">{projectName}</span>
           </div>
-          <p className="project-details__description">{projectData.spec.description ?? ''}</p>
+
+          <p className="project-details__description">
+            {projectData && projectData.spec.description}
+          </p>
         </div>
-        <ul className="project-details__details">
-          <li>
-            <span className="project-details__details-label">Created:</span>
-            <span>
-              {getDateAndTimeByFormat(projectData.metadata.created, 'MM/DD/YYYY, HH:mm:ss A')}
-            </span>
-          </li>
-          <li>
-            <span className="project-details__details-label">Owner:</span>
-            <span>{projectData.spec.owner}</span>
-          </li>
-          <li>
-            <span className="project-details__details-label">Status:</span>
-            <div>
-              <i className={`state-${projectData.status.state}`} />
-              <span>{projectData.status.state}</span>
-            </div>
-          </li>
-          <li>
-            {location.pathname.includes(PROJECT_MONITOR) ? (
-              <Link to={`/projects/${projectName}/${PROJECT_QUICK_ACTIONS_PAGE}`} className="link">
-                Project quick actions
-              </Link>
-            ) : (
-              <Link to={`/projects/${projectName}/${PROJECT_MONITOR}`} className="link">
-                Project monitoring
-              </Link>
-            )}
-          </li>
-        </ul>
+        {projectData && (
+          <ul className="project-details__details">
+            <li>
+              <span className="project-details__details-label">Created:</span>
+              <span>
+                {getDateAndTimeByFormat(projectData.metadata.created, 'MM/DD/YYYY, HH:mm:ss A')}
+              </span>
+            </li>
+            <li>
+              <span className="project-details__details-label">Owner:</span>
+              <span>{projectData.spec.owner}</span>
+            </li>
+            <li>
+              <span className="project-details__details-label">Status:</span>
+              <div>
+                <i className={`state-${projectData.status.state}`} />
+                <span>{projectData.status.state}</span>
+              </div>
+            </li>
+            <li>
+              {location.pathname.includes(PROJECT_MONITOR) ? (
+                <Link
+                  to={`/projects/${projectName}/${PROJECT_QUICK_ACTIONS_PAGE}`}
+                  className="link"
+                >
+                  Project quick actions
+                </Link>
+              ) : (
+                <Link to={`/projects/${projectName}/${PROJECT_MONITOR}`} className="link">
+                  Project monitoring
+                </Link>
+              )}
+            </li>
+          </ul>
+        )}
       </div>
     </div>
   )
diff --git a/src/common/ProjectDetailsHeader/ProjectDetailsHeader.scss b/src/common/ProjectDetailsHeader/ProjectDetailsHeader.scss
index 3390a7713..755d3715b 100644
--- a/src/common/ProjectDetailsHeader/ProjectDetailsHeader.scss
+++ b/src/common/ProjectDetailsHeader/ProjectDetailsHeader.scss
@@ -28,8 +28,9 @@
   }
 
   &__description {
-    max-width: 75%;
+    max-width: 90%;
     margin: 0;
+    word-break: break-word;
   }
 
   &__details {
diff --git a/src/components/Project/ProjectOverview/ProjectOverview.js b/src/components/Project/ProjectOverview/ProjectOverview.js
index 9782b85ee..29a0e91de 100644
--- a/src/components/Project/ProjectOverview/ProjectOverview.js
+++ b/src/components/Project/ProjectOverview/ProjectOverview.js
@@ -22,6 +22,7 @@ import { connect } from 'react-redux'
 import { isEmpty } from 'lodash'
 import { useNavigate, useParams } from 'react-router-dom'
 
+import Breadcrumbs from '../../../common/Breadcrumbs/Breadcrumbs'
 import Loader from '../../../common/Loader/Loader'
 import NoData from '../../../common/NoData/NoData'
 import ProjectAction from '../ProjectAction/ProjectAction'
@@ -56,10 +57,6 @@ const ProjectOverview = ({ fetchProject, project }) => {
     )
   }, [fetchProject, navigate, params.projectName])
 
-  if (project.loading) {
-    return <Loader />
-  }
-
   if (project.error) {
     return (
       <div className="project__error-container">
@@ -82,54 +79,57 @@ const ProjectOverview = ({ fetchProject, project }) => {
     )
   }
 
-  if (isEmpty(project.data)) {
-    return <NoData />
-  }
-
   return (
     <div className="project-overview">
+      <div className="content__header">
+        <Breadcrumbs />
+      </div>
       <div className="project-overview__header">
         <ProjectDetailsHeader projectData={project.data} projectName={params.projectName} />
       </div>
-
-      <div className="project-overview__content">
-        {/* move to card */}
-        {Object.keys(cards).map(card => {
-          const { additionalLinks, actions, subTitle, title } = cards[card]
-          return (
-            <div className="project-overview-card" key={card}>
-              <div className="project-overview-card__top">
-                <div className="project-overview-card__header">
-                  <h3 className="project-overview-card__header-title">{title}</h3>
-                  <p className="project-overview-card__header-subtitle">{subTitle ?? ''}</p>
+      {project.loading && <Loader />}
+      {isEmpty(project.data) && !project.loading ? (
+        <NoData />
+      ) : (
+        <div className="project-overview__content">
+          {/* move to card */}
+          {Object.keys(cards).map(card => {
+            const { additionalLinks, actions, subTitle, title } = cards[card]
+            return (
+              <div className="project-overview-card" key={card}>
+                <div className="project-overview-card__top">
+                  <div className="project-overview-card__header">
+                    <h3 className="project-overview-card__header-title">{title}</h3>
+                    <p className="project-overview-card__header-subtitle">{subTitle ?? ''}</p>
+                  </div>
+                  <div className="project-overview-card__actions">
+                    <ProjectAction actions={actions} onClick={handlePathExecution} />
+                  </div>
                 </div>
-                <div className="project-overview-card__actions">
-                  <ProjectAction actions={actions} onClick={handlePathExecution} />
+                <div className="project-overview-card__center">
+                  <ProjectOverviewTableRow />
                 </div>
-              </div>
-              <div className="project-overview-card__center">
-                <ProjectOverviewTableRow />
-              </div>
 
-              <div className="project-overview-card__bottom">
-                <p className="label">Resources</p>
-                <div className="additional-links">
-                  {additionalLinks &&
-                    additionalLinks.map(({ id, label, handleClick }) => (
-                      <span
-                        key={id}
-                        className="link"
-                        onClick={() => handlePathExecution(handleClick)}
-                      >
-                        {label}
-                      </span>
-                    ))}
+                <div className="project-overview-card__bottom">
+                  <p className="label">Resources</p>
+                  <div className="additional-links">
+                    {additionalLinks &&
+                      additionalLinks.map(({ id, label, handleClick }) => (
+                        <span
+                          key={id}
+                          className="link"
+                          onClick={() => handlePathExecution(handleClick)}
+                        >
+                          {label}
+                        </span>
+                      ))}
+                  </div>
                 </div>
               </div>
-            </div>
-          )
-        })}
-      </div>
+            )
+          })}
+        </div>
+      )}
     </div>
   )
 }
diff --git a/src/components/ProjectsPage/ProjectsView.js b/src/components/ProjectsPage/ProjectsView.js
index 9732e20ca..2cde2c3ab 100644
--- a/src/components/ProjectsPage/ProjectsView.js
+++ b/src/components/ProjectsPage/ProjectsView.js
@@ -21,7 +21,6 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 
-import Breadcrumbs from '../../common/Breadcrumbs/Breadcrumbs'
 import ContentMenu from '../../elements/ContentMenu/ContentMenu'
 import CreateProjectDialog from './CreateProjectDialog/CreateProjectDialog'
 import Loader from '../../common/Loader/Loader'
@@ -99,9 +98,6 @@ const ProjectsView = ({
           message={confirmData.message}
         />
       )}
-      <div className="projects__header">
-        <Breadcrumbs />
-      </div>
       <div className="projects__wrapper">
         <div className="projects-content-header">
           <div className="projects-content-header__col">
diff --git a/src/components/ProjectsPage/projects.scss b/src/components/ProjectsPage/projects.scss
index e5d815a70..4b31679b0 100644
--- a/src/components/ProjectsPage/projects.scss
+++ b/src/components/ProjectsPage/projects.scss
@@ -25,7 +25,7 @@
     display: flex;
     flex-flow: column nowrap;
     height: 100%;
-    padding: 0 12px 15px;
+    padding: 50px 12px 0;
 
     .projects-content-header {
       display: flex;

From 4a636059a58e1be3d06607b11e7cf30c3f75fb39 Mon Sep 17 00:00:00 2001
From: Andrew Mavdryk <andrii.mavdryk@globallogic.com>
Date: Sat, 18 Nov 2023 08:35:24 +0200
Subject: [PATCH 04/14] Fix [New function] No default for handler (#2078)

---
 src/components/JobWizard/JobWizard.util.js            |  5 +++--
 src/constants.js                                      |  1 +
 src/elements/FunctionsPanelCode/FunctionsPanelCode.js | 10 ++--------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/JobWizard/JobWizard.util.js b/src/components/JobWizard/JobWizard.util.js
index d9f671e7f..11d742a3a 100644
--- a/src/components/JobWizard/JobWizard.util.js
+++ b/src/components/JobWizard/JobWizard.util.js
@@ -38,6 +38,7 @@ import {
   ENV_VARIABLE_TYPE_SECRET,
   ENV_VARIABLE_TYPE_VALUE,
   EXISTING_IMAGE_SOURCE,
+  FUNCTION_DEFAULT_HANDLER,
   HYPERPARAMETER_STRATEGY_STEP,
   JOB_DEFAULT_OUTPUT_PATH,
   LIST_TUNING_STRATEGY,
@@ -385,9 +386,9 @@ const getDefaultMethod = (methodOptions, selectedFunctions) => {
   if (methodOptions.length) {
     method = methodOptions[0]?.id
   } else if (latestFunction) {
-    method = latestFunction.spec.default_handler || 'handler'
+    method = latestFunction.spec.default_handler || FUNCTION_DEFAULT_HANDLER
   } else {
-    method = selectedFunctions[0]?.spec.default_handler || 'handler'
+    method = selectedFunctions[0]?.spec.default_handler || FUNCTION_DEFAULT_HANDLER
   }
 
   return method
diff --git a/src/constants.js b/src/constants.js
index 387f949c4..28cd9bf87 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -283,6 +283,7 @@ export const FUNCTION_INITIALIZED_STATE = 'initialized'
 export const FUNCTION_READY_STATE = 'ready'
 export const FUNCTION_PENDINDG_STATE = 'pending'
 export const FUNCTION_RUNNING_STATE = 'running'
+export const FUNCTION_DEFAULT_HANDLER = 'handler'
 
 /*=========== ARTIFACTS =============*/
 
diff --git a/src/elements/FunctionsPanelCode/FunctionsPanelCode.js b/src/elements/FunctionsPanelCode/FunctionsPanelCode.js
index efce681b6..9097a0329 100644
--- a/src/elements/FunctionsPanelCode/FunctionsPanelCode.js
+++ b/src/elements/FunctionsPanelCode/FunctionsPanelCode.js
@@ -32,7 +32,7 @@ import {
   NEW_IMAGE,
   sourceCodeInBase64
 } from './functionsPanelCode.util'
-import { PANEL_CREATE_MODE, TAG_LATEST } from '../../constants'
+import { FUNCTION_DEFAULT_HANDLER, PANEL_CREATE_MODE, TAG_LATEST } from '../../constants'
 import { splitTrim, trimSplit } from '../../utils'
 import { useParams } from 'react-router-dom'
 
@@ -59,7 +59,7 @@ const FunctionsPanelCode = ({
   const [data, setData] = useState({
     default_class: defaultData.default_class ?? '',
     entry: DEFAULT_ENTRY,
-    handler: defaultData.default_handler ?? '',
+    handler: defaultData.default_handler ?? FUNCTION_DEFAULT_HANDLER,
     image: defaultData.image ?? '',
     base_image: defaultData.build?.base_image ?? '',
     requirements: (defaultData.build?.requirements || []).join(', ') ?? '',
@@ -83,12 +83,6 @@ const FunctionsPanelCode = ({
     setNewFunctionSourceCode
   ])
 
-  useEffect(() => {
-    if (!functionsStore.newFunction.spec.default_handler) {
-      setNewFunctionHandler('handler')
-    }
-  }, [functionsStore.newFunction.spec.default_handler, setNewFunctionHandler])
-
   useEffect(() => {
     if (mode === PANEL_CREATE_MODE && imageType.length === 0) {
       if (appStore.frontendSpec.default_function_image_by_kind?.[functionsStore.newFunction.kind]) {

From b65d2e0a50ce9ffe34f557872620b5c7f0ad1197 Mon Sep 17 00:00:00 2001
From: Ilank <63646693+ilan7empest@users.noreply.github.com>
Date: Sat, 18 Nov 2023 14:36:24 +0800
Subject: [PATCH 05/14] Fix [UI] feature set usage example - missing import
 command & project value (#2079)

---
 src/utils/generateUsageSnippets.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/utils/generateUsageSnippets.js b/src/utils/generateUsageSnippets.js
index 81a17cbbc..8b32f12c2 100644
--- a/src/utils/generateUsageSnippets.js
+++ b/src/utils/generateUsageSnippets.js
@@ -25,8 +25,9 @@ export const generateUsageSnippets = (pageTab, selectedItem) => {
     return [
       {
         title: 'Get offline features for training:',
-        code: `features = [
-    "${selectedItem.name}.*",
+        code: `import mlrun.feature_store as fs
+features = [
+    "${selectedItem.project}/${selectedItem.name}.*",
 ]
 
 vector = fs.FeatureVector("<vector-name>",features=features,description="this is my vector")
@@ -48,7 +49,8 @@ resp = svc.get([{"${selectedItem.entities[0]?.name ?? ''}": <value>}])`
     return [
       {
         title: 'Getting offline & online features:',
-        code: `resp = fs.get_offline_features("${uri}")
+        code: `import mlrun.feature_store as fs
+resp = fs.get_offline_features("${uri}")
 #Preview the dataset
 resp.to_dataframe().tail(5)
 

From 875695abdb0fe778e4cd35789fb5893703771ec7 Mon Sep 17 00:00:00 2001
From: Andrew Mavdryk <andrii.mavdryk@globallogic.com>
Date: Sat, 18 Nov 2023 08:37:00 +0200
Subject: [PATCH 06/14] Fix [Functions] Default handler is not displayed for
 functions (#2080)

---
 src/components/Details/details.util.js         | 3 +++
 src/components/FunctionsPage/functions.util.js | 1 +
 src/utils/createFunctionsContent.js            | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/src/components/Details/details.util.js b/src/components/Details/details.util.js
index 4eef8fbfb..54b4b53b5 100644
--- a/src/components/Details/details.util.js
+++ b/src/components/Details/details.util.js
@@ -255,6 +255,9 @@ export const generateFunctionsContent = selectedItem => ({
   command: {
     value: selectedItem.command
   },
+  defaultHandler: {
+    value: selectedItem.default_handler
+  },
   image: {
     value: getFunctionImage(selectedItem)
   },
diff --git a/src/components/FunctionsPage/functions.util.js b/src/components/FunctionsPage/functions.util.js
index ab3d5e226..faaaf1213 100644
--- a/src/components/FunctionsPage/functions.util.js
+++ b/src/components/FunctionsPage/functions.util.js
@@ -65,6 +65,7 @@ export const infoHeaders = [
   { label: 'Code origin', id: 'codeOrigin' },
   { label: 'Updated', id: 'updated' },
   { label: 'Command', id: 'command' },
+  { label: 'Default handler', id: 'defaultHandler' },
   { label: 'Image', id: 'image' },
   { label: 'Description', id: 'description' }
 ]
diff --git a/src/utils/createFunctionsContent.js b/src/utils/createFunctionsContent.js
index 8f2918ff3..8ce70d22b 100644
--- a/src/utils/createFunctionsContent.js
+++ b/src/utils/createFunctionsContent.js
@@ -147,6 +147,13 @@ const createFunctionsContent = (functions, pageTab, projectName, showExpandButto
               value: func.command,
               className: 'table-cell-1'
             },
+            {
+              id: `defaultHandler.${func.ui.identifierUnique}`,
+              headerId: 'defaultHandler',
+              headerLabel: 'Default handler',
+              value: func.default_handler,
+              className: 'table-cell-2'
+            },
             {
               id: `image.${func.ui.identifierUnique}`,
               headerId: 'image',

From c006a9817b644a8a6655b781eda48c536238fabd Mon Sep 17 00:00:00 2001
From: Ilank <63646693+ilan7empest@users.noreply.github.com>
Date: Sat, 18 Nov 2023 14:38:49 +0800
Subject: [PATCH 07/14] Fix [Feature Store] Capitalize the first letter of the
 sentence in the Schema description. (#2081)

---
 .../FeatureSetsPanelSchemaView.js                | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/components/FeatureSetsPanel/FeatureSetsPanelSchema/FeatureSetsPanelSchemaView.js b/src/components/FeatureSetsPanel/FeatureSetsPanelSchema/FeatureSetsPanelSchemaView.js
index ff0b2db9d..262de9887 100644
--- a/src/components/FeatureSetsPanel/FeatureSetsPanelSchema/FeatureSetsPanelSchemaView.js
+++ b/src/components/FeatureSetsPanel/FeatureSetsPanelSchema/FeatureSetsPanelSchemaView.js
@@ -40,8 +40,11 @@ const FeatureSetsPanelSchemaView = ({
       <FeatureSetsPanelSection title="Schema">
         <div className="schema__description">
           <span>
-            Each feature set must be associated with one or more index column.
-            when joining feature sets the entity is used as the key column.
+            Each feature set must be associated with one or more index column. When joining feature
+            sets, the entity is used as the key column.
+          </span>
+          <span>
+            &nbsp;
             <a
               className="link"
               href="https://docs.mlrun.org/en/latest/feature-store/feature-sets.html"
@@ -75,14 +78,9 @@ const FeatureSetsPanelSchemaView = ({
             floatingLabel
             invalid={!validation.isTimestampKeyValid}
             label="Timestamp key"
-            onChange={timestamp_key =>
-              setData(state => ({ ...state, timestamp_key }))
-            }
+            onChange={timestamp_key => setData(state => ({ ...state, timestamp_key }))}
             onBlur={event => {
-              if (
-                featureStore.newFeatureSet.spec.timestamp_key !==
-                event.target.value
-              ) {
+              if (featureStore.newFeatureSet.spec.timestamp_key !== event.target.value) {
                 setNewFeatureSetSchemaTimestampKey(event.target.value)
               }
             }}

From d2b6946701f3cd4546b10121b395fb3a7cd37891 Mon Sep 17 00:00:00 2001
From: illia-prokopchuk <78905712+illia-prokopchuk@users.noreply.github.com>
Date: Sat, 18 Nov 2023 08:40:17 +0200
Subject: [PATCH 08/14] Fix [Functions panel] Show "Volumes" dropdown on
 function edit (#2083)

---
 .../FunctionsPanelResources/FunctionsPanelResources.js         | 1 +
 .../FunctionsPanelResources/FunctionsPanelResourcesView.js     | 3 ++-
 src/utils/parseFunction.js                                     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/elements/FunctionsPanelResources/FunctionsPanelResources.js b/src/elements/FunctionsPanelResources/FunctionsPanelResources.js
index a1650cea7..988a79e6e 100644
--- a/src/elements/FunctionsPanelResources/FunctionsPanelResources.js
+++ b/src/elements/FunctionsPanelResources/FunctionsPanelResources.js
@@ -89,6 +89,7 @@ const FunctionsPanelResources = ({
   ])
 
   const [data, setData] = useState({
+    disable_auto_mount: defaultData.disable_auto_mount ?? true,
     volumeMounts: getDefaultVolumeMounts(
       defaultData.volume_mounts ?? [],
       defaultData.volumes ?? [],
diff --git a/src/elements/FunctionsPanelResources/FunctionsPanelResourcesView.js b/src/elements/FunctionsPanelResources/FunctionsPanelResourcesView.js
index 764f4144c..15d1fd24a 100644
--- a/src/elements/FunctionsPanelResources/FunctionsPanelResourcesView.js
+++ b/src/elements/FunctionsPanelResources/FunctionsPanelResourcesView.js
@@ -82,10 +82,11 @@ const FunctionsPanelResourcesView = ({
         title="Volumes"
         tip="Volumes that define data paths and the required information for accessing the data from the function"
       >
-        {mode === PANEL_CREATE_MODE && (
+        {(mode === PANEL_CREATE_MODE || !data.disable_auto_mount) && (
           <Select
             className="volume-mount"
             floatingLabel
+            disabled={mode !== PANEL_CREATE_MODE}
             label="Volume mount"
             options={volumeMountOptions}
             onClick={handleSelectVolumeMount}
diff --git a/src/utils/parseFunction.js b/src/utils/parseFunction.js
index bb6774504..268a93086 100644
--- a/src/utils/parseFunction.js
+++ b/src/utils/parseFunction.js
@@ -32,6 +32,7 @@ export const parseFunction = (func, projectName, customState) => {
     default_class: func.spec?.default_class ?? '',
     default_handler: func.spec?.default_handler ?? '',
     description: func.spec?.description ?? '',
+    disable_auto_mount: func.spec?.disable_auto_mount ?? true,
     env: func.spec?.env ?? [],
     error_stream: func.spec?.error_stream ?? '',
     graph: func.spec?.graph ?? {},

From aba99f1b5a9c6b0ea0822980836d84ee39c3a985 Mon Sep 17 00:00:00 2001
From: illia-prokopchuk <78905712+illia-prokopchuk@users.noreply.github.com>
Date: Sat, 18 Nov 2023 08:41:20 +0200
Subject: [PATCH 09/14] Fix [Project settings] does not present Default image
 of a project (#2085)

---
 src/constants.js                                    |  1 +
 .../ProjectSettingsGeneralView.js                   | 13 ++++++++++++-
 .../projectSettingsGeneral.scss                     |  3 ++-
 .../projectSettingsGeneral.utils.js                 |  4 ++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/constants.js b/src/constants.js
index 28cd9bf87..fdc59bf3d 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -570,6 +570,7 @@ export const SMOOTH_STEP_EDGE = 'smooth-step-edge'
 
 export const ARTIFACT_PATH = 'artifact_path'
 export const SOURCE_URL = 'source'
+export const DEFAULT_IMAGE = 'default_image'
 export const DESCRIPTION = 'description'
 export const GOALS = 'goals'
 export const DATA = 'data'
diff --git a/src/elements/ProjectSettingsGeneral/ProjectSettingsGeneralView.js b/src/elements/ProjectSettingsGeneral/ProjectSettingsGeneralView.js
index a5b6a2935..af47d60b0 100644
--- a/src/elements/ProjectSettingsGeneral/ProjectSettingsGeneralView.js
+++ b/src/elements/ProjectSettingsGeneral/ProjectSettingsGeneralView.js
@@ -29,7 +29,7 @@ import ProjectDescription from '../../components/Project/ProjectDescription/Proj
 import ProjectLabels from '../../components/Project/ProjectLabels/ProjectLabels'
 import ProjectSettingsSource from '../ProjectSettingsSource/ProjectSettingsSource'
 
-import { ARTIFACT_PATH } from '../../constants'
+import { ARTIFACT_PATH, DEFAULT_IMAGE } from '../../constants'
 
 const ProjectSettingsGeneralView = ({
   changeOwnerCallback,
@@ -107,6 +107,17 @@ const ProjectSettingsGeneralView = ({
                 </a>
               </span>
             </div>
+            <div className="settings__default-image">
+              <Input
+                floatingLabel
+                label="Default image"
+                onBlur={() => handleOnBlur(DEFAULT_IMAGE)}
+                onChange={value => handleOnChange(DEFAULT_IMAGE, value)}
+                onFocus={() => handleEditProject(DEFAULT_IMAGE)}
+                onKeyDown={handleOnKeyDown}
+                value={project.data?.spec.default_image ?? ''}
+              />
+            </div>
             <ProjectDescription
               editDescriptionData={editProjectData.description}
               handleEditProject={handleEditProject}
diff --git a/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.scss b/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.scss
index 5094fcc5e..366425798 100644
--- a/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.scss
+++ b/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.scss
@@ -8,7 +8,8 @@
   &__description,
   &__labels,
   &__owner,
-  &__source {
+  &__source,
+  &__default-image {
     margin-bottom: 15px;
   }
 
diff --git a/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.utils.js b/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.utils.js
index 1a877e4ab..998f67c55 100644
--- a/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.utils.js
+++ b/src/elements/ProjectSettingsGeneral/projectSettingsGeneral.utils.js
@@ -22,6 +22,10 @@ export const initialEditProjectData = {
     value: null,
     isEdit: false
   },
+  default_image: {
+    value: null,
+    isEdit: false
+  },
   description: {
     value: null,
     isEdit: false

From e058eb8b36195a36099a39b65dbb78df783c7923 Mon Sep 17 00:00:00 2001
From: Andrew Mavdryk <andrii.mavdryk@globallogic.com>
Date: Sat, 18 Nov 2023 08:42:44 +0200
Subject: [PATCH 10/14] Fix [Batch run] Disable version selection on function
 run (#2086)

---
 src/components/FunctionsPage/Functions.js     | 12 ++++-----
 src/components/JobWizard/JobWizard.js         | 14 ++++++-----
 src/components/JobWizard/JobWizard.util.js    | 25 ++++++++++---------
 .../JobWizardRunDetails.js                    | 13 +++++++---
 src/constants.js                              |  1 +
 src/utils/generateGroupLatestItem.js          |  2 +-
 6 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/components/FunctionsPage/Functions.js b/src/components/FunctionsPage/Functions.js
index 79cb37afb..f1a38a72c 100644
--- a/src/components/FunctionsPage/Functions.js
+++ b/src/components/FunctionsPage/Functions.js
@@ -66,7 +66,6 @@ const Functions = ({
   deleteFunction,
   fetchFunctionLogs,
   fetchFunctions,
-  fetchJobFunction,
   functionsStore,
   removeFunctionsError,
   removeNewFunction
@@ -253,15 +252,15 @@ const Functions = ({
             label: 'Run',
             icon: <Run />,
             onClick: func => {
-              if (func?.project && func?.name && func?.hash) {
-                fetchJobFunction(func.project, func.name, func.hash)
+              if (func?.project && func?.name && func?.hash && func?.ui?.originalContent) {
+                dispatch(jobsActions.fetchJobFunctionSuccess(func.ui.originalContent))
                 setJobWizardMode(PANEL_FUNCTION_CREATE_MODE)
               } else {
                 dispatch(
                   setNotification({
                     status: 400,
                     id: Math.random(),
-                    message: 'Failed to fetch the function'
+                    message: 'Failed to retrieve function data'
                   })
                 )
               }
@@ -294,7 +293,7 @@ const Functions = ({
           }
         ]
       ],
-    [dispatch, fetchJobFunction, isStagingMode, onRemoveFunction, toggleConvertedYaml]
+    [dispatch, isStagingMode, onRemoveFunction, toggleConvertedYaml]
   )
 
   useEffect(() => {
@@ -507,6 +506,5 @@ const Functions = ({
 }
 
 export default connect(({ functionsStore }) => ({ functionsStore }), {
-  ...functionsActions,
-  ...jobsActions
+  ...functionsActions
 })(React.memo(Functions))
diff --git a/src/components/JobWizard/JobWizard.js b/src/components/JobWizard/JobWizard.js
index a72ff50f9..7be267279 100644
--- a/src/components/JobWizard/JobWizard.js
+++ b/src/components/JobWizard/JobWizard.js
@@ -105,6 +105,7 @@ const JobWizard = ({
     })
   )
   const isEditMode = useMemo(() => mode === PANEL_EDIT_MODE || mode === PANEL_RERUN_MODE, [mode])
+  const isRunMode = useMemo(() => mode === PANEL_FUNCTION_CREATE_MODE, [mode])
   const [selectedFunctionData, setSelectedFunctionData] = useState({})
   const [filteredFunctions, setFilteredFunctions] = useState([])
   const [filteredTemplates, setFilteredTemplates] = useState([])
@@ -159,16 +160,16 @@ const JobWizard = ({
 
   useEffect(() => {
     if (!isEmpty(jobsStore.jobFunc)) {
-      if ([PANEL_EDIT_MODE, PANEL_RERUN_MODE].includes(mode)) {
+      if (isEditMode) {
         setSelectedFunctionData(jobsStore.jobFunc)
-      } else if (mode === PANEL_FUNCTION_CREATE_MODE) {
+      } else if (isRunMode) {
         setSelectedFunctionData({
           name: jobsStore.jobFunc.metadata.name,
           functions: [jobsStore.jobFunc]
         })
       }
     }
-  }, [editJob, jobsStore, mode])
+  }, [isEditMode, isRunMode, jobsStore.jobFunc])
 
   const setJobData = useCallback(
     (formState, jobFormData, jobAdditionalData) => {
@@ -201,7 +202,7 @@ const JobWizard = ({
       setJobData(formStateRef.current, jobFormData, jobAdditionalData)
     } else if (
       formStateRef.current &&
-      isBatchInference &&
+      (isBatchInference || isRunMode) &&
       !isEmpty(selectedFunctionData) &&
       isEmpty(jobAdditionalData)
     ) {
@@ -219,6 +220,7 @@ const JobWizard = ({
     frontendSpec,
     isBatchInference,
     isEditMode,
+    isRunMode,
     jobAdditionalData,
     params.projectName,
     selectedFunctionData,
@@ -234,7 +236,7 @@ const JobWizard = ({
         {
           id: FUNCTION_SELECTION_STEP,
           label: 'Function Selection',
-          hidden: isEditMode || isBatchInference || mode === PANEL_FUNCTION_CREATE_MODE,
+          hidden: isEditMode || isRunMode || isBatchInference,
           nextIsDisabled: isEmpty(selectedFunctionData)
         },
         {
@@ -437,7 +439,7 @@ const JobWizard = ({
               stepsConfig={getStepsConfig(formState)}
               getActions={getActionsParams => getActions(getActionsParams, formState)}
               title={wizardTitle}
-              subTitle={formState.values?.[RUN_DETAILS_STEP]?.name}
+              subTitle={formState.values?.[RUN_DETAILS_STEP]?.runName}
             >
               <JobWizardFunctionSelection
                 activeTab={activeTab}
diff --git a/src/components/JobWizard/JobWizard.util.js b/src/components/JobWizard/JobWizard.util.js
index 11d742a3a..7926f9fbe 100644
--- a/src/components/JobWizard/JobWizard.util.js
+++ b/src/components/JobWizard/JobWizard.util.js
@@ -53,6 +53,7 @@ import {
   RUN_DETAILS_STEP,
   SECRET_VOLUME_TYPE,
   TAG_LATEST,
+  TAG_NA,
   V3IO_VOLUME_TYPE
 } from '../../constants'
 import {
@@ -132,7 +133,7 @@ export const generateJobWizardData = (
 
   const jobFormData = {
     [RUN_DETAILS_STEP]: {
-      name: functionInfo.name,
+      runName: functionInfo.name,
       version: functionInfo.version,
       method: functionInfo.method,
       methodData: functionInfo.methodData,
@@ -183,10 +184,10 @@ export const generateJobWizardData = (
     jobFormData[RESOURCES_STEP].jobPriorityClassName = jobPriorityClassName
   }
 
-  if (!isEmpty(functionParameters) || !isEmpty(prePopulatedData.dataInputs)) {
+  if (!isEmpty(functionParameters) || !isEmpty(prePopulatedData?.dataInputs)) {
     jobFormData[DATA_INPUTS_STEP].dataInputsTable = parseDataInputs(
       functionParameters,
-      prePopulatedData.dataInputs
+      prePopulatedData?.dataInputs
     )
   }
 
@@ -235,7 +236,7 @@ export const generateJobWizardDefaultData = (
 
   const jobFormData = {
     [RUN_DETAILS_STEP]: {
-      name: runInfo.name,
+      runName: runInfo.name,
       version: runInfo.version,
       method: runInfo.method,
       methodData: runInfo.methodData,
@@ -368,14 +369,14 @@ const getVersionOptions = selectedFunctions => {
   const versionOptions = unionBy(
     selectedFunctions.map(func => {
       return {
-        label: func.metadata.tag || TAG_LATEST,
-        id: func.metadata.tag || TAG_LATEST
+        label: func.metadata.tag || 'N/A',
+        id: func.metadata.tag || TAG_NA
       }
     }),
     'id'
   )
 
-  return versionOptions.length ? versionOptions : [{ label: 'latest', id: TAG_LATEST }]
+  return versionOptions.length ? versionOptions : [{ label: 'N/A', id: TAG_NA }]
 }
 
 const getDefaultMethod = (methodOptions, selectedFunctions) => {
@@ -920,14 +921,14 @@ const generateParameters = parametersTableData => {
 
   parametersTableData?.predefined
     ?.filter(parameter => !parameter.data.isHyper && parameter.data.isChecked)
-    .forEach(value => {
-      parameters[value.data.name] = convertParameterValue(value.data.value, value.data.type)
+    .forEach(parameter => {
+      parameters[parameter.data.name] = convertParameterValue(parameter.data.value, parameter.data.type)
     })
 
   parametersTableData?.custom
     ?.filter(parameter => !parameter.data.isHyper && parameter.data.isChecked)
-    .forEach(value => {
-      parameters[value.data.name] = convertParameterValue(value.data.value, value.data.type)
+    .forEach(parameter => {
+      parameters[parameter.data.name] = convertParameterValue(parameter.data.value, parameter.data.type)
     })
 
   return parameters
@@ -1070,7 +1071,7 @@ export const generateJobRequestData = (
     task: {
       metadata: {
         project: params.projectName,
-        name: formData[RUN_DETAILS_STEP].name,
+        name: formData[RUN_DETAILS_STEP].runName,
         labels: convertChipsData(formData[RUN_DETAILS_STEP].labels)
       },
       spec: {
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardRunDetails/JobWizardRunDetails.js b/src/components/JobWizard/JobWizardSteps/JobWizardRunDetails/JobWizardRunDetails.js
index 747278ef7..71bce426b 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardRunDetails/JobWizardRunDetails.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardRunDetails/JobWizardRunDetails.js
@@ -38,7 +38,8 @@ import {
   DATA_INPUTS_STEP,
   EXISTING_IMAGE_SOURCE,
   PARAMETERS_STEP,
-  RUN_DETAILS_STEP
+  RUN_DETAILS_STEP,
+  TAG_NA
 } from '../../../../constants'
 import { SECONDARY_BUTTON, TERTIARY_BUTTON } from 'igz-controls/constants'
 import { areFormValuesChanged } from 'igz-controls/utils/form.util'
@@ -83,7 +84,7 @@ const JobWizardRunDetails = ({
     setSpyOnMethodChange(true)
 
     const functionParameters = getFunctionParameters(selectedFunctionData.functions, method)
-    const dataInputs = parseDataInputs(functionParameters, prePopulatedData.dataInputs)
+    const dataInputs = parseDataInputs(functionParameters, prePopulatedData?.dataInputs)
     const predefinedParameters = parsePredefinedParameters(functionParameters)
     const methodData = getMethodData(selectedFunctionData, method)
 
@@ -158,8 +159,8 @@ const JobWizardRunDetails = ({
         <div className="form-row">
           <div className="form-col-2">
             <FormInput
-              label="Name"
-              name={`${RUN_DETAILS_STEP}.name`}
+              label="Run name"
+              name={`${RUN_DETAILS_STEP}.runName`}
               disabled={isEditMode}
               required
               validationRules={getValidationRules('common.name')}
@@ -170,6 +171,10 @@ const JobWizardRunDetails = ({
               <FormSelect
                 name={`${RUN_DETAILS_STEP}.version`}
                 label="Version"
+                disabled={
+                  jobAdditionalData?.versionOptions?.length === 1 &&
+                  jobAdditionalData.versionOptions[0].id === TAG_NA
+                }
                 options={jobAdditionalData.versionOptions || []}
               />
             </div>
diff --git a/src/constants.js b/src/constants.js
index fdc59bf3d..8087fea1a 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -40,6 +40,7 @@ export const S3_INPUT_PATH_SCHEME = 's3://'
 export const V3IO_INPUT_PATH_SCHEME = 'v3io:///'
 
 export const TAG_LATEST = 'latest'
+export const TAG_NA = 'na'
 
 export const DENSITY_DENSE = 'dense'
 export const DENSITY_NORMAL = 'normal'
diff --git a/src/utils/generateGroupLatestItem.js b/src/utils/generateGroupLatestItem.js
index ee82c7d2f..fadafe21c 100644
--- a/src/utils/generateGroupLatestItem.js
+++ b/src/utils/generateGroupLatestItem.js
@@ -35,7 +35,7 @@ const findLatestByUpdated = group => {
       ? current
       : isNaN(currentDate)
       ? latest
-      : latestDate.getTime() > currentDate.getTime()
+      : latestDate.getTime() >= currentDate.getTime()
       ? latest
       : current
   })

From 3e05eef74a3c342a75a04bb420378b3dd1f040c0 Mon Sep 17 00:00:00 2001
From: illia-prokopchuk <78905712+illia-prokopchuk@users.noreply.github.com>
Date: Sat, 18 Nov 2023 08:43:39 +0200
Subject: [PATCH 11/14] Fix [UI] presentation long-waiting UI operations
 (#2084)

---
 src/actions/functions.js                      |  6 +-
 src/actions/jobs.js                           |  8 +--
 src/actions/workflow.js                       |  4 +-
 src/api/artifacts-api.js                      | 51 ++++++++++----
 src/api/functions-api.js                      | 15 ++--
 src/api/jobs-api.js                           | 47 ++++++++-----
 src/api/workflow-api.js                       | 15 ++--
 .../AddToFeatureVectorView.js                 |  1 +
 src/components/Datasets/Datasets.js           | 10 ++-
 src/components/Datasets/DatasetsView.js       | 11 +--
 .../FeatureStore/FeatureSets/FeatureSets.js   | 18 +++--
 .../FeatureSets/FeatureSetsView.js            |  3 +
 .../FeatureVectors/FeatureVectors.js          | 30 ++++----
 .../FeatureVectors/FeatureVectorsView.js      |  3 +
 .../FeatureStore/Features/Features.js         | 52 +++++++++-----
 .../FeatureStore/Features/FeaturesView.js     |  3 +
 src/components/Files/Files.js                 |  8 ++-
 src/components/Files/FilesView.js             | 15 +++-
 src/components/FunctionsPage/Functions.js     | 19 +++--
 src/components/FunctionsPage/FunctionsView.js | 11 ++-
 .../JobWizardFunctionSelection.js             |  2 +-
 .../Jobs/MonitorJobs/MonitorJobs.js           | 64 ++++++-----------
 .../Jobs/MonitorWorkflows/MonitorWorkflows.js | 16 +++--
 .../Jobs/ScheduledJobs/ScheduledJobs.js       | 34 ++++++---
 .../ModelEndpoints/ModelEndpoints.js          |  7 +-
 .../ModelEndpoints/ModelEndpointsView.js      | 10 ++-
 src/components/ModelsPage/Models/Models.js    |  8 ++-
 .../ModelsPage/Models/ModelsView.js           |  7 +-
 .../RealTimePipelines/RealTimePipelines.js    | 12 +++-
 .../RealTimePipelinesView.js                  |  6 +-
 src/constants.js                              |  2 +-
 src/httpClient.js                             | 63 +++++++++++++++++
 src/layout/Content/Content.js                 |  1 +
 src/reducers/artifactsReducer.js              | 70 ++++++++++++-------
 src/utils/getNoDataMessage.js                 |  4 +-
 src/utils/largeResponseCatchHandler.js        | 26 +++++++
 36 files changed, 463 insertions(+), 199 deletions(-)
 create mode 100644 src/utils/largeResponseCatchHandler.js

diff --git a/src/actions/functions.js b/src/actions/functions.js
index 01ccb07ee..e17601217 100644
--- a/src/actions/functions.js
+++ b/src/actions/functions.js
@@ -210,12 +210,12 @@ const functionsActions = {
     payload: err
   }),
   fetchFunctions:
-    (project, filters, withoutLoader = false) =>
+    (project, filters, setLargeRequestErrorMessage) =>
     dispatch => {
-      dispatch(functionsActions.fetchFunctionsBegin(withoutLoader))
+      dispatch(functionsActions.fetchFunctionsBegin())
 
       return functionsApi
-        .getFunctions(project, filters)
+        .getFunctions(project, filters, null, setLargeRequestErrorMessage)
         .then(({ data }) => {
           dispatch(functionsActions.fetchFunctionsSuccess(data.funcs))
 
diff --git a/src/actions/jobs.js b/src/actions/jobs.js
index 9059722e9..5e9d716e4 100644
--- a/src/actions/jobs.js
+++ b/src/actions/jobs.js
@@ -125,11 +125,11 @@ const jobsActions = {
     type: EDIT_JOB_FAILURE,
     payload: error
   }),
-  fetchAllJobRuns: (project, filters, jobName, cancelToken) => dispatch => {
+  fetchAllJobRuns: (project, filters, jobName, setLargeRequestErrorMessage) => dispatch => {
     dispatch(jobsActions.fetchAllJobRunsBegin())
 
     return jobsApi
-      .getAllJobRuns(project, jobName, filters, cancelToken)
+      .getAllJobRuns(project, jobName, filters, setLargeRequestErrorMessage)
       .then(({ data }) => {
         dispatch(jobsActions.fetchAllJobRunsSuccess(data.runs || []))
 
@@ -257,12 +257,12 @@ const jobsActions = {
   fetchJobLogsSuccess: () => ({
     type: FETCH_JOB_LOGS_SUCCESS
   }),
-  fetchJobs: (project, filters, scheduled) => dispatch => {
+  fetchJobs: (project, filters, scheduled, setLargeRequestErrorMessage) => dispatch => {
     const getJobs = scheduled ? jobsApi.getScheduledJobs : jobsApi.getJobs
 
     dispatch(jobsActions.fetchJobsBegin())
 
-    return getJobs(project, filters)
+    return getJobs(project, filters, setLargeRequestErrorMessage)
       .then(({ data }) => {
         const newJobs = scheduled
           ? (data || {}).schedules
diff --git a/src/actions/workflow.js b/src/actions/workflow.js
index 82773dd86..0e1b21263 100644
--- a/src/actions/workflow.js
+++ b/src/actions/workflow.js
@@ -58,11 +58,11 @@ const workflowActions = {
     type: FETCH_WORKFLOW_FAILURE,
     payload: error
   }),
-  fetchWorkflows: (project, filter) => dispatch => {
+  fetchWorkflows: (project, filter, setLargeRequestErrorMessage) => dispatch => {
     dispatch(workflowActions.fetchWorkflowsBegin())
 
     return workflowApi
-      .getWorkflows(project, filter)
+      .getWorkflows(project, filter, setLargeRequestErrorMessage)
       .then(response =>
         dispatch(workflowActions.fetchWorkflowsSuccess(parseWorkflows(response.data.runs)))
       )
diff --git a/src/api/artifacts-api.js b/src/api/artifacts-api.js
index 0fe2bdd68..70007d537 100644
--- a/src/api/artifacts-api.js
+++ b/src/api/artifacts-api.js
@@ -98,8 +98,16 @@ const artifactsApi = {
       }
     )
   },
-  getDataSets: (project, filters, config) => {
-    return fetchArtifacts(project, filters, { ...config, params: { category: DATASET_TYPE } })
+  getDataSets: (project, filters, config, setLargeRequestErrorMessage) => {
+    const newConfig = {
+      ...config,
+      params: { category: DATASET_TYPE },
+      ui: {
+        setLargeRequestErrorMessage
+      }
+    }
+
+    return fetchArtifacts(project, filters, newConfig)
   },
   getFile: (project, file, iter, tag) => {
     return fetchArtifacts(
@@ -115,10 +123,15 @@ const artifactsApi = {
       }
     )
   },
-  getFiles: (project, filters) => {
-    return fetchArtifacts(project, filters, {
-      params: { category: ARTIFACT_OTHER_TYPE, format: 'full' }
-    })
+  getFiles: (project, filters, setLargeRequestErrorMessage) => {
+    const config = {
+      params: { category: ARTIFACT_OTHER_TYPE, format: 'full' },
+      ui: {
+        setLargeRequestErrorMessage
+      }
+    }
+
+    return fetchArtifacts(project, filters, config)
   },
   getModel: (project, model, iter, tag) => {
     return fetchArtifacts(
@@ -134,17 +147,29 @@ const artifactsApi = {
       }
     )
   },
-  getModelEndpoints: (project, filters, params = {}) => {
+  getModelEndpoints: (project, filters, params = {}, setLargeRequestErrorMessage) => {
+    const config = {
+      params,
+      ui: {
+        setLargeRequestErrorMessage
+      }
+    }
+
     if (filters?.labels) {
-      params.label = filters.labels?.split(',')
+      config.params.label = filters.labels?.split(',')
     }
 
-    return mainHttpClient.get(`/projects/${project}/model-endpoints`, {
-      params
-    })
+    return mainHttpClient.get(`/projects/${project}/model-endpoints`, config)
   },
-  getModels: (project, filters) => {
-    return fetchArtifacts(project, filters, { params: { category: MODEL_TYPE, format: 'full' } })
+  getModels: (project, filters, setLargeRequestErrorMessage) => {
+    const config = {
+      params: { category: MODEL_TYPE, format: 'full' },
+      ui: {
+        setLargeRequestErrorMessage
+      }
+    }
+
+    return fetchArtifacts(project, filters, config)
   },
   registerArtifact: (project, data) =>
     mainHttpClient.post(
diff --git a/src/api/functions-api.js b/src/api/functions-api.js
index c123ae2ee..7f9fad26a 100644
--- a/src/api/functions-api.js
+++ b/src/api/functions-api.js
@@ -30,18 +30,23 @@ const functionsApi = {
   deleteSelectedFunction: (func, project) =>
     mainHttpClient.delete(`/projects/${project}/functions/${func}`),
   deployFunction: data => mainHttpClient.post('/build/function', data),
-  getFunctions: (project, filters, hash) => {
-    const params = {}
+  getFunctions: (project, filters, hash, setLargeRequestErrorMessage) => {
+    const config = {
+      params: {},
+      ui: {
+        setLargeRequestErrorMessage
+      }
+    }
 
     if (filters?.name) {
-      params.name = `~${filters.name}`
+      config.params.name = `~${filters.name}`
     }
 
     if (hash) {
-      params.hash_key = hash
+      config.params.hash_key = hash
     }
 
-    return mainHttpClient.get(`/projects/${project}/functions`, { params })
+    return mainHttpClient.get(`/projects/${project}/functions`, config)
   },
   getFunction: (project, functionName, hash, tag) => {
     const params = {}
diff --git a/src/api/jobs-api.js b/src/api/jobs-api.js
index 5eae4e50f..8eef9a7c1 100644
--- a/src/api/jobs-api.js
+++ b/src/api/jobs-api.js
@@ -74,18 +74,23 @@ const jobsApi = {
       `/projects/${project}/schedules/${postData.scheduled_object.task.metadata.name}`,
       postData
     ),
-  getJobs: (project, filters, isAllJobs) => {
-    const params = {
-      project,
-      ...generateRequestParams(filters)
+  getJobs: (project, filters, setLargeRequestErrorMessage, isAllJobs) => {
+    const config = {
+      params: {
+        project,
+        ...generateRequestParams(filters)
+      },
+      ui: {
+        setLargeRequestErrorMessage
+      }
     }
 
     if (!isAllJobs) {
-      params['partition-by'] = 'name'
-      params['partition-sort-by'] = 'updated'
+      config.params['partition-by'] = 'name'
+      config.params['partition-sort-by'] = 'updated'
     }
 
-    return mainHttpClient.get('/runs', { params })
+    return mainHttpClient.get('/runs', config)
   },
   getSpecificJobs: (project, filters, jobList) => {
     const params = {
@@ -97,19 +102,18 @@ const jobsApi = {
 
     return mainHttpClient.get(`/runs?${jobListQuery}`, { params })
   },
-  getAllJobRuns: (project, jobName, filters, cancelToken) => {
+  getAllJobRuns: (project, jobName, filters, setLargeRequestErrorMessage) => {
     const config = {
       params: {
         project,
         name: jobName,
         ...generateRequestParams(filters)
+      },
+      ui: {
+        setLargeRequestErrorMessage
       }
     }
 
-    if (cancelToken) {
-      config.cancelToken = cancelToken
-    }
-
     return mainHttpClient.get('/runs', config)
   },
   getJob: (project, jobId, iter) => {
@@ -125,24 +129,29 @@ const jobsApi = {
     fetch(`${mainBaseUrl}/log/${project}/${id}`, {
       method: 'get'
     }),
-  getScheduledJobs: (project, filters) => {
-    const params = {
-      include_last_run: 'yes'
+  getScheduledJobs: (project, filters, setLargeRequestErrorMessage) => {
+    const config = {
+      params: {
+        include_last_run: 'yes'
+      },
+      ui: {
+        setLargeRequestErrorMessage
+      }
     }
 
     if (filters?.owner) {
-      params.owner = filters.owner
+      config.params.owner = filters.owner
     }
 
     if (filters?.name) {
-      params.name = `~${filters.name}`
+      config.params.name = `~${filters.name}`
     }
 
     if (filters?.labels) {
-      params.labels = filters.labels?.split(',')
+      config.params.labels = filters.labels?.split(',')
     }
 
-    return mainHttpClient.get(`/projects/${project}/schedules`, { params })
+    return mainHttpClient.get(`/projects/${project}/schedules`, config)
   },
   removeScheduledJob: (project, scheduleName) =>
     mainHttpClient.delete(`/projects/${project}/schedules/${scheduleName}`),
diff --git a/src/api/workflow-api.js b/src/api/workflow-api.js
index 530813b62..00177cc47 100644
--- a/src/api/workflow-api.js
+++ b/src/api/workflow-api.js
@@ -69,21 +69,26 @@ const generateQueryParams = filter => {
     }
   }
 
-  return `?filter=${encodeURI(JSON.stringify(queryParams))}`
+  return JSON.stringify(queryParams)
 }
 
 const workflowsApi = {
   getWorkflow: (project, workflowId) => {
     return mainHttpClient.get(`/projects/${project}/pipelines/${workflowId}`)
   },
-  getWorkflows: (project, filter) => {
-    let queryParams = ''
+  getWorkflows: (project, filter, setLargeRequestErrorMessage) => {
+    const config = {
+      params: {},
+      ui: {
+        setLargeRequestErrorMessage
+      }
+    }
 
     if (filter?.groupBy === GROUP_BY_WORKFLOW) {
-      queryParams = generateQueryParams(filter)
+      config.params.filter = generateQueryParams(filter)
     }
 
-    return mainHttpClient.get(`/projects/${project}/pipelines` + queryParams)
+    return mainHttpClient.get(`/projects/${project}/pipelines`, config)
   }
 }
 
diff --git a/src/components/AddToFeatureVectorPage/AddToFeatureVectorView.js b/src/components/AddToFeatureVectorPage/AddToFeatureVectorView.js
index b84eef3c6..1555d1a04 100644
--- a/src/components/AddToFeatureVectorPage/AddToFeatureVectorView.js
+++ b/src/components/AddToFeatureVectorPage/AddToFeatureVectorView.js
@@ -73,6 +73,7 @@ const AddToFeatureVectorView = React.forwardRef(
                 message={getNoDataMessage(
                   filtersStore,
                   filters,
+                  null,
                   FEATURE_STORE_PAGE,
                   ADD_TO_FEATURE_VECTOR_TAB
                 )}
diff --git a/src/components/Datasets/Datasets.js b/src/components/Datasets/Datasets.js
index 014a2f7da..691d37d47 100644
--- a/src/components/Datasets/Datasets.js
+++ b/src/components/Datasets/Datasets.js
@@ -50,6 +50,7 @@ import {
   handleApplyDetailsChanges,
   registerDatasetTitle
 } from './datasets.util'
+import { largeResponseCatchHandler } from '../../utils/largeResponseCatchHandler'
 import { cancelRequest } from '../../utils/cancelRequest'
 import { createDatasetsRowData, getIsTargetPathValid } from '../../utils/createArtifactsContent'
 import { getArtifactIdentifier } from '../../utils/getUniqueIdentifier'
@@ -78,6 +79,7 @@ const Datasets = () => {
   const [allDatasets, setAllDatasets] = useState([])
   const [selectedDataset, setSelectedDataset] = useState({})
   const [selectedRowData, setSelectedRowData] = useState({})
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   const [convertedYaml, toggleConvertedYaml] = useYaml('')
   const [urlTagOption] = useGetTagOptions(null, filters, null, DATASETS_FILTERS)
   const artifactsStore = useSelector(store => store.artifactsStore)
@@ -107,7 +109,7 @@ const Datasets = () => {
 
   const fetchData = useCallback(
     filters => {
-      dispatch(fetchDataSets({ project: params.projectName, filters }))
+      dispatch(fetchDataSets({ project: params.projectName, filters, setLargeRequestErrorMessage }))
         .unwrap()
         .then(dataSetsResponse => {
           setArtifactTags(
@@ -121,6 +123,7 @@ const Datasets = () => {
 
           return dataSetsResponse
         })
+        .catch(largeResponseCatchHandler)
     },
     [dispatch, params.projectName]
   )
@@ -370,8 +373,9 @@ const Datasets = () => {
       detailsFormInitialValues={detailsFormInitialValues}
       filtersStore={filtersStore}
       handleExpandRow={handleExpandRow}
-      handleRegisterDataset={handleRegisterDataset}
       handleRefresh={handleRefresh}
+      handleRegisterDataset={handleRegisterDataset}
+      largeRequestErrorMessage={largeRequestErrorMessage}
       pageData={pageData}
       ref={datasetsRef}
       selectedDataset={selectedDataset}
@@ -383,8 +387,8 @@ const Datasets = () => {
       tableContent={sortedTableContent}
       tableHeaders={sortedTableHeaders}
       toggleConvertedYaml={toggleConvertedYaml}
-      viewMode={viewMode}
       urlTagOption={urlTagOption}
+      viewMode={viewMode}
     />
   )
 }
diff --git a/src/components/Datasets/DatasetsView.js b/src/components/Datasets/DatasetsView.js
index 253a6af37..6027d8ac1 100644
--- a/src/components/Datasets/DatasetsView.js
+++ b/src/components/Datasets/DatasetsView.js
@@ -52,6 +52,7 @@ const DatasetsView = React.forwardRef(
       handleExpandRow,
       handleRefresh,
       handleRegisterDataset,
+      largeRequestErrorMessage,
       pageData,
       selectedDataset,
       selectedRowData,
@@ -62,8 +63,8 @@ const DatasetsView = React.forwardRef(
       tableContent,
       tableHeaders,
       toggleConvertedYaml,
-      viewMode,
-      urlTagOption
+      urlTagOption,
+      viewMode
     },
     ref
   ) => {
@@ -100,6 +101,7 @@ const DatasetsView = React.forwardRef(
                   message={getNoDataMessage(
                     filtersStore,
                     filters,
+                    largeRequestErrorMessage,
                     DATASETS_PAGE,
                     null,
                     DATASETS_FILTERS
@@ -179,6 +181,7 @@ DatasetsView.propTypes = {
   handleExpandRow: PropTypes.func.isRequired,
   handleRefresh: PropTypes.func.isRequired,
   handleRegisterDataset: PropTypes.func.isRequired,
+  largeRequestErrorMessage: PropTypes.string.isRequired,
   pageData: PropTypes.object.isRequired,
   selectedDataset: PropTypes.object.isRequired,
   selectedRowData: PropTypes.object.isRequired,
@@ -189,8 +192,8 @@ DatasetsView.propTypes = {
   tableContent: PropTypes.arrayOf(PropTypes.object).isRequired,
   tableHeaders: PropTypes.arrayOf(PropTypes.object).isRequired,
   toggleConvertedYaml: PropTypes.func.isRequired,
-  viewMode: PropTypes.string,
-  urlTagOption: PropTypes.string
+  urlTagOption: PropTypes.string,
+  viewMode: PropTypes.string
 }
 
 export default DatasetsView
diff --git a/src/components/FeatureStore/FeatureSets/FeatureSets.js b/src/components/FeatureStore/FeatureSets/FeatureSets.js
index 145ae73dc..b31bd0f99 100644
--- a/src/components/FeatureStore/FeatureSets/FeatureSets.js
+++ b/src/components/FeatureStore/FeatureSets/FeatureSets.js
@@ -64,6 +64,7 @@ const FeatureSets = ({
   const [featureSets, setFeatureSets] = useState([])
   const [selectedFeatureSet, setSelectedFeatureSet] = useState({})
   const [selectedRowData, setSelectedRowData] = useState({})
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
 
   const openPanelByDefault = useOpenPanel()
   const [urlTagOption] = useGetTagOptions(fetchFeatureSetsTags, featureSetsFilters)
@@ -106,14 +107,20 @@ const FeatureSets = ({
       const config = {
         cancelToken: new axios.CancelToken(cancel => {
           featureStoreRef.current.cancel = cancel
-        })
+        }),
+        ui: {
+          setLargeRequestErrorMessage
+        }
       }
 
-      return fetchFeatureSets(params.projectName, filters, config).then(result => {
-        setFeatureSets(parseFeatureSets(result))
+      return fetchFeatureSets(params.projectName, filters, config)
+        .then(result => {
+          if (result) {
+            setFeatureSets(parseFeatureSets(result))
 
-        return result
-      })
+            return result
+          }
+        })
     },
     [fetchFeatureSets, params.projectName]
   )
@@ -353,6 +360,7 @@ const FeatureSets = ({
       filtersStore={filtersStore}
       handleExpandRow={handleExpandRow}
       handleRefresh={handleRefresh}
+      largeRequestErrorMessage={largeRequestErrorMessage}
       pageData={pageData}
       ref={featureStoreRef}
       selectedFeatureSet={selectedFeatureSet}
diff --git a/src/components/FeatureStore/FeatureSets/FeatureSetsView.js b/src/components/FeatureStore/FeatureSets/FeatureSetsView.js
index 214146b53..43b4d373a 100644
--- a/src/components/FeatureStore/FeatureSets/FeatureSetsView.js
+++ b/src/components/FeatureStore/FeatureSets/FeatureSetsView.js
@@ -46,6 +46,7 @@ const FeatureSetsView = React.forwardRef(
       filtersStore,
       handleExpandRow,
       handleRefresh,
+      largeRequestErrorMessage,
       pageData,
       selectedFeatureSet,
       selectedRowData,
@@ -74,6 +75,7 @@ const FeatureSetsView = React.forwardRef(
             message={getNoDataMessage(
               filtersStore,
               featureSetsFilters,
+              largeRequestErrorMessage,
               FEATURE_STORE_PAGE,
               FEATURE_SETS_TAB
             )}
@@ -133,6 +135,7 @@ FeatureSetsView.propTypes = {
   filtersStore: PropTypes.object.isRequired,
   handleExpandRow: PropTypes.func.isRequired,
   handleRefresh: PropTypes.func.isRequired,
+  largeRequestErrorMessage: PropTypes.string.isRequired,
   pageData: PropTypes.object.isRequired,
   selectedFeatureSet: PropTypes.object.isRequired,
   selectedRowData: PropTypes.object.isRequired,
diff --git a/src/components/FeatureStore/FeatureVectors/FeatureVectors.js b/src/components/FeatureStore/FeatureVectors/FeatureVectors.js
index 93f3724bf..a180a7987 100644
--- a/src/components/FeatureStore/FeatureVectors/FeatureVectors.js
+++ b/src/components/FeatureStore/FeatureVectors/FeatureVectors.js
@@ -67,6 +67,7 @@ const FeatureVectors = ({
   const [featureVectors, setFeatureVectors] = useState([])
   const [selectedFeatureVector, setSelectedFeatureVector] = useState({})
   const [selectedRowData, setSelectedRowData] = useState({})
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   const openPanelByDefault = useOpenPanel()
   const [urlTagOption] = useGetTagOptions(fetchFeatureVectorsTags, featureVectorsFilters)
   const params = useParams()
@@ -86,29 +87,31 @@ const FeatureVectors = ({
 
   const pageData = useMemo(() => generatePageData(selectedFeatureVector), [selectedFeatureVector])
 
-  const detailsFormInitialValues = useMemo(
-    () => {
-        return {
-          features: (selectedFeatureVector.specFeatures ?? []).map( featureData => {
-              return {...parseFeatureTemplate(featureData)}
-          })
-        }
-    },
-    [selectedFeatureVector.specFeatures]
-  )
+  const detailsFormInitialValues = useMemo(() => {
+    return {
+      features: (selectedFeatureVector.specFeatures ?? []).map(featureData => {
+        return { ...parseFeatureTemplate(featureData) }
+      })
+    }
+  }, [selectedFeatureVector.specFeatures])
 
   const fetchData = useCallback(
     filters => {
       const config = {
         cancelToken: new axios.CancelToken(cancel => {
           featureVectorsRef.current.cancel = cancel
-        })
+        }),
+        ui: {
+          setLargeRequestErrorMessage
+        }
       }
 
       return fetchFeatureVectors(params.projectName, filters, config).then(result => {
-        setFeatureVectors(parseFeatureVectors(result))
+        if (result) {
+          setFeatureVectors(parseFeatureVectors(result))
 
-        return result
+          return result
+        }
       })
     },
     [fetchFeatureVectors, params.projectName]
@@ -430,6 +433,7 @@ const FeatureVectors = ({
       filtersStore={filtersStore}
       handleExpandRow={handleExpandRow}
       handleRefresh={handleRefresh}
+      largeRequestErrorMessage={largeRequestErrorMessage}
       pageData={pageData}
       ref={featureVectorsRef}
       selectedFeatureVector={selectedFeatureVector}
diff --git a/src/components/FeatureStore/FeatureVectors/FeatureVectorsView.js b/src/components/FeatureStore/FeatureVectors/FeatureVectorsView.js
index 786d0041a..2320002b8 100644
--- a/src/components/FeatureStore/FeatureVectors/FeatureVectorsView.js
+++ b/src/components/FeatureStore/FeatureVectors/FeatureVectorsView.js
@@ -43,6 +43,7 @@ const FeatureVectorsView = React.forwardRef(
       filtersStore,
       handleExpandRow,
       handleRefresh,
+      largeRequestErrorMessage,
       pageData,
       selectedFeatureVector,
       selectedRowData,
@@ -70,6 +71,7 @@ const FeatureVectorsView = React.forwardRef(
             message={getNoDataMessage(
               filtersStore,
               featureVectorsFilters,
+              largeRequestErrorMessage,
               FEATURE_STORE_PAGE,
               FEATURE_VECTORS_TAB
             )}
@@ -126,6 +128,7 @@ FeatureVectorsView.propTypes = {
   filtersStore: PropTypes.object.isRequired,
   handleExpandRow: PropTypes.func.isRequired,
   handleRefresh: PropTypes.func.isRequired,
+  largeRequestErrorMessage: PropTypes.string.isRequired,
   pageData: PropTypes.object.isRequired,
   selectedFeatureVector: PropTypes.object.isRequired,
   selectedRowData: PropTypes.object.isRequired,
diff --git a/src/components/FeatureStore/Features/Features.js b/src/components/FeatureStore/Features/Features.js
index acd0925fa..de310b055 100644
--- a/src/components/FeatureStore/Features/Features.js
+++ b/src/components/FeatureStore/Features/Features.js
@@ -32,16 +32,19 @@ import {
   FEATURE_STORE_PAGE,
   GROUP_BY_NAME,
   GROUP_BY_NONE,
-  TAG_FILTER_ALL_ITEMS
+  TAG_FILTER_ALL_ITEMS,
+  LARGE_REQUEST_CANCELED
 } from '../../../constants'
 import { createFeaturesRowData } from '../../../utils/createFeatureStoreContent'
 import { featuresActionCreator, featuresFilters } from './features.util'
 import { getFeatureIdentifier } from '../../../utils/getUniqueIdentifier'
+import { cancelRequest } from '../../../utils/cancelRequest'
 import { getFilterTagOptions, setFilters } from '../../../reducers/filtersReducer'
 import { parseFeatures } from '../../../utils/parseFeatures'
 import { setTablePanelOpen } from '../../../reducers/tableReducer'
 import { useGetTagOptions } from '../../../hooks/useGetTagOptions.hook'
 import { useGroupContent } from '../../../hooks/groupContent.hook'
+import { showLargeResponsePopUp } from '../../../httpClient'
 
 import { ReactComponent as Yaml } from 'igz-controls/images/yaml.svg'
 
@@ -59,6 +62,7 @@ const Features = ({
 }) => {
   const [features, setFeatures] = useState([])
   const [selectedRowData, setSelectedRowData] = useState({})
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   const [urlTagOption] = useGetTagOptions(fetchFeatureSetsTags, featuresFilters)
   const params = useParams()
   const featureStore = useSelector(store => store.featureStore)
@@ -89,6 +93,9 @@ const Features = ({
 
   const fetchData = useCallback(
     filters => {
+      const cancelRequestTimeout = setTimeout(() => {
+        cancelRequest(featureStoreRef, LARGE_REQUEST_CANCELED)
+      }, 30000)
       const config = {
         cancelToken: new axios.CancelToken(cancel => {
           featureStoreRef.current.cancel = cancel
@@ -98,27 +105,37 @@ const Features = ({
       return Promise.allSettled([
         fetchFeatures(params.projectName, filters, config),
         fetchEntities(params.projectName, filters, config)
-      ]).then(result => {
-        if (result) {
-          const features = result.reduce((prevValue, nextValue) => {
-            return nextValue.value ? prevValue.concat(nextValue.value) : prevValue
-          }, [])
-
-          setFeatures(parseFeatures(features))
-
-          return features
-        }
+      ])
+        .then(result => {
+          if (result) {
+            const features = result.reduce((prevValue, nextValue) => {
+              return nextValue.value ? prevValue.concat(nextValue.value) : prevValue
+            }, [])
+
+            if (features.length > 1500) {
+              showLargeResponsePopUp(setLargeRequestErrorMessage)
+              setFeatures([])
+            } else {
+              setFeatures(parseFeatures(features))
+              setLargeRequestErrorMessage('')
+
+              return features
+            }
+          }
 
-        return result
-      })
+          return result
+        })
+        .catch(error => {
+          if (error.message === LARGE_REQUEST_CANCELED) {
+            showLargeResponsePopUp(setLargeRequestErrorMessage)
+            setFeatures([])
+          }
+        })
+        .finally(() => clearTimeout(cancelRequestTimeout))
     },
     [fetchEntities, fetchFeatures, params.projectName]
   )
 
-  const cancelRequest = message => {
-    featureStoreRef.current?.cancel && featureStoreRef.current.cancel(message)
-  }
-
   const handleRefresh = filters => {
     dispatch(getFilterTagOptions({ fetchTags: fetchFeatureSetsTags, project: params.projectName }))
 
@@ -266,6 +283,7 @@ const Features = ({
       getPopUpTemplate={getPopUpTemplate}
       handleExpandRow={handleExpandRow}
       handleRefresh={handleRefresh}
+      largeRequestErrorMessage={largeRequestErrorMessage}
       pageData={pageData}
       ref={featureStoreRef}
       selectedRowData={selectedRowData}
diff --git a/src/components/FeatureStore/Features/FeaturesView.js b/src/components/FeatureStore/Features/FeaturesView.js
index ee8cd9ba5..137ee0c9d 100644
--- a/src/components/FeatureStore/Features/FeaturesView.js
+++ b/src/components/FeatureStore/Features/FeaturesView.js
@@ -40,6 +40,7 @@ const FeaturesView = React.forwardRef(
       getPopUpTemplate,
       handleExpandRow,
       handleRefresh,
+      largeRequestErrorMessage,
       pageData,
       selectedRowData,
       tableContent,
@@ -71,6 +72,7 @@ const FeaturesView = React.forwardRef(
             message={getNoDataMessage(
               filtersStore,
               featuresFilters,
+              largeRequestErrorMessage,
               FEATURE_STORE_PAGE,
               FEATURES_TAB
             )}
@@ -117,6 +119,7 @@ FeaturesView.propTypes = {
   getPopUpTemplate: PropTypes.func.isRequired,
   handleExpandRow: PropTypes.func.isRequired,
   handleRefresh: PropTypes.func.isRequired,
+  largeRequestErrorMessage: PropTypes.string.isRequired,
   pageData: PropTypes.object.isRequired,
   selectedRowData: PropTypes.object.isRequired,
   tableContent: PropTypes.arrayOf(PropTypes.object).isRequired,
diff --git a/src/components/Files/Files.js b/src/components/Files/Files.js
index 9cf8f068d..7367deb5a 100644
--- a/src/components/Files/Files.js
+++ b/src/components/Files/Files.js
@@ -45,6 +45,7 @@ import {
 } from './files.util'
 import { cancelRequest } from '../../utils/cancelRequest'
 import { createFilesRowData, getIsTargetPathValid } from '../../utils/createArtifactsContent'
+import { largeResponseCatchHandler } from '../../utils/largeResponseCatchHandler'
 import {
   fetchFile,
   fetchFiles,
@@ -78,6 +79,7 @@ const Files = () => {
   const [allFiles, setAllFiles] = useState([])
   const [selectedFile, setSelectedFile] = useState({})
   const [selectedRowData, setSelectedRowData] = useState({})
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   const [convertedYaml, toggleConvertedYaml] = useYaml('')
   const [urlTagOption] = useGetTagOptions(null, filters, null, FILES_FILTERS)
   const artifactsStore = useSelector(store => store.artifactsStore)
@@ -104,13 +106,14 @@ const Files = () => {
 
   const fetchData = useCallback(
     filters => {
-      dispatch(fetchFiles({ project: params.projectName, filters }))
+      dispatch(fetchFiles({ project: params.projectName, filters, setLargeRequestErrorMessage }))
         .unwrap()
         .then(filesResponse => {
           setArtifactTags(filesResponse, setFiles, setAllFiles, filters, dispatch, FILES_PAGE)
 
           return filesResponse
         })
+        .catch(largeResponseCatchHandler)
     },
     [dispatch, params.projectName]
   )
@@ -360,6 +363,7 @@ const Files = () => {
       handleExpandRow={handleExpandRow}
       handleRefresh={handleRefresh}
       handleRegisterArtifact={handleRegisterArtifact}
+      largeRequestErrorMessage={largeRequestErrorMessage}
       pageData={pageData}
       ref={filesRef}
       selectedFile={selectedFile}
@@ -371,8 +375,8 @@ const Files = () => {
       tableContent={sortedTableContent}
       tableHeaders={sortedTableHeaders}
       toggleConvertedYaml={toggleConvertedYaml}
-      viewMode={viewMode}
       urlTagOption={urlTagOption}
+      viewMode={viewMode}
     />
   )
 }
diff --git a/src/components/Files/FilesView.js b/src/components/Files/FilesView.js
index d91415336..77ea2b929 100644
--- a/src/components/Files/FilesView.js
+++ b/src/components/Files/FilesView.js
@@ -52,6 +52,7 @@ const FilesView = React.forwardRef(
       handleExpandRow,
       handleRefresh,
       handleRegisterArtifact,
+      largeRequestErrorMessage,
       pageData,
       selectedFile,
       selectedRowData,
@@ -62,8 +63,8 @@ const FilesView = React.forwardRef(
       tableContent,
       tableHeaders,
       toggleConvertedYaml,
-      viewMode,
-      urlTagOption
+      urlTagOption,
+      viewMode
     },
     ref
   ) => {
@@ -97,7 +98,14 @@ const FilesView = React.forwardRef(
               </div>
               {artifactsStore.loading ? null : files.length === 0 ? (
                 <NoData
-                  message={getNoDataMessage(filtersStore, filters, FILES_PAGE, null, FILES_FILTERS)}
+                  message={getNoDataMessage(
+                    filtersStore,
+                    filters,
+                    largeRequestErrorMessage,
+                    FILES_PAGE,
+                    null,
+                    FILES_FILTERS
+                  )}
                 />
               ) : (
                 <>
@@ -173,6 +181,7 @@ FilesView.propTypes = {
   handleExpandRow: PropTypes.func.isRequired,
   handleRefresh: PropTypes.func.isRequired,
   handleRegisterArtifact: PropTypes.func.isRequired,
+  largeRequestErrorMessage: PropTypes.string.isRequired,
   pageData: PropTypes.object.isRequired,
   selectedFile: PropTypes.object.isRequired,
   selectedRowData: PropTypes.object.isRequired,
diff --git a/src/components/FunctionsPage/Functions.js b/src/components/FunctionsPage/Functions.js
index f1a38a72c..86a1f704e 100644
--- a/src/components/FunctionsPage/Functions.js
+++ b/src/components/FunctionsPage/Functions.js
@@ -46,6 +46,7 @@ import {
   FUNCTIONS_PAGE,
   GROUP_BY_NAME,
   PANEL_FUNCTION_CREATE_MODE,
+  LARGE_REQUEST_CANCELED,
   SHOW_UNTAGGED_ITEMS,
   TAG_LATEST
 } from '../../constants'
@@ -81,6 +82,7 @@ const Functions = ({
   const [jobWizardMode, setJobWizardMode] = useState(null)
   const filtersStore = useSelector(store => store.filtersStore)
   const [selectedRowData, setSelectedRowData] = useState({})
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   let fetchFunctionLogsTimeout = useRef(null)
   const { isStagingMode } = useMode()
   const params = useParams()
@@ -90,13 +92,19 @@ const Functions = ({
 
   const refreshFunctions = useCallback(
     filters => {
-      return fetchFunctions(params.projectName, filters).then(functions => {
-        const newFunctions = parseFunctions(functions, params.projectName)
+      return fetchFunctions(params.projectName, filters, setLargeRequestErrorMessage)
+        .then(functions => {
+          const newFunctions = parseFunctions(functions, params.projectName)
 
-        setFunctions(newFunctions)
+          setFunctions(newFunctions)
 
-        return newFunctions
-      })
+          return newFunctions
+        })
+        .catch(error => {
+          if (error.message === LARGE_REQUEST_CANCELED) {
+            setFunctions([])
+          }
+        })
     },
     [fetchFunctions, params.projectName]
   )
@@ -494,6 +502,7 @@ const Functions = ({
       handleExpandAll={handleExpandAll}
       handleExpandRow={handleExpandRow}
       handleSelectFunction={handleSelectFunction}
+      largeRequestErrorMessage={largeRequestErrorMessage}
       pageData={pageData}
       refreshFunctions={refreshFunctions}
       selectedFunction={selectedFunction}
diff --git a/src/components/FunctionsPage/FunctionsView.js b/src/components/FunctionsPage/FunctionsView.js
index b6946dfe8..94d016da9 100644
--- a/src/components/FunctionsPage/FunctionsView.js
+++ b/src/components/FunctionsPage/FunctionsView.js
@@ -55,6 +55,7 @@ const FunctionsView = ({
   handleExpandAll,
   handleExpandRow,
   handleSelectFunction,
+  largeRequestErrorMessage,
   pageData,
   refreshFunctions,
   selectedFunction,
@@ -91,7 +92,14 @@ const FunctionsView = ({
             {functionsStore.loading ? (
               <Loader />
             ) : taggedFunctions.length === 0 ? (
-              <NoData message={getNoDataMessage(filtersStore, filters, FUNCTIONS_PAGE)} />
+              <NoData
+                message={getNoDataMessage(
+                  filtersStore,
+                  filters,
+                  largeRequestErrorMessage,
+                  FUNCTIONS_PAGE
+                )}
+              />
             ) : (
               <>
                 <Table
@@ -183,6 +191,7 @@ FunctionsView.propTypes = {
   handleExpandAll: PropTypes.func.isRequired,
   handleExpandRow: PropTypes.func.isRequired,
   handleSelectFunction: PropTypes.func.isRequired,
+  largeRequestErrorMessage: PropTypes.string.isRequired,
   pageData: PropTypes.object.isRequired,
   refreshFunctions: PropTypes.func.isRequired,
   selectedFunction: PropTypes.object.isRequired,
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
index e670d9e99..589e2dcfd 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
@@ -238,7 +238,7 @@ const JobWizardFunctionSelection = ({
   }
 
   const onSelectedProjectNameChange = currentValue => {
-    dispatch(functionsActions.fetchFunctions(currentValue, {}, true)).then(functions => {
+    dispatch(functionsActions.fetchFunctions(currentValue, {})).then(functions => {
       const validFunctions = functions.filter(func => {
         return includes(functionRunKinds, func.kind)
       })
diff --git a/src/components/Jobs/MonitorJobs/MonitorJobs.js b/src/components/Jobs/MonitorJobs/MonitorJobs.js
index 0817a8e5e..eea5a70e7 100644
--- a/src/components/Jobs/MonitorJobs/MonitorJobs.js
+++ b/src/components/Jobs/MonitorJobs/MonitorJobs.js
@@ -22,7 +22,6 @@ import classnames from 'classnames'
 import { useLocation, useNavigate, useParams } from 'react-router-dom'
 import { connect, useDispatch, useSelector } from 'react-redux'
 import { isEmpty } from 'lodash'
-import axios from 'axios'
 
 import JobWizard from '../../JobWizard/JobWizard'
 import Details from '../../Details/Details'
@@ -32,7 +31,6 @@ import NoData from '../../../common/NoData/NoData'
 import Table from '../../Table/Table'
 import TableTop from '../../../elements/TableTop/TableTop'
 import YamlModal from '../../../common/YamlModal/YamlModal'
-import { ConfirmDialog } from 'igz-controls/components'
 
 import { DANGER_BUTTON, TERTIARY_BUTTON } from 'igz-controls/constants'
 import {
@@ -40,7 +38,7 @@ import {
   JOBS_PAGE,
   MONITOR_JOBS_TAB,
   PANEL_RERUN_MODE,
-  REQUEST_CANCELED
+  LARGE_REQUEST_CANCELED
 } from '../../../constants'
 import {
   generateActionsMenu,
@@ -55,7 +53,6 @@ import { getCloseDetailsLink } from '../../../utils/getCloseDetailsLink'
 import { getNoDataMessage } from '../../../utils/getNoDataMessage'
 import { enrichRunWithFunctionFields, handleAbortJob } from '../jobs.util'
 import { isDetailsTabExists } from '../../../utils/isDetailsTabExists'
-import { cancelRequest } from '../../../utils/cancelRequest'
 import { openPopUp } from 'igz-controls/utils/common.util'
 import { getJobLogs } from '../../../utils/getJobLogs.util'
 import { parseJob } from '../../../utils/parseJob'
@@ -92,7 +89,6 @@ const MonitorJobs = ({
   const dispatch = useDispatch()
   const { isStagingMode } = useMode()
   const fetchJobFunctionsPromiseRef = useRef()
-  const fetchJobsRef = useRef({ current: {} })
   const {
     editableItem,
     handleMonitoring,
@@ -145,37 +141,24 @@ const MonitorJobs = ({
       }
 
       const fetchData = params.jobName ? fetchAllJobRuns : fetchJobs
-      const cancelJobsRequestTimeout = setTimeout(() => {
-        cancelRequest(fetchJobsRef, REQUEST_CANCELED)
-      }, 30000)
 
-      fetchData(
-        params.projectName,
-        filters,
-        params.jobName ?? false,
-        new axios.CancelToken(cancel => {
-          fetchJobsRef.current.cancel = cancel
-        })
-      )
+      fetchData(params.projectName, filters, params.jobName ?? false, setLargeRequestErrorMessage)
         .then(jobs => {
-          if (jobs.length > 1500) {
-            showJobsErrorPopUp()
-            setJobRuns([])
-          } else {
-            const parsedJobs = jobs.map(job => parseJob(job, MONITOR_JOBS_TAB))
+          const parsedJobs = jobs.map(job => parseJob(job, MONITOR_JOBS_TAB))
 
-            if (params.jobName) {
-              setJobRuns(parsedJobs)
-            } else {
-              setJobs(parsedJobs)
-            }
-            setLargeRequestErrorMessage('')
+          if (params.jobName) {
+            setJobRuns(parsedJobs)
+          } else {
+            setJobs(parsedJobs)
           }
         })
         .catch(error => {
-          if (error.message === REQUEST_CANCELED) {
-            showJobsErrorPopUp()
-            setJobRuns([])
+          if (error.message === LARGE_REQUEST_CANCELED) {
+            if (params.jobName) {
+              setJobRuns([])
+            } else {
+              setJobs([])
+            }
           } else {
             dispatch(
               setNotification({
@@ -187,16 +170,6 @@ const MonitorJobs = ({
             )
           }
         })
-        .finally(() => clearTimeout(cancelJobsRequestTimeout))
-
-      const showJobsErrorPopUp = () => {
-        const errorMessage =
-          'The query result is too large to display. Add a filter (or narrow it) to retrieve fewer results.'
-        openPopUp(ConfirmDialog, {
-          message: errorMessage
-        })
-        setLargeRequestErrorMessage(errorMessage)
-      }
     },
     [dispatch, fetchAllJobRuns, fetchJobs, params.jobName, params.projectName]
   )
@@ -500,10 +473,13 @@ const MonitorJobs = ({
       {jobsStore.loading ? null : (params.jobName && jobRuns.length === 0) ||
         (jobs.length === 0 && !params.jobName) ? (
         <NoData
-          message={
-            largeRequestErrorMessage ||
-            getNoDataMessage(filtersStore, filters, JOBS_PAGE, MONITOR_JOBS_TAB)
-          }
+          message={getNoDataMessage(
+            filtersStore,
+            filters,
+            largeRequestErrorMessage,
+            JOBS_PAGE,
+            MONITOR_JOBS_TAB
+          )}
         />
       ) : (
         isEmpty(selectedJob) && (
diff --git a/src/components/Jobs/MonitorWorkflows/MonitorWorkflows.js b/src/components/Jobs/MonitorWorkflows/MonitorWorkflows.js
index 4970b237e..2be60bf44 100644
--- a/src/components/Jobs/MonitorWorkflows/MonitorWorkflows.js
+++ b/src/components/Jobs/MonitorWorkflows/MonitorWorkflows.js
@@ -83,6 +83,7 @@ const MonitorWorkflows = ({
   const [workflowsAreLoaded, setWorkflowsAreLoaded] = useState(false)
   const [itemIsSelected, setItemIsSelected] = useState(false)
   const [selectedJob, setSelectedJob] = useState({})
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   const [convertedYaml, toggleConvertedYaml] = useYaml('')
   const appStore = useSelector(store => store.appStore)
   const workflowsStore = useSelector(state => state.workflowsStore)
@@ -299,7 +300,7 @@ const MonitorWorkflows = ({
 
   const getWorkflows = useCallback(
     filter => {
-      fetchWorkflows(params.projectName, filter)
+      fetchWorkflows(params.projectName, filter, setLargeRequestErrorMessage)
     },
     [fetchWorkflows, params.projectName]
   )
@@ -536,10 +537,17 @@ const MonitorWorkflows = ({
           </div>
         </div>
       )}
-      {workflowsStore.workflows.loading ? null : !params.workflowId &&
-        workflowsStore.workflows.data.length === 0 ? (
+      {workflowsStore.workflows.loading ? null : (!params.workflowId &&
+          workflowsStore.workflows.data.length === 0) ||
+        largeRequestErrorMessage ? (
         <NoData
-          message={getNoDataMessage(filtersStore, filters, JOBS_PAGE, MONITOR_WORKFLOWS_TAB)}
+          message={getNoDataMessage(
+            filtersStore,
+            filters,
+            largeRequestErrorMessage,
+            JOBS_PAGE,
+            MONITOR_WORKFLOWS_TAB
+          )}
         />
       ) : (
         <>
diff --git a/src/components/Jobs/ScheduledJobs/ScheduledJobs.js b/src/components/Jobs/ScheduledJobs/ScheduledJobs.js
index 8ae682a2d..c8bc96a39 100644
--- a/src/components/Jobs/ScheduledJobs/ScheduledJobs.js
+++ b/src/components/Jobs/ScheduledJobs/ScheduledJobs.js
@@ -36,6 +36,7 @@ import {
   LABELS_FILTER,
   NAME_FILTER,
   PANEL_EDIT_MODE,
+  LARGE_REQUEST_CANCELED,
   SCHEDULE_TAB
 } from '../../../constants'
 import { DANGER_BUTTON, FORBIDDEN_ERROR_STATUS_CODE } from 'igz-controls/constants'
@@ -67,6 +68,7 @@ const ScheduledJobs = ({
   const [dataIsLoaded, setDataIsLoaded] = useState(false)
   const [convertedYaml, toggleConvertedYaml] = useYaml('')
   const [editableItem, setEditableItem] = useState(null)
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   const dispatch = useDispatch()
   const params = useParams()
   const filtersStore = useSelector(store => store.filtersStore)
@@ -96,20 +98,22 @@ const ScheduledJobs = ({
 
   const refreshJobs = useCallback(
     filters => {
-      fetchJobs(params.projectName, filters, true)
+      fetchJobs(params.projectName, filters, true, setLargeRequestErrorMessage)
         .then(jobs => {
           setJobs(jobs.map(job => parseJob(job, SCHEDULE_TAB)))
         })
         .catch(error => {
-          dispatch(
-            setNotification({
-              status: error?.response?.status || 400,
-              id: Math.random(),
-              message: 'Failed to fetch jobs',
-              retry: () => refreshJobs(filters),
-              error
-            })
-          )
+          if (error.message !== LARGE_REQUEST_CANCELED) {
+            dispatch(
+              setNotification({
+                status: error?.response?.status || 400,
+                id: Math.random(),
+                message: 'Failed to fetch jobs',
+                retry: () => refreshJobs(filters),
+                error
+              })
+            )
+          }
         })
     },
     [dispatch, fetchJobs, params.projectName]
@@ -297,7 +301,15 @@ const ScheduledJobs = ({
         </div>
       </div>
       {jobsStore.loading ? null : jobs.length === 0 ? (
-        <NoData message={getNoDataMessage(filtersStore, filters, JOBS_PAGE, SCHEDULE_TAB)} />
+        <NoData
+          message={getNoDataMessage(
+            filtersStore,
+            filters,
+            largeRequestErrorMessage,
+            JOBS_PAGE,
+            SCHEDULE_TAB
+          )}
+        />
       ) : (
         <>
           <Table
diff --git a/src/components/ModelsPage/ModelEndpoints/ModelEndpoints.js b/src/components/ModelsPage/ModelEndpoints/ModelEndpoints.js
index e54bdada5..09833ab59 100644
--- a/src/components/ModelsPage/ModelEndpoints/ModelEndpoints.js
+++ b/src/components/ModelsPage/ModelEndpoints/ModelEndpoints.js
@@ -31,12 +31,14 @@ import { createModelEndpointsRowData } from '../../../utils/createArtifactsConte
 import { fetchModelEndpoints, removeModelEndpoints } from '../../../reducers/artifactsReducer'
 import { generatePageData } from './modelEndpoints.util'
 import { isDetailsTabExists } from '../../../utils/isDetailsTabExists'
+import { largeResponseCatchHandler } from '../../../utils/largeResponseCatchHandler'
 import { setFilters } from '../../../reducers/filtersReducer'
 import { useModelsPage } from '../ModelsPage.context'
 
 import { ReactComponent as Yaml } from 'igz-controls/images/yaml.svg'
 
 const ModelEndpoints = () => {
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   const [modelEndpoints, setModelEndpoints] = useState([])
   const [selectedModelEndpoint, setSelectedModelEndpoint] = useState({})
   const artifactsStore = useSelector(store => store.artifactsStore)
@@ -71,13 +73,15 @@ const ModelEndpoints = () => {
           params: {
             metric: 'latency_avg_1h',
             start: 'now-10m'
-          }
+          },
+          setLargeRequestErrorMessage
         })
       )
         .unwrap()
         .then(result => {
           setModelEndpoints(result)
         })
+        .catch(largeResponseCatchHandler)
     },
     [dispatch, params.projectName]
   )
@@ -159,6 +163,7 @@ const ModelEndpoints = () => {
       artifactsStore={artifactsStore}
       fetchData={fetchData}
       filtersStore={filtersStore}
+      largeRequestErrorMessage={largeRequestErrorMessage}
       modelEndpoints={modelEndpoints}
       pageData={pageData}
       ref={modelEndpointsRef}
diff --git a/src/components/ModelsPage/ModelEndpoints/ModelEndpointsView.js b/src/components/ModelsPage/ModelEndpoints/ModelEndpointsView.js
index 20f4d63c2..764d310d2 100644
--- a/src/components/ModelsPage/ModelEndpoints/ModelEndpointsView.js
+++ b/src/components/ModelsPage/ModelEndpoints/ModelEndpointsView.js
@@ -38,6 +38,7 @@ const ModelEndpointsView = React.forwardRef(
       artifactsStore,
       fetchData,
       filtersStore,
+      largeRequestErrorMessage,
       modelEndpoints,
       pageData,
       selectedModelEndpoint,
@@ -64,7 +65,13 @@ const ModelEndpointsView = React.forwardRef(
             </div>
             {artifactsStore.loading ? null : modelEndpoints.length === 0 ? (
               <NoData
-                message={getNoDataMessage(filtersStore, filters, MODELS_PAGE, MODEL_ENDPOINTS_TAB)}
+                message={getNoDataMessage(
+                  filtersStore,
+                  filters,
+                  largeRequestErrorMessage,
+                  MODELS_PAGE,
+                  MODEL_ENDPOINTS_TAB
+                )}
               />
             ) : (
               <>
@@ -106,6 +113,7 @@ ModelEndpointsView.propTypes = {
   artifactsStore: PropTypes.object.isRequired,
   fetchData: PropTypes.func.isRequired,
   filtersStore: PropTypes.object.isRequired,
+  largeRequestErrorMessage: PropTypes.string.isRequired,
   modelEndpoints: PropTypes.arrayOf(PropTypes.object).isRequired,
   pageData: PropTypes.object.isRequired,
   selectedModelEndpoint: PropTypes.object.isRequired,
diff --git a/src/components/ModelsPage/Models/Models.js b/src/components/ModelsPage/Models/Models.js
index d315b5689..38a417279 100644
--- a/src/components/ModelsPage/Models/Models.js
+++ b/src/components/ModelsPage/Models/Models.js
@@ -68,6 +68,7 @@ import { useGetTagOptions } from '../../../hooks/useGetTagOptions.hook'
 import { getViewMode } from '../../../utils/helper'
 import { generateUri } from '../../../utils/resources'
 import { copyToClipboard } from '../../../utils/copyToClipboard'
+import { largeResponseCatchHandler } from '../../../utils/largeResponseCatchHandler'
 import { setDownloadItem, setShowDownloadsList } from '../../../reducers/downloadReducer'
 import { setArtifactTags } from '../../../utils/artifacts.util'
 import { useMode } from '../../../hooks/mode.hook'
@@ -82,6 +83,7 @@ import { ReactComponent as DownloadIcon } from 'igz-controls/images/download.svg
 const Models = ({ fetchModelFeatureVector }) => {
   const [models, setModels] = useState([])
   const [allModels, setAllModels] = useState([])
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   const [selectedModel, setSelectedModel] = useState({})
   const [selectedRowData, setSelectedRowData] = useState({})
   const [urlTagOption] = useGetTagOptions(null, filters, null, MODELS_FILTERS)
@@ -116,13 +118,16 @@ const Models = ({ fetchModelFeatureVector }) => {
 
   const fetchData = useCallback(
     async filters => {
-      return dispatch(fetchModels({ project: params.projectName, filters: filters }))
+      return dispatch(
+        fetchModels({ project: params.projectName, filters, setLargeRequestErrorMessage })
+      )
         .unwrap()
         .then(modelsResponse => {
           setArtifactTags(modelsResponse, setModels, setAllModels, filters, dispatch, MODELS_TAB)
 
           return modelsResponse
         })
+        .catch(largeResponseCatchHandler)
     },
     [dispatch, setModels, params.projectName]
   )
@@ -405,6 +410,7 @@ const Models = ({ fetchModelFeatureVector }) => {
       handleRegisterModel={handleRegisterModel}
       handleTrainModel={handleTrainModel}
       isDemoMode={isDemoMode}
+      largeRequestErrorMessage={largeRequestErrorMessage}
       models={models}
       pageData={pageData}
       ref={modelsRef}
diff --git a/src/components/ModelsPage/Models/ModelsView.js b/src/components/ModelsPage/Models/ModelsView.js
index 4b082cc04..7547d800a 100644
--- a/src/components/ModelsPage/Models/ModelsView.js
+++ b/src/components/ModelsPage/Models/ModelsView.js
@@ -40,9 +40,9 @@ const ModelsView = React.forwardRef(
   (
     {
       actionsMenu,
-      artifactsStore,
       applyDetailsChanges,
       applyDetailsChangesCallback,
+      artifactsStore,
       detailsFormInitialValues,
       filtersStore,
       handleExpandRow,
@@ -50,6 +50,7 @@ const ModelsView = React.forwardRef(
       handleRegisterModel,
       handleTrainModel,
       isDemoMode,
+      largeRequestErrorMessage,
       models,
       pageData,
       selectedModel,
@@ -103,6 +104,7 @@ const ModelsView = React.forwardRef(
                 message={getNoDataMessage(
                   filtersStore,
                   filters,
+                  largeRequestErrorMessage,
                   MODELS_PAGE,
                   MODELS_TAB,
                   MODELS_FILTERS
@@ -171,15 +173,16 @@ ModelsView.defaultProps = {
 
 ModelsView.propTypes = {
   actionsMenu: ACTIONS_MENU.isRequired,
-  artifactsStore: PropTypes.object.isRequired,
   applyDetailsChanges: PropTypes.func.isRequired,
   applyDetailsChangesCallback: PropTypes.func.isRequired,
+  artifactsStore: PropTypes.object.isRequired,
   filtersStore: PropTypes.object.isRequired,
   handleExpandRow: PropTypes.func.isRequired,
   handleRefresh: PropTypes.func.isRequired,
   handleRegisterModel: PropTypes.func.isRequired,
   handleTrainModel: PropTypes.func.isRequired,
   isDemoMode: PropTypes.bool.isRequired,
+  largeRequestErrorMessage: PropTypes.string.isRequired,
   models: PropTypes.arrayOf(PropTypes.object).isRequired,
   pageData: PropTypes.object.isRequired,
   selectedModel: PropTypes.object.isRequired,
diff --git a/src/components/ModelsPage/RealTimePipelines/RealTimePipelines.js b/src/components/ModelsPage/RealTimePipelines/RealTimePipelines.js
index 6d9e3cb16..82566bba0 100644
--- a/src/components/ModelsPage/RealTimePipelines/RealTimePipelines.js
+++ b/src/components/ModelsPage/RealTimePipelines/RealTimePipelines.js
@@ -28,6 +28,7 @@ import { fetchArtifactsFunctions, removePipelines } from '../../../reducers/arti
 import createFunctionsContent from '../../../utils/createFunctionsContent'
 import { cancelRequest } from '../../../utils/cancelRequest'
 import { generatePageData } from './realTimePipelines.util'
+import { largeResponseCatchHandler } from '../../../utils/largeResponseCatchHandler'
 import { getFunctionIdentifier } from '../../../utils/getUniqueIdentifier'
 import { setFilters } from '../../../reducers/filtersReducer'
 import { useGroupContent } from '../../../hooks/groupContent.hook'
@@ -36,6 +37,7 @@ import { useModelsPage } from '../ModelsPage.context'
 import { ReactComponent as Yaml } from 'igz-controls/images/yaml.svg'
 
 const RealTimePipelines = () => {
+  const [largeRequestErrorMessage, setLargeRequestErrorMessage] = useState('')
   const [pipelines, setPipelines] = useState([])
   const [selectedRowData, setSelectedRowData] = useState({})
   const artifactsStore = useSelector(store => store.artifactsStore)
@@ -62,7 +64,13 @@ const RealTimePipelines = () => {
 
   const fetchData = useCallback(
     filters => {
-      dispatch(fetchArtifactsFunctions({ project: params.projectName, filters }))
+      dispatch(
+        fetchArtifactsFunctions({
+          project: params.projectName,
+          filters,
+          setLargeRequestErrorMessage
+        })
+      )
         .unwrap()
         .then(result => {
           setPipelines(
@@ -72,6 +80,7 @@ const RealTimePipelines = () => {
             )
           )
         })
+        .catch(largeResponseCatchHandler)
     },
     [dispatch, params.projectName]
   )
@@ -166,6 +175,7 @@ const RealTimePipelines = () => {
       filtersStore={filtersStore}
       handleExpandAll={handleExpandAll}
       handleExpandRow={handleExpandRow}
+      largeRequestErrorMessage={largeRequestErrorMessage}
       pageData={pageData}
       params={params}
       pipelines={pipelines}
diff --git a/src/components/ModelsPage/RealTimePipelines/RealTimePipelinesView.js b/src/components/ModelsPage/RealTimePipelines/RealTimePipelinesView.js
index 13df7da1c..c533b6d77 100644
--- a/src/components/ModelsPage/RealTimePipelines/RealTimePipelinesView.js
+++ b/src/components/ModelsPage/RealTimePipelines/RealTimePipelinesView.js
@@ -32,6 +32,7 @@ import { filters } from './realTimePipelines.util'
 import { MODELS_PAGE, REAL_TIME_PIPELINES_TAB } from '../../../constants'
 import NoData from '../../../common/NoData/NoData'
 import { getNoDataMessage } from '../../../utils/getNoDataMessage'
+import { ACTIONS_MENU } from '../../../types'
 
 const RealTimePipelinesView = React.forwardRef(
   (
@@ -43,6 +44,7 @@ const RealTimePipelinesView = React.forwardRef(
       filtersStore,
       handleExpandAll,
       handleExpandRow,
+      largeRequestErrorMessage,
       pageData,
       params,
       pipelines,
@@ -80,6 +82,7 @@ const RealTimePipelinesView = React.forwardRef(
                 message={getNoDataMessage(
                   filtersStore,
                   filters,
+                  largeRequestErrorMessage,
                   MODELS_PAGE,
                   REAL_TIME_PIPELINES_TAB
                 )}
@@ -122,13 +125,14 @@ const RealTimePipelinesView = React.forwardRef(
 )
 
 RealTimePipelinesView.propTypes = {
-  actionsMenu: PropTypes.arrayOf(PropTypes.object).isRequired,
+  actionsMenu: ACTIONS_MENU.isRequired,
   artifactsStore: PropTypes.object.isRequired,
   expand: PropTypes.bool.isRequired,
   fetchData: PropTypes.func.isRequired,
   filtersStore: PropTypes.object.isRequired,
   handleExpandAll: PropTypes.func.isRequired,
   handleExpandRow: PropTypes.func.isRequired,
+  largeRequestErrorMessage: PropTypes.string.isRequired,
   pageData: PropTypes.object.isRequired,
   params: PropTypes.object.isRequired,
   pipelines: PropTypes.arrayOf(PropTypes.object).isRequired,
diff --git a/src/constants.js b/src/constants.js
index 8087fea1a..9ff980965 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -52,7 +52,7 @@ export const NAVBAR_WIDTH_OPENED = 245
 
 export const FULL_VIEW_MODE = 'full'
 
-export const REQUEST_CANCELED = 'Request canceled'
+export const LARGE_REQUEST_CANCELED = 'Request canceled'
 
 export const MODEL_PATH_DATA_INPUT = 'model_path'
 
diff --git a/src/httpClient.js b/src/httpClient.js
index 20fe8ff22..7ab8b9e5c 100755
--- a/src/httpClient.js
+++ b/src/httpClient.js
@@ -19,6 +19,10 @@ such restriction.
 */
 import axios from 'axios'
 import qs from 'qs'
+import { ConfirmDialog } from 'igz-controls/components'
+
+import { openPopUp } from 'igz-controls/utils/common.util'
+import { LARGE_REQUEST_CANCELED } from './constants'
 
 const headers = {
   'Cache-Control': 'no-cache'
@@ -48,3 +52,62 @@ export const iguazioHttpClient = axios.create({
   baseURL: process.env.NODE_ENV === 'production' ? '/api' : '/iguazio/api',
   headers
 })
+
+let requestId = 1
+let requestTimeouts = {}
+
+// Request interceptor
+mainHttpClient.interceptors.request.use(
+  config => {
+    if (config?.ui?.setLargeRequestErrorMessage) {
+      const cancelTokenSource = axios.CancelToken.source()
+
+      config.cancelToken = cancelTokenSource.token
+      requestTimeouts[requestId] = setTimeout(() => {
+        showLargeResponsePopUp(config.ui.setLargeRequestErrorMessage)
+        cancelTokenSource.cancel(LARGE_REQUEST_CANCELED)
+      }, 30000)
+      config.ui.requestId = requestId
+      requestId++
+    }
+
+    return config
+  },
+  error => Promise.reject(error)
+)
+
+// Response interceptor
+mainHttpClient.interceptors.response.use(
+  response => {
+    if (response.config?.ui?.requestId) {
+      const isLargeResponse =
+        response.data?.total_size >= 0
+          ? response.data.total_size > 1500
+          : Object.values(response.data)[0].length > 1500
+
+      clearTimeout(requestTimeouts[response.config.ui.requestId])
+      delete requestTimeouts[response.config.ui.requestId]
+
+      if (isLargeResponse) {
+        showLargeResponsePopUp(response.config.ui.setLargeRequestErrorMessage)
+
+        throw new Error(LARGE_REQUEST_CANCELED)
+      } else {
+        response.config.ui.setLargeRequestErrorMessage('')
+      }
+    }
+
+    return response
+  },
+  error => Promise.reject(error)
+)
+
+export const showLargeResponsePopUp = setLargeRequestErrorMessage => {
+  const errorMessage =
+    'The query result is too large to display. Add a filter (or narrow it) to retrieve fewer results.'
+
+  setLargeRequestErrorMessage(errorMessage)
+  openPopUp(ConfirmDialog, {
+    message: errorMessage
+  })
+}
diff --git a/src/layout/Content/Content.js b/src/layout/Content/Content.js
index c0f1b8a70..ee356766b 100644
--- a/src/layout/Content/Content.js
+++ b/src/layout/Content/Content.js
@@ -157,6 +157,7 @@ const Content = ({
               message={getNoDataMessage(
                 filtersStore,
                 pageData.filters,
+                null,
                 pageData.page,
                 params.pageTab
               )}
diff --git a/src/reducers/artifactsReducer.js b/src/reducers/artifactsReducer.js
index 8fc0f03e3..3b2f4b9bf 100644
--- a/src/reducers/artifactsReducer.js
+++ b/src/reducers/artifactsReducer.js
@@ -112,13 +112,18 @@ export const fetchDataSet = createAsyncThunk('fetchDataSet', ({ project, dataSet
     return generateArtifacts(filterArtifacts(result), DATASETS, response.data.artifacts)
   })
 })
-export const fetchDataSets = createAsyncThunk('fetchDataSets', ({ project, filters, config }) => {
-  return artifactsApi.getDataSets(project, filters, config).then(({ data }) => {
-    const result = parseArtifacts(data.artifacts)
+export const fetchDataSets = createAsyncThunk(
+  'fetchDataSets',
+  ({ project, filters, config, setLargeRequestErrorMessage }) => {
+    return artifactsApi
+      .getDataSets(project, filters, config, setLargeRequestErrorMessage)
+      .then(({ data }) => {
+        const result = parseArtifacts(data.artifacts)
 
-    return generateArtifacts(filterArtifacts(result), DATASETS, data.artifacts)
-  })
-})
+        return generateArtifacts(filterArtifacts(result), DATASETS, data.artifacts)
+      })
+  }
+)
 export const fetchFile = createAsyncThunk('fetchFile', ({ project, file, iter, tag }) => {
   return artifactsApi.getFile(project, file, iter, tag).then(response => {
     const result = parseArtifacts(response.data.artifacts)
@@ -126,28 +131,35 @@ export const fetchFile = createAsyncThunk('fetchFile', ({ project, file, iter, t
     return generateArtifacts(filterArtifacts(result), ARTIFACTS, response.data.artifacts)
   })
 })
-export const fetchFiles = createAsyncThunk('fetchFiles', ({ project, filters }) => {
-  return artifactsApi.getFiles(project, filters).then(({ data }) => {
-    const result = parseArtifacts(data.artifacts)
+export const fetchFiles = createAsyncThunk(
+  'fetchFiles',
+  ({ project, filters, setLargeRequestErrorMessage }) => {
+    return artifactsApi.getFiles(project, filters, setLargeRequestErrorMessage).then(({ data }) => {
+      const result = parseArtifacts(data.artifacts)
 
-    return generateArtifacts(filterArtifacts(result), ARTIFACTS, data.artifacts)
-  })
-})
+      return generateArtifacts(filterArtifacts(result), ARTIFACTS, data.artifacts)
+    })
+  }
+)
 export const fetchArtifactsFunctions = createAsyncThunk(
   'fetchArtifactsFunctions',
-  ({ project, filters }) => {
-    return functionsApi.getFunctions(project, filters).then(({ data }) => {
-      return parseFunctions(
-        data.funcs.filter(func => func.kind === FUNCTION_TYPE_SERVING && func.metadata.tag?.length)
-      )
-    })
+  ({ project, filters, setLargeRequestErrorMessage }) => {
+    return functionsApi
+      .getFunctions(project, filters, null, setLargeRequestErrorMessage)
+      .then(({ data }) => {
+        return parseFunctions(
+          data.funcs.filter(
+            func => func.kind === FUNCTION_TYPE_SERVING && func.metadata.tag?.length
+          )
+        )
+      })
   }
 )
 export const fetchModelEndpoints = createAsyncThunk(
   'fetchModelEndpoints',
-  ({ project, filters, params }) => {
+  ({ project, filters, params, setLargeRequestErrorMessage }) => {
     return artifactsApi
-      .getModelEndpoints(project, filters, params)
+      .getModelEndpoints(project, filters, params, setLargeRequestErrorMessage)
       .then(({ data: { endpoints = [] } }) => {
         return generateModelEndpoints(endpoints)
       })
@@ -160,12 +172,18 @@ export const fetchModel = createAsyncThunk('fetchModel', ({ project, model, iter
     return generateArtifacts(filterArtifacts(result), MODELS_TAB, response.data.artifacts)
   })
 })
-export const fetchModels = createAsyncThunk('fetchModels', ({ project, filters }) => {
-  return artifactsApi.getModels(project, filters).then(({ data }) => {
-    const result = filterArtifacts(parseArtifacts(data.artifacts))
-    return generateArtifacts(result, MODELS_TAB, data.artifacts)
-  })
-})
+export const fetchModels = createAsyncThunk(
+  'fetchModels',
+  ({ project, filters, setLargeRequestErrorMessage }) => {
+    return artifactsApi
+      .getModels(project, filters, setLargeRequestErrorMessage)
+      .then(({ data }) => {
+        const result = filterArtifacts(parseArtifacts(data.artifacts))
+
+        return generateArtifacts(result, MODELS_TAB, data.artifacts)
+      })
+  }
+)
 export const updateArtifact = createAsyncThunk('updateArtifact', ({ project, data }) => {
   return artifactsApi.updateArtifact(project, data)
 })
diff --git a/src/utils/getNoDataMessage.js b/src/utils/getNoDataMessage.js
index ef5aef3a6..732522ceb 100644
--- a/src/utils/getNoDataMessage.js
+++ b/src/utils/getNoDataMessage.js
@@ -96,7 +96,9 @@ const messageNamesList = {
   default: ''
 }
 
-export const getNoDataMessage = (filtersStore, filters, page, tab, filtersStoreKey) => {
+export const getNoDataMessage = (filtersStore, filters, defaultMessage, page, tab, filtersStoreKey) => {
+  if (defaultMessage) return defaultMessage
+
   const messageNames = messageNamesList[tab] || messageNamesList[page] || messageNamesList.default
 
   if (!messageNames) {
diff --git a/src/utils/largeResponseCatchHandler.js b/src/utils/largeResponseCatchHandler.js
new file mode 100644
index 000000000..ce37d957c
--- /dev/null
+++ b/src/utils/largeResponseCatchHandler.js
@@ -0,0 +1,26 @@
+/*
+Copyright 2019 Iguazio Systems Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License") with
+an addition restriction as set forth herein. You may not use this
+file except in compliance with the License. You may obtain a copy of
+the License at http://www.apache.org/licenses/LICENSE-2.0.
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+implied. See the License for the specific language governing
+permissions and limitations under the License.
+
+In addition, you may not use the software for any purposes that are
+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 { LARGE_REQUEST_CANCELED } from '../constants'
+
+export const largeResponseCatchHandler = error => {
+  if (error.message !== LARGE_REQUEST_CANCELED) {
+    throw error
+  }
+}

From 6f53b21f52c7112ab5ab8173ca17bce3ba010c3c Mon Sep 17 00:00:00 2001
From: Andrew Mavdryk <andrii.mavdryk@globallogic.com>
Date: Mon, 20 Nov 2023 17:25:02 +0200
Subject: [PATCH 12/14] Fix [Batch run] rename method to handler (#2082)

---
 src/components/JobWizard/JobWizard.util.js    | 76 +++++++++----------
 .../JobWizardDataInputs.js                    |  2 +-
 .../JobWizardFunctionSelection.js             |  4 +-
 .../jobWizardFunctionSelection.util.js        |  6 +-
 .../JobWizardParameters.js                    |  2 +-
 .../JobWizardRunDetails.js                    | 50 ++++++------
 6 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/components/JobWizard/JobWizard.util.js b/src/components/JobWizard/JobWizard.util.js
index 7926f9fbe..69f2f1f44 100644
--- a/src/components/JobWizard/JobWizard.util.js
+++ b/src/components/JobWizard/JobWizard.util.js
@@ -110,7 +110,7 @@ export const generateJobWizardData = (
   const functions = selectedFunctionData.functions
   const functionInfo = getFunctionInfo(selectedFunctionData)
   const defaultResources = frontendSpec?.default_function_pod_resources ?? {}
-  const functionParameters = getFunctionParameters(functions, functionInfo.method)
+  const functionParameters = getFunctionParameters(functions, functionInfo.handler)
   const [functionPriorityClassName] = getFunctionPriorityClass(functions)
   const [limits] = getLimits(functions)
   const [requests] = getRequests(functions)
@@ -125,7 +125,7 @@ export const generateJobWizardData = (
     ? getDefaultSchedule(defaultData.schedule)
     : scheduleDataInitialState
   const jobAdditionalData = {
-    methodOptions: functionInfo.methodOptions,
+    handlerOptions: functionInfo.handlerOptions,
     versionOptions: functionInfo.versionOptions
   }
   const currentLimits = parseLimits(limits, defaultResources.limits, gpuType)
@@ -135,8 +135,8 @@ export const generateJobWizardData = (
     [RUN_DETAILS_STEP]: {
       runName: functionInfo.name,
       version: functionInfo.version,
-      method: functionInfo.method,
-      methodData: functionInfo.methodData,
+      handler: functionInfo.handler,
+      handlerData: functionInfo.handlerData,
       labels: [],
       image: parseImageData(functionInfo.function, frontendSpec, currentProjectName)
     },
@@ -211,7 +211,7 @@ export const generateJobWizardDefaultData = (
   if (isEmpty(defaultData)) return [{}, {}]
 
   const runInfo = getRunDefaultInfo(defaultData, selectedFunctionData)
-  const functionParameters = getFunctionDefaultParameters(selectedFunctionData, runInfo.method)
+  const functionParameters = getFunctionDefaultParameters(selectedFunctionData, runInfo.handler)
   const [predefinedParameters, customParameters] = parseDefaultParameters(
     functionParameters,
     defaultData.task.spec.parameters,
@@ -225,7 +225,7 @@ export const generateJobWizardDefaultData = (
   const requests = defaultData.function.spec?.resources?.requests
   const gpuType = getLimitsGpuType(limits)
   const jobAdditionalData = {
-    methodOptions: runInfo.methodOptions,
+    handlerOptions: runInfo.handlerOptions,
     versionOptions: runInfo.versionOptions
   }
   const currentLimits = parseLimits(limits, defaultResources.limits, gpuType)
@@ -238,8 +238,8 @@ export const generateJobWizardDefaultData = (
     [RUN_DETAILS_STEP]: {
       runName: runInfo.name,
       version: runInfo.version,
-      method: runInfo.method,
-      methodData: runInfo.methodData,
+      handler: runInfo.handler,
+      handlerData: runInfo.handlerData,
       labels: runInfo.labels,
       image: parseImageData(selectedFunctionData, frontendSpec, currentProjectName)
     },
@@ -299,16 +299,16 @@ export const generateJobWizardDefaultData = (
   return [jobFormData, jobAdditionalData]
 }
 
-export const getMethodData = (selectedFunctionData, method) => {
+export const getHandlerData = (selectedFunctionData, handler) => {
   const currentFunction = selectedFunctionData?.functions
     ? chain(selectedFunctionData.functions).orderBy('metadata.updated', 'desc').get(0).value()
     : selectedFunctionData
-  const methodData = get(currentFunction, ['spec', 'entry_points', method], {})
-  const outputs = (methodData?.outputs ?? []).filter(output => !isEveryObjectValueEmpty(output))
+  const handlerData = get(currentFunction, ['spec', 'entry_points', handler], {})
+  const outputs = (handlerData?.outputs ?? []).filter(output => !isEveryObjectValueEmpty(output))
 
   return {
-    doc: methodData?.doc,
-    has_kwargs: methodData?.has_kwargs || false,
+    doc: handlerData?.doc,
+    has_kwargs: handlerData?.has_kwargs || false,
     outputs
   }
 }
@@ -318,10 +318,10 @@ const getFunctionInfo = selectedFunctionData => {
 
   if (!isEmpty(functions)) {
     const versionOptions = getVersionOptions(functions)
-    const methodOptions = getMethodOptions(functions)
-    const { defaultVersion, defaultMethod } = getDefaultMethodAndVersion(
+    const handlerOptions = getHandlerOptions(functions)
+    const { defaultVersion, defaultHandler } = getDefaultHandlerAndVersion(
       versionOptions,
-      methodOptions,
+      handlerOptions,
       functions
     )
     const currentFunctionVersion = selectedFunctionData.tag || defaultVersion
@@ -330,10 +330,10 @@ const getFunctionInfo = selectedFunctionData => {
 
     return {
       name: selectedFunctionData.name,
-      method: defaultMethod,
+      handler: defaultHandler,
       version: currentFunctionVersion,
-      methodData: getMethodData(currentFunction, defaultMethod),
-      methodOptions,
+      handlerData: getHandlerData(currentFunction, defaultHandler),
+      handlerOptions,
       versionOptions,
       function: currentFunction || {}
     }
@@ -344,15 +344,15 @@ const getRunDefaultInfo = (defaultData, selectedFunctionData) => {
   return {
     labels: parseChipsData(defaultData.task?.metadata?.labels),
     name: defaultData.task?.metadata?.name || '',
-    method: defaultData.task?.spec?.handler,
-    methodData: getMethodData(selectedFunctionData, defaultData.task?.spec?.handler),
-    methodOptions: [],
+    handler: defaultData.task?.spec?.handler,
+    handlerData: getHandlerData(selectedFunctionData, defaultData.task?.spec?.handler),
+    handlerOptions: [],
     version: '',
     versionOptions: []
   }
 }
 
-const getMethodOptions = selectedFunctions => {
+const getHandlerOptions = selectedFunctions => {
   return chain(selectedFunctions)
     .map(func => Object.values(func.spec?.entry_points ?? {}))
     .flatten()
@@ -379,47 +379,47 @@ const getVersionOptions = selectedFunctions => {
   return versionOptions.length ? versionOptions : [{ label: 'N/A', id: TAG_NA }]
 }
 
-const getDefaultMethod = (methodOptions, selectedFunctions) => {
-  let method = ''
+const getDefaultHandler = (handlerOptions, selectedFunctions) => {
+  let handler = ''
 
   const latestFunction = selectedFunctions.find(item => item.metadata.tag === TAG_LATEST)
 
-  if (methodOptions.length) {
-    method = methodOptions[0]?.id
+  if (handlerOptions.length) {
+    handler = handlerOptions[0]?.id
   } else if (latestFunction) {
-    method = latestFunction.spec.default_handler || FUNCTION_DEFAULT_HANDLER
+    handler = latestFunction.spec.default_handler || FUNCTION_DEFAULT_HANDLER
   } else {
-    method = selectedFunctions[0]?.spec.default_handler || FUNCTION_DEFAULT_HANDLER
+    handler = selectedFunctions[0]?.spec.default_handler || FUNCTION_DEFAULT_HANDLER
   }
 
-  return method
+  return handler
 }
 
-const getDefaultMethodAndVersion = (versionOptions, methodOptions, selectedFunctions) => {
+const getDefaultHandlerAndVersion = (versionOptions, handlerOptions, selectedFunctions) => {
   const defaultVersion =
     versionOptions.find(version => version.id === TAG_LATEST)?.id || versionOptions[0].id || ''
 
-  const defaultMethod = getDefaultMethod(methodOptions, selectedFunctions)
+  const defaultHandler = getDefaultHandler(handlerOptions, selectedFunctions)
 
   return {
     defaultVersion,
-    defaultMethod
+    defaultHandler
   }
 }
 
-export const getFunctionParameters = (selectedFunction, method) => {
+export const getFunctionParameters = (selectedFunction, handler) => {
   return chain(selectedFunction)
     .orderBy('metadata.updated', 'desc')
     .map(func => {
-      return func.spec.entry_points ? func.spec.entry_points[method]?.parameters ?? [] : []
+      return func.spec.entry_points ? func.spec.entry_points[handler]?.parameters ?? [] : []
     })
     .flatten()
     .unionBy('name')
     .value()
 }
 
-export const getFunctionDefaultParameters = (selectedFunction, method) => {
-  const functionParameters = get(selectedFunction, `spec.entry_points[${method}].parameters`, [])
+export const getFunctionDefaultParameters = (selectedFunction, handler) => {
+  const functionParameters = get(selectedFunction, `spec.entry_points[${handler}].parameters`, [])
 
   return keyBy(functionParameters, 'name')
 }
@@ -1081,7 +1081,7 @@ export const generateJobRequestData = (
         // secret_sources: formData[ADVANCED_STEP].secretSourcesTable.map(secretSource => {
         //   return { kind: secretSource.data.key, source: secretSource.data.value }
         // }),
-        handler: formData[RUN_DETAILS_STEP].method ?? '',
+        handler: formData[RUN_DETAILS_STEP].handler ?? '',
         input_path: formData[ADVANCED_STEP].inputPath ?? '',
         output_path: formData[ADVANCED_STEP].outputPath,
         function:
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardDataInputs/JobWizardDataInputs.js b/src/components/JobWizard/JobWizardSteps/JobWizardDataInputs/JobWizardDataInputs.js
index 88d4ff435..d752f42aa 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardDataInputs/JobWizardDataInputs.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardDataInputs/JobWizardDataInputs.js
@@ -35,7 +35,7 @@ const JobWizardDataInputs = ({ formState, stepIsActive }) => {
           exitEditModeTriggerItem={stepIsActive}
           fieldsPath={`${DATA_INPUTS_STEP}.dataInputsTable`}
           formState={formState}
-          rowCanBeAdded={formState.values.runDetails.methodData?.has_kwargs}
+          rowCanBeAdded={formState.values.runDetails.handlerData?.has_kwargs}
         />
       </div>
     </div>
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
index 589e2dcfd..5d0100b5a 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/JobWizardFunctionSelection.js
@@ -45,7 +45,7 @@ import { generateProjectsList } from '../../../../utils/projects'
 import { functionRunKinds } from '../../../Jobs/jobs.util'
 import { openConfirmPopUp } from 'igz-controls/utils/common.util'
 import {
-  filterTrainFunctionMethods,
+  filterTrainFunctionHandlers,
   FUNCTIONS_SELECTION_FUNCTIONS_TAB,
   FUNCTIONS_SELECTION_HUB_TAB,
   functionsSelectionTabs,
@@ -335,7 +335,7 @@ const JobWizardFunctionSelection = ({
       const functionTemplatePath = `${functionData.spec.item_uri}${functionData.spec.assets.function}`
 
       dispatch(functionsActions.fetchFunctionTemplate(functionTemplatePath)).then(result => {
-        const resultData = isTrain ? filterTrainFunctionMethods(result) : result
+        const resultData = isTrain ? filterTrainFunctionHandlers(result) : result
 
         setSelectedFunctionData(resultData)
         generateData(resultData)
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/jobWizardFunctionSelection.util.js b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/jobWizardFunctionSelection.util.js
index d9e2a8586..2333455cd 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/jobWizardFunctionSelection.util.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardFunctionSelection/jobWizardFunctionSelection.util.js
@@ -69,13 +69,13 @@ export const generateFunctionTemplateCardData = templateData => {
   return functionTemplateCardData
 }
 
-export const filterTrainFunctionMethods = result => {
-  const allowedMethods = trainModelAllowedHubFunctions[result.name]
+export const filterTrainFunctionHandlers = result => {
+  const allowedHandlers = trainModelAllowedHubFunctions[result.name]
   const { entry_points } = result.functions[0].spec
 
   if (entry_points) {
     result.functions[0].spec.entry_points = Object.fromEntries(
-      Object.entries(entry_points).filter(([key]) => allowedMethods.includes(key))
+      Object.entries(entry_points).filter(([key]) => allowedHandlers.includes(key))
     )
   }
 
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardParameters/JobWizardParameters.js b/src/components/JobWizard/JobWizardSteps/JobWizardParameters/JobWizardParameters.js
index 8a4b7bf35..a41cc69d9 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardParameters/JobWizardParameters.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardParameters/JobWizardParameters.js
@@ -70,7 +70,7 @@ const JobWizardParameters = ({ formState, stepIsActive }) => {
         fieldsPath={`${PARAMETERS_STEP}.parametersTable`}
         formState={formState}
         parametersFromPath={parametersFromPath}
-        rowCanBeAdded={formState.values.runDetails.methodData?.has_kwargs}
+        rowCanBeAdded={formState.values.runDetails.handlerData?.has_kwargs}
         withHyperparameters={
           hyperParametersAreEnabled && selectedFromValue === PARAMETERS_FROM_UI_VALUE
         }
diff --git a/src/components/JobWizard/JobWizardSteps/JobWizardRunDetails/JobWizardRunDetails.js b/src/components/JobWizard/JobWizardSteps/JobWizardRunDetails/JobWizardRunDetails.js
index 71bce426b..25b28b90a 100644
--- a/src/components/JobWizard/JobWizardSteps/JobWizardRunDetails/JobWizardRunDetails.js
+++ b/src/components/JobWizard/JobWizardSteps/JobWizardRunDetails/JobWizardRunDetails.js
@@ -48,7 +48,7 @@ import { getValidationRules } from 'igz-controls/utils/validation.util'
 import { openPopUp } from 'igz-controls/utils/common.util'
 import {
   getFunctionParameters,
-  getMethodData,
+  getHandlerData,
   parseDataInputs,
   parsePredefinedParameters
 } from '../../JobWizard.util'
@@ -64,10 +64,10 @@ const JobWizardRunDetails = ({
   selectedFunctionData,
   stepIsActive
 }) => {
-  const methodPath = `${RUN_DETAILS_STEP}.method`
+  const handlerPath = `${RUN_DETAILS_STEP}.handler`
   const imageSourcePath = `${RUN_DETAILS_STEP}.image.imageSource`
-  const outputsPath = `${RUN_DETAILS_STEP}.methodData.outputs`
-  const [spyOnMethodChange, setSpyOnMethodChange] = useState(true)
+  const outputsPath = `${RUN_DETAILS_STEP}.handlerData.outputs`
+  const [spyOnHandlerChange, setspyOnHandlerChange] = useState(true)
   const commonImageWarningMsg =
     'The image must include all the software packages that are required to run the function. ' +
     'For example, for an XGBoost model, ensure that the image includes the correct XGboost package and version'
@@ -80,13 +80,13 @@ const JobWizardRunDetails = ({
     [formState.values, imageSourcePath]
   )
 
-  const handleMethodChange = method => {
-    setSpyOnMethodChange(true)
+  const handleHandlerChange = handler => {
+    setspyOnHandlerChange(true)
 
-    const functionParameters = getFunctionParameters(selectedFunctionData.functions, method)
+    const functionParameters = getFunctionParameters(selectedFunctionData.functions, handler)
     const dataInputs = parseDataInputs(functionParameters, prePopulatedData?.dataInputs)
     const predefinedParameters = parsePredefinedParameters(functionParameters)
-    const methodData = getMethodData(selectedFunctionData, method)
+    const handlerData = getHandlerData(selectedFunctionData, handler)
 
     set(formState.initialValues, `${DATA_INPUTS_STEP}.dataInputsTable`, dataInputs)
     set(
@@ -94,18 +94,18 @@ const JobWizardRunDetails = ({
       `${PARAMETERS_STEP}.parametersTable.predefined`,
       predefinedParameters
     )
-    set(formState.initialValues, `${RUN_DETAILS_STEP}.methodData`, methodData)
+    set(formState.initialValues, `${RUN_DETAILS_STEP}.handlerData`, handlerData)
     formState.form.change(`${DATA_INPUTS_STEP}.dataInputsTable`, dataInputs)
     formState.form.change(`${PARAMETERS_STEP}.parametersTable.predefined`, predefinedParameters)
-    formState.form.change(`${RUN_DETAILS_STEP}.methodData`, methodData)
+    formState.form.change(`${RUN_DETAILS_STEP}.handlerData`, handlerData)
     formState.form.change(
       `${PARAMETERS_STEP}.parametersTable.custom`,
       get(formState.initialValues, `${PARAMETERS_STEP}.parametersTable.custom`, [])
     )
   }
 
-  const onMethodChange = (value, prevValue) => {
-    setSpyOnMethodChange(false)
+  const onHandlerChange = (value, prevValue) => {
+    setspyOnHandlerChange(false)
 
     const dataInputsAreChanged = areFormValuesChanged(
       formState.initialValues[DATA_INPUTS_STEP].dataInputsTable,
@@ -126,22 +126,22 @@ const JobWizardRunDetails = ({
           label: 'Cancel',
           variant: TERTIARY_BUTTON,
           handler: () => {
-            formState.form.change(methodPath, prevValue)
-            setSpyOnMethodChange(true)
+            formState.form.change(handlerPath, prevValue)
+            setspyOnHandlerChange(true)
           }
         },
         confirmButton: {
           label: 'OK',
           variant: SECONDARY_BUTTON,
           handler: () => {
-            handleMethodChange(value)
+            handleHandlerChange(value)
           }
         },
         header: 'Are you sure?',
         message: 'Changes made to the Data Inputs and Parameters sections will be lost'
       })
     } else {
-      handleMethodChange(value)
+      handleHandlerChange(value)
     }
   }
 
@@ -180,18 +180,18 @@ const JobWizardRunDetails = ({
             </div>
           )}
           {!isBatchInference ? (
-            jobAdditionalData.methodOptions?.length !== 0 ? (
+            jobAdditionalData.handlerOptions?.length !== 0 ? (
               <div className="form-col-1">
                 <FormSelect
-                  label="Method"
-                  name={methodPath}
-                  options={jobAdditionalData.methodOptions || []}
+                  label="Handler"
+                  name={handlerPath}
+                  options={jobAdditionalData.handlerOptions || []}
                   scrollToView={false}
                 />
               </div>
             ) : (
               <div className="form-col-1">
-                <FormInput label="Method" name={methodPath} disabled={isEditMode} />
+                <FormInput label="Handler" name={handlerPath} disabled={isEditMode} />
               </div>
             )
           ) : null}
@@ -268,10 +268,10 @@ const JobWizardRunDetails = ({
             </div>
           </>
         )}
-        {get(formState.values, `${RUN_DETAILS_STEP}.methodData.doc`, '') && (
+        {get(formState.values, `${RUN_DETAILS_STEP}.handlerData.doc`, '') && (
           <>
             <div className="form-row form-table-title">Description</div>
-            <div className="form-row">{formState.values[RUN_DETAILS_STEP].methodData.doc}</div>
+            <div className="form-row">{formState.values[RUN_DETAILS_STEP].handlerData.doc}</div>
           </>
         )}
         {get(formState.values, outputsPath, []).length > 0 && (
@@ -310,8 +310,8 @@ const JobWizardRunDetails = ({
           </>
         )}
 
-        {stepIsActive && spyOnMethodChange && (
-          <OnChange name={methodPath}>{onMethodChange}</OnChange>
+        {stepIsActive && spyOnHandlerChange && (
+          <OnChange name={handlerPath}>{onHandlerChange}</OnChange>
         )}
       </div>
     )

From 20e15128d210c669867a09d34c2e6dbf4f01d23b Mon Sep 17 00:00:00 2001
From: Ilank <63646693+ilan7empest@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:26:30 +0800
Subject: [PATCH 13/14] Fix [Breadcrumbs] page crash when project list is not
 loaded (#2089)

---
 src/common/Breadcrumbs/Breadcrumbs.js         | 2 +-
 src/elements/TableLinkCell/tableLinkCell.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/Breadcrumbs/Breadcrumbs.js b/src/common/Breadcrumbs/Breadcrumbs.js
index 40c045a24..7cefb41e2 100755
--- a/src/common/Breadcrumbs/Breadcrumbs.js
+++ b/src/common/Breadcrumbs/Breadcrumbs.js
@@ -95,7 +95,7 @@ const Breadcrumbs = ({ onClick, projectStore, fetchProjectsNames }) => {
     searchValue
       ? projectListRef.current.scrollTo({ top: 0, left: 0, behavior: 'smooth' })
       : setTimeout(() => {
-          selectedOptionEl.scrollIntoView(
+          selectedOptionEl?.scrollIntoView(
             {
               behavior: 'smooth',
               block: 'center'
diff --git a/src/elements/TableLinkCell/tableLinkCell.scss b/src/elements/TableLinkCell/tableLinkCell.scss
index 777469ab1..9aecb5402 100644
--- a/src/elements/TableLinkCell/tableLinkCell.scss
+++ b/src/elements/TableLinkCell/tableLinkCell.scss
@@ -49,6 +49,7 @@
       font-family: Roboto, sans-serif;
       font-style: normal;
       margin-top: 5px;
+      width: max-content;
 
       & > span {
         margin-right: 10px;

From bbf1f23d7981f6b2f81cf6fc7be77230380b1aeb Mon Sep 17 00:00:00 2001
From: Ilank <63646693+ilan7empest@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:26:48 +0800
Subject: [PATCH 14/14] Fix [UI] create feature set - schema entities tool tip
 is not red (#2088)

---
 src/common/Input/input.scss | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/common/Input/input.scss b/src/common/Input/input.scss
index a08008ae7..85db53b08 100644
--- a/src/common/Input/input.scss
+++ b/src/common/Input/input.scss
@@ -134,8 +134,14 @@
     background-color: transparent;
     pointer-events: none;
 
+    label {
+      display: flex;
+      align-items: center;
+    }
+
     &-mandatory {
       color: $amaranth;
+      margin-left: 2px;
 
       &_disabled {
         color: $spunPearl;
@@ -143,15 +149,16 @@
     }
 
     &.active-label {
-      top: 9px;
+      top: 8px;
       height: auto;
       font-weight: 700;
       font-size: 10px;
       line-height: 12px;
       pointer-events: auto;
 
-      .input__label-mandatory:not(.input__label-mandatory_disabled) {
-        color: $topaz;
+      .input__label-mandatory,
+      .input__label-mandatory_disabled {
+        font-size: 13px;
       }
     }