From d61bf212f5aa0cc8fbec496cf49e70ccf3c00873 Mon Sep 17 00:00:00 2001
From: Michael Panzlaff <michael.panzlaff@fau.de>
Date: Mon, 3 Feb 2025 17:02:13 +0100
Subject: [PATCH 1/3] Fix 'make -B', don't fail if $(VAR) already exists
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 52f0d39..dd33827 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ tags:
@ctags -R
$(VAR):
- @mkdir $(VAR)
+ @mkdir -p $(VAR)
config.json:
$(info ===> Initialize config.json file)
From c53f5eb144ec559cde19440748ca6886ad54f2a3 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Tue, 18 Mar 2025 18:01:37 +0100
Subject: [PATCH 2/3] fix: always return hasNextPage boolean to frontend
- removes dependency on uiDefaults setting
---
internal/graph/schema.resolvers.go | 44 ++++++++++++++----------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/internal/graph/schema.resolvers.go b/internal/graph/schema.resolvers.go
index ce1384b..7d3de90 100644
--- a/internal/graph/schema.resolvers.go
+++ b/internal/graph/schema.resolvers.go
@@ -354,30 +354,28 @@ func (r *queryResolver) Jobs(ctx context.Context, filter []*model.JobFilter, pag
return nil, err
}
- if !config.Keys.UiDefaults["job_list_usePaging"].(bool) {
- hasNextPage := false
- // page.Page += 1 : Simple, but expensive
- // Example Page 4 @ 10 IpP : Does item 41 exist?
- // Minimal Page 41 @ 1 IpP : If len(result) is 1, Page 5 @ 10 IpP exists.
- nextPage := &model.PageRequest{
- ItemsPerPage: 1,
- Page: ((page.Page * page.ItemsPerPage) + 1),
- }
-
- nextJobs, err := r.Repo.QueryJobs(ctx, filter, nextPage, order)
- if err != nil {
- log.Warn("Error while querying next jobs")
- return nil, err
- }
-
- if len(nextJobs) == 1 {
- hasNextPage = true
- }
-
- return &model.JobResultList{Items: jobs, Count: &count, HasNextPage: &hasNextPage}, nil
- } else {
- return &model.JobResultList{Items: jobs, Count: &count}, nil
+ // Note: Even if App-Default 'config.Keys.UiDefaults["job_list_usePaging"]' is set, always return hasNextPage boolean.
+ // Users can decide in frontend to use continuous scroll, even if app-default is paging!
+ /*
+ Example Page 4 @ 10 IpP : Does item 41 exist?
+ Minimal Page 41 @ 1 IpP : If len(result) is 1, Page 5 @ 10 IpP exists.
+ */
+ nextPage := &model.PageRequest{
+ ItemsPerPage: 1,
+ Page: ((page.Page * page.ItemsPerPage) + 1),
}
+ nextJobs, err := r.Repo.QueryJobs(ctx, filter, nextPage, order)
+ if err != nil {
+ log.Warn("Error while querying next jobs")
+ return nil, err
+ }
+
+ hasNextPage := false
+ if len(nextJobs) == 1 {
+ hasNextPage = true
+ }
+
+ return &model.JobResultList{Items: jobs, Count: &count, HasNextPage: &hasNextPage}, nil
}
// JobsStatistics is the resolver for the jobsStatistics field.
From e9a214c5b2272356ce89cbdac79056016134b735 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Wed, 19 Mar 2025 14:57:27 +0100
Subject: [PATCH 3/3] fix: add nullSafe condition to monitoringStatus display
on metric queryError
---
web/frontend/src/Job.root.svelte | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/web/frontend/src/Job.root.svelte b/web/frontend/src/Job.root.svelte
index 6980230..22a69d8 100644
--- a/web/frontend/src/Job.root.svelte
+++ b/web/frontend/src/Job.root.svelte
@@ -231,7 +231,7 @@
<Col xs={12} md={6} xl={3} class="mb-3 mb-xxl-0">
{#if $initq.error}
<Card body color="danger">{$initq.error.message}</Card>
- {:else if $initq.data}
+ {:else if $initq?.data}
<Card class="overflow-auto" style="height: 400px;">
<TabContent> <!-- on:tab={(e) => (status = e.detail)} -->
{#if $initq.data?.job?.metaData?.message}
@@ -305,7 +305,7 @@
<Card class="mb-3">
<CardBody>
<Row class="mb-2">
- {#if $initq.data}
+ {#if $initq?.data}
<Col xs="auto">
<Button outline on:click={() => (isMetricsSelectionOpen = true)} color="primary">
Select Metrics (Selected {selectedMetrics.length} of {availableMetrics.size} available)
@@ -318,7 +318,7 @@
{#if $jobMetrics.error}
<Row class="mt-2">
<Col>
- {#if $initq.data.job.monitoringStatus == 0 || $initq.data.job.monitoringStatus == 2}
+ {#if $initq?.data && ($initq.data.job?.monitoringStatus == 0 || $initq.data.job?.monitoringStatus == 2)}
<Card body color="warning">Not monitored or archiving failed</Card>
<br />
{/if}
@@ -365,7 +365,7 @@
<!-- Statistcics Table -->
<Row class="mb-3">
<Col>
- {#if $initq.data}
+ {#if $initq?.data}
<Card>
<TabContent>
{#if somethingMissing}
@@ -440,7 +440,7 @@
</Col>
</Row>
-{#if $initq.data}
+{#if $initq?.data}
<MetricSelection
cluster={$initq.data.job.cluster}
subCluster={$initq.data.job.subCluster}