Add implemntation to apply the age filter on the Usage Table

server/basedirs.go

@@ -36,6 +36,7 @@ import (
 	gas "github.com/wtsi-hgi/go-authserver"
 	ifs "github.com/wtsi-hgi/wrstat-ui/internal/fs"
 	"github.com/wtsi-ssg/wrstat/v5/basedirs"
+	"github.com/wtsi-ssg/wrstat/v5/summary"
 	"github.com/wtsi-ssg/wrstat/v5/watch"
 )
 
@@ -91,7 +92,18 @@ func (s *Server) LoadBasedirsDB(dbPath, ownersPath string) error {
 
 func (s *Server) getBasedirsGroupUsage(c *gin.Context) {
 	s.getBasedirs(c, func() (any, error) {
-		return s.basedirs.GroupUsage()
+		var results []*basedirs.Usage
+
+		for _, age := range summary.DirGUTAges {
+			result, err := s.basedirs.GroupUsage(age)
+			if err != nil {
+				return nil, err
+			}
+
+			results = append(results, result...)
+		}
+
+		return results, nil
 	})
 }
 
@@ -116,7 +128,18 @@ func (s *Server) getBasedirs(c *gin.Context, cb func() (any, error)) {
 
 func (s *Server) getBasedirsUserUsage(c *gin.Context) {
 	s.getBasedirs(c, func() (any, error) {
-		return s.basedirs.UserUsage()
+		var results []*basedirs.Usage
+
+		for _, age := range summary.DirGUTAges {
+			result, err := s.basedirs.UserUsage(age)
+			if err != nil {
+				return nil, err
+			}
+
+			results = append(results, result...)
+		}
+
+		return results, nil
 	})
 }
 
@@ -140,7 +163,18 @@ func (s *Server) getBasedirsGroupSubdirs(c *gin.Context) {
 	}
 
 	s.getBasedirs(c, func() (any, error) {
-		return s.basedirs.GroupSubDirs(uint32(id), basedir)
+		var results []*basedirs.SubDir
+
+		for _, age := range summary.DirGUTAges {
+			result, err := s.basedirs.GroupSubDirs(uint32(id), basedir, age)
+			if err != nil {
+				return nil, err
+			}
+
+			results = append(results, result...)
+		}
+
+		return results, nil
 	})
 }
 
@@ -177,7 +211,18 @@ func (s *Server) getBasedirsUserSubdirs(c *gin.Context) {
 	}
 
 	s.getBasedirs(c, func() (any, error) {
-		return s.basedirs.UserSubDirs(uint32(id), basedir)
+		var results []*basedirs.SubDir
+
+		for _, age := range summary.DirGUTAges {
+			result, err := s.basedirs.UserSubDirs(uint32(id), basedir, age)
+			if err != nil {
+				return nil, err
+			}
+
+			results = append(results, result...)
+		}
+
+		return results, nil
 	})
 }
 

server/static/wrstat/src/App.tsx

@@ -103,7 +103,10 @@ const groupNameToIDMap = new Map<string, number>(),
 					const daysAgo = asDaysAgo(mtime);
 
 					return daysAgo >= Math.max(filterMinDaysAgo, axisMinDaysAgo) && daysAgo <= Math.min(filterMaxDaysAgo, axisMaxDaysAgo);
-				}
+				},
+				Age: (rowAge: number) => {
+					return rowAge == age
+				},
 			}, baseFilter),
 			scatterFilter = Object.assign({
 				UsageSize: { min: axisMinSize, max: axisMaxSize },

server/static/wrstat/src/index.tsx

@@ -46,7 +46,7 @@ auth.catch(() => createRoot(document.body).render(<StrictMode>
 
 auth.then(username => Promise.all([
 	username,
-	RPC.getGroupUsageData().then(gud => {
+	RPC.getGroupUsageData(0).then(gud => {
 		for (const d of gud) {
 			d.percentSize = Math.round(10000 * d.UsageSize / d.QuotaSize) / 100;
 			d.percentInodes = Math.round(10000 * d.UsageInodes / d.QuotaInodes) / 100;
@@ -70,7 +70,7 @@ auth.then(username => Promise.all([
 
 		return gud;
 	}),
-	RPC.getUserUsageData(),
+	RPC.getUserUsageData(0),
 	RPC.getChildren({ path: "/" })
 ]))
 	.then(([username, groupUsage, userUsage, { areas, timestamp }]) => createRoot(document.body.firstElementChild!).render(<StrictMode>

server/static/wrstat/src/rpc.ts

@@ -137,10 +137,10 @@ const cache = new Map<string, string>(),
 
 const RPC = {
 	"getChildren": (filter: ChildFilter) => getURL<Child>(treeURL, filter),
-	"getGroupUsageData": () => getURL<Usage[]>(groupUsageURL),
-	"getUserUsageData": () => getURL<Usage[]>(userUsageURL),
-	"getBasedirsGroupSubdirs": (id: number, basedir: string) => getURL<SubDir[]>(groupSubDirPathURL, { id, basedir }),
-	"getBasedirsUserSubdirs": (id: number, basedir: string) => getURL<SubDir[]>(userSubDirPathURL, { id, basedir }),
+	"getGroupUsageData": (age: number) => getURL<Usage[]>(groupUsageURL, { age }),
+	"getUserUsageData": (age: number) => getURL<Usage[]>(userUsageURL, { age }),
+	"getBasedirsGroupSubdirs": (id: number, basedir: string, age: number) => getURL<SubDir[]>(groupSubDirPathURL, { id, basedir, age }),
+	"getBasedirsUserSubdirs": (id: number, basedir: string, age: number) => getURL<SubDir[]>(userSubDirPathURL, { id, basedir, age }),
 	"getBasedirsHistory": (id: number, basedir: string) => getURL<History[]>(baseDirHistoryURL, { id, basedir })
 };
 

server/tree.go

@@ -166,7 +166,6 @@ func (s *Server) getTree(c *gin.Context) {
 // children. If results don't belong to at least one of the allowedGIDs, they
 // will be marked as NoAuth and won't include child info.
 func (s *Server) diToTreeElement(di *dguta.DirInfo, filter *dguta.Filter, allowedGIDs map[uint32]bool, path string) *TreeElement {
-	s.Logger.Println("di in diToTreeElement: ", di)
 	if di == nil {
 		return &TreeElement{Path: path}
 	}