Merge branch 'development' of https://github.com/mlrun/ui into develo…

…pment
mariana-furyk · Feb 13, 2025 · 625132f · 625132f
2 parents 4228de1 + 643eda4
commit 625132f
Show file tree

Hide file tree

Showing 110 changed files with 4,764 additions and 3,357 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,8 @@
 # limitations under the License.
 #
 # build stage
-FROM quay.io/mlrun/node:14-alpine as build-stage
+# node:20.18.2-alpine used as 20-alpine
+FROM quay.io/mlrun/node:20-alpine	 as build-stage
 
 RUN apk update && \
 	apk upgrade && \

diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "final-form-arrays": "^3.1.0",
     "fs-extra": "^10.0.0",
     "identity-obj-proxy": "^3.0.0",
-    "iguazio.dashboard-react-controls": "2.2.18",
+    "iguazio.dashboard-react-controls": "2.2.19",
     "is-wsl": "^1.1.0",
     "js-base64": "^2.5.2",
     "js-yaml": "^4.1.0",

diff --git a/src/App.js b/src/App.js
@@ -63,11 +63,13 @@ import './scss/main.scss'
 import { createPortal } from 'react-dom'
 
 import Notifications from './common/Notifications/Notifications'
+import { useMode } from './hooks/mode.hook'
 
 const Page = lazyRetry(() => import('./layout/Page/Page'))
 const Datasets = lazyRetry(() => import('./components/Datasets/Datasets'))
 const FeatureStore = lazyRetry(() => import('./components/FeatureStore/FeatureStore'))
 const Files = lazyRetry(() => import('./components/Files/Files'))
+const FunctionsOld = lazyRetry(() => import('./components/FunctionsPageOld/FunctionsOld')) // todo [functionsWithPagination] delete FunctionsOld and other related logic in 1.9.0
 const Functions = lazyRetry(() => import('./components/FunctionsPage/Functions'))
 const Jobs = lazyRetry(() => import('./components/Jobs/Jobs'))
 const MonitorJobs = lazyRetry(() => import('./components/Jobs/MonitorJobs/MonitorJobs'))
@@ -119,6 +121,7 @@ const Documents = lazyRetry(() => import('./components/Documents/Documents'))
 
 const App = () => {
   const { isNuclioModeDisabled } = useNuclioMode()
+  const { isDemoMode } = useMode()
   const isHeaderShown = localStorageService.getStorageValue('mlrunUi.headerHidden') !== 'true'
   const mlAppContainerClasses = classNames('ml-app-container', isHeaderShown && 'has-header')
 
@@ -216,16 +219,29 @@ const App = () => {
             <Route path={`${SCHEDULE_TAB}`} element={<ScheduledJobs />} />
             <Route path="*" element={<Navigate to={MONITOR_JOBS_TAB} />} replace />
           </Route>
-          {[
-            'projects/:projectName/functions',
-            'projects/:projectName/functions/:funcName/:id/:tab',
-            `projects/:projectName/functions/:funcName/${ALL_VERSIONS_PATH}`,
-            `projects/:projectName/functions/:funcName/${ALL_VERSIONS_PATH}/:id/:tab`
-          ].map((path, index) => (
-            <Fragment key={index}>
-              <Route path={path} element={<Functions isAllVersions={[2, 3].includes(index)} />} />
-            </Fragment>
-          ))}
+          {isDemoMode
+            ? [
+                'projects/:projectName/functions',
+                'projects/:projectName/functions/:funcName/:id/:tab',
+                `projects/:projectName/functions/:funcName/${ALL_VERSIONS_PATH}`,
+                `projects/:projectName/functions/:funcName/${ALL_VERSIONS_PATH}/:id/:tab`
+              ].map((path, index) => (
+                <Fragment key={index}>
+                  <Route
+                    path={path}
+                    element={<Functions isAllVersions={[2, 3].includes(index)} />}
+                  />
+                </Fragment>
+              ))
+            : [
+                'projects/:projectName/functions',
+                'projects/:projectName/functions/:hash/:tab',
+                'projects/:projectName/functions/:funcName/:tag/:tab'
+              ].map((path, index) => (
+                <Fragment key={index}>
+                  <Route path={path} element={<FunctionsOld />} />
+                </Fragment>
+              ))}
           {[
             'projects/:projectName/datasets',
             'projects/:projectName/datasets/:datasetName/:id/:tab',