fixed testing bugs

mlrun · Oct 29, 2024 · 339525d · 339525d
1 parent e25076f
commit 339525d
Show file tree

Hide file tree

Showing 21 changed files with 244 additions and 133 deletions.
diff --git a/src/components/ActionBar/ActionBar.js b/src/components/ActionBar/ActionBar.js
@@ -332,6 +332,7 @@ const ActionBar = ({
                   !actionButton.hidden &&
                   (actionButton.template || (
                     <Button
+                      disabled={actionButton.disabled}
                       key={index}
                       variant={actionButton.variant}
                       label={actionButton.label}

diff --git a/src/components/Jobs/Jobs.js b/src/components/Jobs/Jobs.js
@@ -64,6 +64,7 @@ const Jobs = ({ fetchAllJobRuns, fetchJobFunction, fetchJobs }) => {
   const jobsStore = useSelector(store => store.jobsStore)
   const workflowsStore = useSelector(store => store.workflowsStore)
   const artifactsStore = useSelector(store => store.artifactsStore)
+  const appStore = useSelector(store => store.appStore)
 
   const {
     abortControllerRef,
@@ -76,6 +77,7 @@ const Jobs = ({ fetchAllJobRuns, fetchJobFunction, fetchJobs }) => {
     jobs,
     jobWizardIsOpened,
     jobWizardMode,
+    handleMonitoring,
     handleRerunJob,
     refreshJobs,
     refreshScheduled,
@@ -181,6 +183,17 @@ const Jobs = ({ fetchAllJobRuns, fetchJobFunction, fetchJobs }) => {
                     label: actionButtonHeader,
                     onClick: handleActionsMenuClick,
                     variant: PRIMARY_BUTTON
+                  },
+                  {
+                    className: 'action-button',
+                    label: 'Resource monitoring',
+                    hidden: selectedTab !== MONITOR_JOBS_TAB,
+                    tooltip: !appStore.frontendSpec.jobs_dashboard_url
+                      ? 'Grafana service unavailable'
+                      : '',
+                    variant: TERTIARY_BUTTON,
+                    disabled: !appStore.frontendSpec.jobs_dashboard_url,
+                    onClick: () => handleMonitoring()
                   }
                 ]}
                 autoRefreshIsEnabled={selectedTab === MONITOR_JOBS_TAB}
@@ -215,6 +228,7 @@ const Jobs = ({ fetchAllJobRuns, fetchJobFunction, fetchJobs }) => {
                   refreshScheduled,
                   requestErrorMessage,
                   scheduledJobs,
+                  scheduledFiltersConfig: tabData[SCHEDULE_TAB].filtersConfig,
                   setAbortingJobs,
                   setConfirmData,
                   setEditableItem,
@@ -224,7 +238,8 @@ const Jobs = ({ fetchAllJobRuns, fetchJobFunction, fetchJobs }) => {
                   setJobs,
                   setScheduledJobs,
                   setSelectedRunProject,
-                  terminateAbortTasksPolling
+                  terminateAbortTasksPolling,
+                  workflowsFiltersConfig: tabData[MONITOR_WORKFLOWS_TAB].filtersConfig
                 }}
               >
                 <Outlet />

diff --git a/src/components/Jobs/MonitorJobs/JobsFilters.js b/src/components/Jobs/MonitorJobs/JobsFilters.js
@@ -42,7 +42,12 @@ const JobsFilters = () => {
         <FormSelect label="Type" name="type" options={generateTypeFilter()} />
       </div>
       <div className="form-row">
-        <FormInput label="Labels" name={LABELS_FILTER} placeholder="key1,key2=value,..." />
+        <FormInput
+          label="Labels"
+          name={LABELS_FILTER}
+          placeholder="key1,key2=value,..."
+          tip="Add ~ before the filter value to return substring and case insensitive value."
+        />
         <FormOnChange
           handler={value => handleInputChange(value, LABELS_FILTER)}
           name={LABELS_FILTER}

diff --git a/src/components/Jobs/MonitorJobs/MonitorJobs.js b/src/components/Jobs/MonitorJobs/MonitorJobs.js
@@ -134,6 +134,7 @@ const MonitorJobs = () => {
         abortingJobs={abortingJobs}
         ref={{ abortJobRef }}
         context={JobsContext}
+        filterMenuName={MONITOR_JOBS_TAB}
         filters={filters}
         jobRuns={jobRuns}
         jobs={jobs}

diff --git a/src/components/Jobs/MonitorWorkflows/MonitorWorkflows.js b/src/components/Jobs/MonitorWorkflows/MonitorWorkflows.js
@@ -129,6 +129,7 @@ const MonitorWorkflows = ({ deleteWorkflows, fetchFunctionLogs }) => {
         backLink={`/projects/${params.projectName}/jobs/${MONITOR_WORKFLOWS_TAB}`}
         context={JobsContext}
         fetchFunctionLogs={fetchFunctionLogs}
+        filterMenuName={MONITOR_WORKFLOWS_TAB}
         filtersConfig={workflowsFiltersConfig}
         getWorkflows={getWorkflows}
         itemIsSelected={itemIsSelected}

diff --git a/src/components/Jobs/MonitorWorkflows/WorkflowsFilters.js b/src/components/Jobs/MonitorWorkflows/WorkflowsFilters.js
@@ -42,7 +42,12 @@ const WorkflowsFilters = () => {
       </div>
       {isDemoMode && (
         <div className="form-row">
-          <FormInput label="Labels" name={LABELS_FILTER} placeholder="key1,key2=value,..." />
+          <FormInput
+            label="Labels"
+            name={LABELS_FILTER}
+            placeholder="key1,key2=value,..."
+            tip="Add ~ before the filter value to return substring and case insensitive value."
+          />
           <FormOnChange
             handler={value => handleInputChange(value, LABELS_FILTER)}
             name={LABELS_FILTER}

diff --git a/src/components/Jobs/MonitorWorkflows/monitorWorkflows.util.js b/src/components/Jobs/MonitorWorkflows/monitorWorkflows.util.js
@@ -43,7 +43,7 @@ import {
   detailsMenu as functionsDetailsMenu,
   infoHeaders as functionsInfoHeaders
 } from '../../FunctionsPage/functions.util'
-import { datePickerPastOptions, PAST_WEEK_DATE_OPTION } from '../../../utils/datePicker.util'
+import { datePickerPastOptions, PAST_24_HOUR_DATE_OPTION } from '../../../utils/datePicker.util'
 import { isEveryObjectValueEmpty } from '../../../utils/isEveryObjectValueEmpty'
 
 import { ReactComponent as MonitorIcon } from 'igz-controls/images/monitor-icon.svg'
@@ -176,19 +176,19 @@ export const fetchInitialWorkflows = debounce(
           getWorkflows(filters)
           dispatch(setFilters(filters))
         } else if (workflowsLength === 0) {
-          const pastWeekOption = datePickerPastOptions.find(
-            option => option.id === PAST_WEEK_DATE_OPTION
+          const past24HourOption = datePickerPastOptions.find(
+            option => option.id === PAST_24_HOUR_DATE_OPTION
           )
-          const generatedDates = [...pastWeekOption.handler()]
+          const generatedDates = [...past24HourOption.handler()]
 
           if (generatedDates.length === 1) {
             generatedDates.push(new Date())
           }
           const filters = {
             dates: {
               value: generatedDates,
-              isPredefined: pastWeekOption.isPredefined,
-              initialSelectedOptionId: pastWeekOption.id
+              isPredefined: past24HourOption.isPredefined,
+              initialSelectedOptionId: past24HourOption.id
             },
             state: FILTER_ALL_ITEMS,
             groupBy: GROUP_BY_WORKFLOW

diff --git a/src/components/Jobs/ScheduledJobs/ScheduledJobs.js b/src/components/Jobs/ScheduledJobs/ScheduledJobs.js
@@ -50,7 +50,7 @@ const ScheduledJobs = () => {
   useEffect(() => {
     if (!dataIsLoaded) {
       refreshJobs({
-        ...schedulesFilterMenu,
+        ...schedulesFilterMenu.values,
         ...schedulesFilterMenuModal.values
       })
       setDataIsLoaded(true)
@@ -74,6 +74,7 @@ const ScheduledJobs = () => {
   return (
     <ScheduledJobsTable
       context={JobsContext}
+      filterMenuName={SCHEDULE_TAB}
       filtersConfig={scheduledFiltersConfig}
       jobs={scheduledJobs}
       requestErrorMessage={requestErrorMessage}

diff --git a/src/components/Jobs/ScheduledJobs/ScheduledJobsFilters.js b/src/components/Jobs/ScheduledJobs/ScheduledJobsFilters.js
@@ -38,7 +38,12 @@ const ScheduledJobsFilters = () => {
         <FormSelect label="Type" name="type" options={filterScheduledTypeOptions} />
       </div>
       <div className="form-row">
-        <FormInput label="Labels" name={LABELS_FILTER} placeholder="key1,key2=value,..." />
+        <FormInput
+          label="Labels"
+          name={LABELS_FILTER}
+          placeholder="key1,key2=value,..."
+          tip="Add ~ before the filter value to return substring and case insensitive value."
+        />
         <FormOnChange
           handler={value => handleInputChange(value, LABELS_FILTER)}
           name={LABELS_FILTER}

diff --git a/src/components/Jobs/jobs.util.js b/src/components/Jobs/jobs.util.js
@@ -76,7 +76,7 @@ export const getInfoHeaders = (isSpark, selectedJob) => {
 
   return infoHeaders
 }
-export const actionButtonHeader = 'Batch run'
+export const actionButtonHeader = 'Batch Run'
 
 export const JOB_STEADY_STATES = ['completed', 'error', 'aborted', 'failed']
 export const JOB_RUNNING_STATES = ['running', 'pending']

diff --git a/src/components/ProjectsJobsMonitoring/JobsMonitoring/JobsMonitoringFilters.js b/src/components/ProjectsJobsMonitoring/JobsMonitoring/JobsMonitoringFilters.js
@@ -49,7 +49,12 @@ const JobsMonitoringFilters = () => {
         <FormSelect label="Type" name="type" options={generateTypeFilter()} />
       </div>
       <div className="form-row">
-        <FormInput label="Labels" name={LABELS_FILTER} placeholder="key1,key2=value,..." />
+        <FormInput
+          label="Labels"
+          name={LABELS_FILTER}
+          placeholder="key1,key2=value,..."
+          tip="Add ~ before the filter value to return substring and case insensitive value."
+        />
         <FormOnChange
           handler={value => handleInputChange(value, LABELS_FILTER)}
           name={LABELS_FILTER}

diff --git a/src/components/ProjectsJobsMonitoring/ScheduledMonitoring/ScheduledMonitoring.js b/src/components/ProjectsJobsMonitoring/ScheduledMonitoring/ScheduledMonitoring.js
@@ -73,7 +73,7 @@ const ScheduledMonitoring = () => {
     <ScheduledJobsTable
       context={ProjectJobsMonitoringContext}
       filtersConfig={scheduledFiltersConfig}
-      filtersMenuName={JOBS_MONITORING_SCHEDULED_TAB}
+      filterMenuName={JOBS_MONITORING_SCHEDULED_TAB}
       jobs={scheduledJobs}
       requestErrorMessage={requestErrorMessage}
       refreshJobs={() =>

diff --git a/src/components/ProjectsJobsMonitoring/ScheduledMonitoring/ScheduledMonitoringFilters.js b/src/components/ProjectsJobsMonitoring/ScheduledMonitoring/ScheduledMonitoringFilters.js
@@ -45,7 +45,12 @@ const ScheduledMonitoringFilters = () => {
         <FormSelect label="Type" name="type" options={filterScheduledTypeOptions} />
       </div>
       <div className="form-row">
-        <FormInput label="Labels" name={LABELS_FILTER} placeholder="key1,key2=value,..." />
+        <FormInput
+          label="Labels"
+          name={LABELS_FILTER}
+          placeholder="key1,key2=value,..."
+          tip="Add ~ before the filter value to return substring and case insensitive value."
+        />
         <FormOnChange
           handler={value => handleInputChange(value, LABELS_FILTER)}
           name={LABELS_FILTER}

diff --git a/src/components/ProjectsJobsMonitoring/WorkflowsMonitoring/WorkflowsMonitoringFilters.js b/src/components/ProjectsJobsMonitoring/WorkflowsMonitoring/WorkflowsMonitoringFilters.js
@@ -49,7 +49,12 @@ const WorkflowsMonitoringFilters = () => {
       </div>
       {isDemoMode && (
         <div className="form-row">
-          <FormInput label="Labels" name={LABELS_FILTER} placeholder="key1,key2=value,..." />
+          <FormInput
+            label="Labels"
+            name={LABELS_FILTER}
+            placeholder="key1,key2=value,..."
+            tip="Add ~ before the filter value to return substring and case insensitive value."
+          />
           <FormOnChange
             handler={value => handleInputChange(value, LABELS_FILTER)}
             name={LABELS_FILTER}

diff --git a/src/elements/JobsTable/JobsTable.js b/src/elements/JobsTable/JobsTable.js
@@ -208,9 +208,12 @@ const JobsTable = React.forwardRef(
       [dispatch, modifyAndSelectRun, navigate, navigateLink, params.jobId]
     )
 
-    const refreshRun = useCallback((selectedItem) => {
-      fetchRun(selectedItem.project)
-    }, [fetchRun])
+    const refreshRun = useCallback(
+      selectedItem => {
+        fetchRun(selectedItem.project)
+      },
+      [fetchRun]
+    )
 
     const onAbortJob = useCallback(
       job => {

diff --git a/src/elements/ScheduledJobsTable/ScheduledJobsTable.js b/src/elements/ScheduledJobsTable/ScheduledJobsTable.js
@@ -53,7 +53,7 @@ const ScheduledJobsTable = ({
   context,
   filters = null,
   filtersConfig = null,
-  filtersMenuName = '',
+  filterMenuName = '',
   jobs,
   refreshJobs,
   requestErrorMessage,
@@ -263,7 +263,7 @@ const ScheduledJobsTable = ({
             requestErrorMessage,
             JOBS_PAGE,
             SCHEDULE_TAB,
-            filtersMenuName
+            filterMenuName
           )}
         />
       ) : (
@@ -297,7 +297,7 @@ ScheduledJobsTable.propTypes = {
   context: PropTypes.object.isRequired,
   filters: PropTypes.array,
   filtersConfig: FILTERS_CONFIG,
-  filtersMenuName: PropTypes.string,
+  filterMenuName: PropTypes.string,
   jobs: PropTypes.array.isRequired,
   refreshJobs: PropTypes.func.isRequired,
   requestErrorMessage: PropTypes.string.isRequired,