From 79b08a181d8cdab1fa95325df26b06dc52176958 Mon Sep 17 00:00:00 2001 From: Christoph Kluge Date: Mon, 15 Apr 2024 10:36:26 +0200 Subject: [PATCH 1/2] fix: trigger continuous load condition earlier --- web/frontend/src/joblist/JobList.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/frontend/src/joblist/JobList.svelte b/web/frontend/src/joblist/JobList.svelte index f3edf36..39a3010 100644 --- a/web/frontend/src/joblist/JobList.svelte +++ b/web/frontend/src/joblist/JobList.svelte @@ -157,7 +157,8 @@ clientHeight } = document.documentElement; - if (scrollTop + clientHeight >= scrollHeight && $jobsStore.data != null && $jobsStore.data.jobs.hasNextPage) { + // Add 100 px offset to trigger load earlier + if (scrollTop + clientHeight >= scrollHeight - 100 && $jobsStore.data != null && $jobsStore.data.jobs.hasNextPage) { let pendingPaging = { ...paging } scrollMultiplier += 1 pendingPaging.itemsPerPage = itemsPerPage * scrollMultiplier From 6df639a0c3f9a7c3b9d59fbe745b7a837dbcdc4a Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Mon, 15 Apr 2024 12:54:50 +0200 Subject: [PATCH 2/2] Prepare Release 1.3.0 --- Makefile | 2 +- ReleaseNotes.md | 40 ++++++---------------------------------- cmd/cc-backend/main.go | 2 +- 3 files changed, 8 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index 91d3549..c6e1f34 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ TARGET = ./cc-backend VAR = ./var CFG = config.json .env FRONTEND = ./web/frontend -VERSION = 1.2.2 +VERSION = 1.3.0 GIT_HASH := $(shell git rev-parse --short HEAD || echo 'development') CURRENT_TIME = $(shell date +"%Y-%m-%d:T%H:%M:%S") LD_FLAGS = '-s -X main.date=${CURRENT_TIME} -X main.version=${VERSION} -X main.commit=${GIT_HASH}' diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 54aaf90..a4f085e 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,40 +1,12 @@ -# `cc-backend` version 1.2.2 +# `cc-backend` version 1.3.0 -Supports job archive version 1 and database version 6. +Supports job archive version 1 and database version 7. This is a minor release of `cc-backend`, the API backend and frontend implementation of ClusterCockpit. +For release specific notes visit the [ClusterCockpit Documentation](https://clusterockpit.org/docs/release/). -** Breaking changes ** +## Breaking changes -* The LDAP configuration option `user_filter` was changed and now should not include -the uid wildcard. Example: - - Old: `"user_filter": "(&(objectclass=posixAccount)(uid=*))"` - - New: `"user_filter": "(&(objectclass=posixAccount))"` - -* The aggregate job statistic core hours is now computed using the job table -column `num_hwthreads`. In a future release this column will be renamed to -`num_cores`. For correct display of core hours `num_hwthreads` must be correctly -filled on job start. If your existing jobs do not provide the correct value in -this column then you can set this with one SQL INSERT statement. This only applies -if you have exclusive jobs, only. Please be aware that we treat this column as -it is the number of cores. In case you have SMT enabled and `num_hwthreads` -is not the number of cores the core hours will be too high by a factor! - -* The jwts key is now mandatory in config.json. It has to set max-age for - validity. Some key names have changed, please refer to - [config documentation](./configs/README.md) for details. - -* The following API endpoints are only accessible from IPs registered using the apiAllowedIPs configuration option: - - `/users/` [GET, POST, DELETE] - - `/user/{id}` [POST] - -** NOTE ** -If you are using the sqlite3 backend the `PRAGMA` option `foreign_keys` must be -explicitly set to ON. If using the sqlite3 console it is per default set to -OFF! On every console session you must set: -``` -sqlite> PRAGMA foreign_keys = ON; - -``` -Otherwise if you delete jobs the jobtag relation table will not be updated accordingly! +* This release fixes bugs in the MySQL/MariaDB database schema. For this reason + you have to migrate your database using the `-migrate-db` switch. diff --git a/cmd/cc-backend/main.go b/cmd/cc-backend/main.go index 808c7d0..9d084f2 100644 --- a/cmd/cc-backend/main.go +++ b/cmd/cc-backend/main.go @@ -1,4 +1,4 @@ -// Copyright (C) NHR@FAU, University Erlangen-Nuremberg. +// Copyright (C) NHR@FAU, University Erlangen-Nuremberg. // All rights reserved. // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file.