mirror of
				https://github.com/ClusterCockpit/cc-backend
				synced 2025-10-31 07:55:06 +01:00 
			
		
		
		
	small fixes, set analysisView config defaults
This commit is contained in:
		| @@ -82,27 +82,21 @@ | |||||||
|   let colWidth1 = $state(0); |   let colWidth1 = $state(0); | ||||||
|   let colWidth2 = $state(0); |   let colWidth2 = $state(0); | ||||||
|   let jobFilters = $state([]); |   let jobFilters = $state([]); | ||||||
|   let metricsInHistograms = $state(ccconfig.analysisView_histogramMetrics) |   let metricsInHistograms = $state(ccconfig?.analysisView_histogramMetrics || []) | ||||||
|   let metricsInScatterplots = $state(ccconfig.analysisView_scatterPlotMetrics) |   let metricsInScatterplots = $state(ccconfig?.analysisView_scatterPlotMetrics || []) | ||||||
|   let sortSelection = $state( |   let sortSelection = $state( | ||||||
|     sortOptions.find( |     sortOptions.find( | ||||||
|       (option) => |       (option) => | ||||||
|         option.key == |         option.key == | ||||||
|         ccconfig[`analysisView_selectedTopCategory:${filterPresets.cluster}`], |         ccconfig[`analysisView_selectedTopCategory:${filterPresets.cluster}`], | ||||||
|     ) || |     ) || sortOptions[0] | ||||||
|     sortOptions.find( |  | ||||||
|       (option) => option.key == ccconfig.analysisView_selectedTopCategory, |  | ||||||
|     ) |  | ||||||
|   ); |   ); | ||||||
|   let groupSelection = $state( |   let groupSelection = $state( | ||||||
|       groupOptions.find( |       groupOptions.find( | ||||||
|         (option) => |         (option) => | ||||||
|           option.key == |           option.key == | ||||||
|           ccconfig[`analysisView_selectedTopEntity:${filterPresets.cluster}`], |           ccconfig[`analysisView_selectedTopEntity:${filterPresets.cluster}`], | ||||||
|       ) || |       ) || groupOptions[0] | ||||||
|       groupOptions.find( |  | ||||||
|         (option) => option.key == ccconfig.analysisView_selectedTopEntity, |  | ||||||
|       ) |  | ||||||
|   ); |   ); | ||||||
|  |  | ||||||
|   /* Init Function */ |   /* Init Function */ | ||||||
|   | |||||||
| @@ -136,7 +136,7 @@ | |||||||
|       startTimeQuickSelect |       startTimeQuickSelect | ||||||
|       bind:this={filterComponent} |       bind:this={filterComponent} | ||||||
|       {filterPresets} |       {filterPresets} | ||||||
|       menuText="Only {type.toLowerCase()}s with jobs that match the filters will show up" |       menuText="Only {type.toLowerCase()}s with matching jobs will be displayed." | ||||||
|       applyFilters={(detail) => { |       applyFilters={(detail) => { | ||||||
|         jobFilters = detail.filters; |         jobFilters = detail.filters; | ||||||
|       }} |       }} | ||||||
|   | |||||||
| @@ -98,13 +98,6 @@ | |||||||
|     return [] |     return [] | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
|   // $inspect('System', systemMetrics) |  | ||||||
|   // $inspect('List', selectedMetrics) |  | ||||||
|   // $inspect('Overview', selectedMetric) |  | ||||||
|   // console.log('Config', ccconfig) |  | ||||||
|   // console.log('Config List', ccconfig[`nodeOverview_selectedMetrics:${cluster}`], cluster) |  | ||||||
|   // console.log('Config Overview', ccconfig[`nodeOverview_selectedMetric:${cluster}`], cluster) |  | ||||||
|  |  | ||||||
|   /* Effects */ |   /* Effects */ | ||||||
|   $effect(() => { |   $effect(() => { | ||||||
|     if (displayNodeOverview) { |     if (displayNodeOverview) { | ||||||
|   | |||||||
| @@ -294,11 +294,12 @@ | |||||||
|         Filters |         Filters | ||||||
|       </DropdownToggle> |       </DropdownToggle> | ||||||
|       <DropdownMenu> |       <DropdownMenu> | ||||||
|         <DropdownItem header>Manage Filters</DropdownItem> |  | ||||||
|         {#if menuText} |         {#if menuText} | ||||||
|  |           <DropdownItem header>Note</DropdownItem> | ||||||
|           <DropdownItem disabled>{menuText}</DropdownItem> |           <DropdownItem disabled>{menuText}</DropdownItem> | ||||||
|           <DropdownItem divider /> |           <DropdownItem divider /> | ||||||
|         {/if} |         {/if} | ||||||
|  |         <DropdownItem header>Manage Filters</DropdownItem> | ||||||
|         <DropdownItem onclick={() => (isClusterOpen = true)}> |         <DropdownItem onclick={() => (isClusterOpen = true)}> | ||||||
|           <Icon name="cpu" /> Cluster/Partition |           <Icon name="cpu" /> Cluster/Partition | ||||||
|         </DropdownItem> |         </DropdownItem> | ||||||
| @@ -325,7 +326,7 @@ | |||||||
|         </DropdownItem> |         </DropdownItem> | ||||||
|         {#if startTimeQuickSelect} |         {#if startTimeQuickSelect} | ||||||
|           <DropdownItem divider /> |           <DropdownItem divider /> | ||||||
|           <DropdownItem disabled>Start Time Quick Selection</DropdownItem> |           <DropdownItem header>Start Time Quick Selection</DropdownItem> | ||||||
|           {#each startTimeSelectOptions.filter((stso) => stso.range !== "") as { rangeLabel, range }} |           {#each startTimeSelectOptions.filter((stso) => stso.range !== "") as { rangeLabel, range }} | ||||||
|             <DropdownItem |             <DropdownItem | ||||||
|               onclick={() => { |               onclick={() => { | ||||||
|   | |||||||
| @@ -170,7 +170,7 @@ | |||||||
|  |  | ||||||
| <tr> | <tr> | ||||||
|   <td> |   <td> | ||||||
|     <JobInfo {job} bind:isSelected showSelect/> |     <JobInfo {job} bind:isSelected showJobSelect/> | ||||||
|   </td> |   </td> | ||||||
|   {#if job.monitoringStatus == 0 || job.monitoringStatus == 2} |   {#if job.monitoringStatus == 0 || job.monitoringStatus == 2} | ||||||
|     <td colspan={metrics.length}> |     <td colspan={metrics.length}> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user