mirror of
				https://github.com/ClusterCockpit/cc-backend
				synced 2025-11-04 09:35:07 +01:00 
			
		
		
		
	Centralize project filter for manager role
- Remove all unnecessary frontend code for managerfilters
This commit is contained in:
		@@ -23,25 +23,12 @@
 | 
			
		||||
    export let sorting = { field: "startTime", order: "DESC" }
 | 
			
		||||
    export let matchedJobs = 0
 | 
			
		||||
    export let metrics = ccconfig.plot_list_selectedMetrics
 | 
			
		||||
    export let projects = []
 | 
			
		||||
    export let isManager
 | 
			
		||||
 | 
			
		||||
    let itemsPerPage = ccconfig.plot_list_jobsPerPage
 | 
			
		||||
    let page = 1
 | 
			
		||||
    let paging = { itemsPerPage, page }
 | 
			
		||||
    let filter = []
 | 
			
		||||
 | 
			
		||||
    //Setup default filter
 | 
			
		||||
    if (isManager == true && projects.length == 0) {
 | 
			
		||||
        filter.push({ project: {eq: "noProjectForManager"} })
 | 
			
		||||
    } else if (isManager == true && projects.length == 1) {
 | 
			
		||||
        filter.push({ project: {eq: projects[0]} })
 | 
			
		||||
    } else {
 | 
			
		||||
        filter.push({ multiProject: projects })
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    const jobs = operationStore(`
 | 
			
		||||
    query($filter: [JobFilter!]!, $sorting: OrderByInput!, $paging: PageRequest! ){
 | 
			
		||||
        jobs(filter: $filter, order: $sorting, page: $paging) {
 | 
			
		||||
@@ -81,15 +68,6 @@
 | 
			
		||||
                filters.push({ minRunningFor })
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            // (Re-)Add Manager-Filter
 | 
			
		||||
            if (isManager == true && projects.length == 0) {
 | 
			
		||||
                filter.push({ project: {eq: "noProjectForManager"} })
 | 
			
		||||
            } else if (isManager == true && projects.length == 1) {
 | 
			
		||||
                filter.push({ project: {eq: projects[0]} })
 | 
			
		||||
            } else {
 | 
			
		||||
                filter.push({ multiProject: projects })
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            $jobs.variables.filter = filters
 | 
			
		||||
            // console.log('filters:', ...filters.map(f => Object.entries(f)).flat(2))
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user