From 8661eb131bb1d941cc786b773f0c1cd9df46d67f Mon Sep 17 00:00:00 2001 From: Luigi Marini Date: Fri, 27 Oct 2023 14:26:01 -0500 Subject: [PATCH 1/3] Fixed hearthbeat bug where if the owner was not set in extractors_info.json clowder would throw and error and the extractor would not get registered. --- app/services/MessageService.scala | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/services/MessageService.scala b/app/services/MessageService.scala index c6eda512a..1e01a1dba 100644 --- a/app/services/MessageService.scala +++ b/app/services/MessageService.scala @@ -316,11 +316,9 @@ class ExtractorsHeartbeats(channel: Channel, queue: String) extends Actor { val extractionInfoResult = extractor_info.validate[ExtractorInfo] // Determine if there is a user associated with this request - val owner = (json \ "owner").as[String] - val user: Option[User] = if (owner.length > 0) { - users.findByEmail(owner) - } else { - None + val user = (json \ "owner").asOpt[String] match { + case Some(owner) => users.findByEmail(owner) + case None => None } // Update database From 7d8e2ed5348b2a2bc846d3fa25e222f76517399e Mon Sep 17 00:00:00 2001 From: Luigi Marini Date: Fri, 27 Oct 2023 14:50:24 -0500 Subject: [PATCH 2/3] Updated version to 1.22.1 --- CHANGELOG.md | 9 +++++---- doc/src/sphinx/conf.py | 2 +- project/Build.scala | 2 +- public/swagger.yml | 2 +- version.sh | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba5525252..609b6c445 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## Unreleased +## 1.22.1 - 2023-10-30 ### Fixed +- Fixed hearthbeat bug where if the owner was not set in extractors_info.json clowder would throw and error and the + extractor would not get registered.- -- Search results are checked to verify nothing has been put in trash before display [#377](https://github.com/clowder-framework/clowder/issues/377) - -## Unreleased +## 1.22.0 - 2023-10-27 ### Added - Users can be marked as ReadOnly [#405](https://github.com/clowder-framework/clowder/issues/405) @@ -34,6 +34,7 @@ registration or heartbeat to Clowder that will restrict use of that extractor to - Changed default to 'Viewer' while inviting users to new spaces [#375](https://github.com/clowder-framework/clowder/issues/375) - Fixed bug where complex JSON metadata objects using arrays were not being indexed properly for search. - Fixed positioning problems related to how the 3D models appear on the screen +- Search results are checked to verify nothing has been put in trash before display [#377](https://github.com/clowder-framework/clowder/issues/377) ## 1.21.0 - 2022-08-23 diff --git a/doc/src/sphinx/conf.py b/doc/src/sphinx/conf.py index d0e4e68f9..d65ba822e 100644 --- a/doc/src/sphinx/conf.py +++ b/doc/src/sphinx/conf.py @@ -22,7 +22,7 @@ author = 'Luigi Marini' # The full version, including alpha/beta/rc tags -release = '1.21.0' +release = '1.22.1' # -- General configuration --------------------------------------------------- diff --git a/project/Build.scala b/project/Build.scala index 46f9eec06..585a8137b 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -13,7 +13,7 @@ import NativePackagerKeys._ object ApplicationBuild extends Build { val appName = "clowder" - val version = "1.21.0" + val version = "1.22.1" val jvm = "1.7" def appVersion: String = { diff --git a/public/swagger.yml b/public/swagger.yml index c312d4462..221e16ff2 100644 --- a/public/swagger.yml +++ b/public/swagger.yml @@ -9,7 +9,7 @@ info: Clowder is a customizable and scalable data management system to support any data format and multiple research domains. It is under active development and deployed for a variety of research projects. - version: 1.21.0 + version: 1.22.1 termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos contact: name: Clowder diff --git a/version.sh b/version.sh index dbdcfeb8e..3bc096ce6 100755 --- a/version.sh +++ b/version.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="1.19.2" +VERSION="1.22.1" sed -i~ "s#^ val version = \".*\"\$# val version = \"${VERSION}\"#" project/Build.scala sed -i~ "s#^ version: .*\$# version: ${VERSION}#" public/swagger.yml From 077ebcadceb571dc4423b35c93e405be868a91a6 Mon Sep 17 00:00:00 2001 From: Luigi Marini Date: Fri, 10 Nov 2023 08:55:03 -0600 Subject: [PATCH 3/3] Fixed citation. --- CHANGELOG.md | 2 +- citation.cff | 2 +- version.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dec921a3..37eb95678 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## 1.22.1 - 2023-10-30 +## 1.22.1 - 2023-11-10 ### Fixed - Fixed hearthbeat bug where if the owner was not set in extractors_info.json clowder would throw and error and the diff --git a/citation.cff b/citation.cff index 5a092f829..db19d4f0d 100644 --- a/citation.cff +++ b/citation.cff @@ -3,7 +3,7 @@ message: If you use this software, please cite it using these metadata. title: "Clowder: Open Source Data Management for Long Tail Data" abstract: "A customizable and scalable data management system you can install in the cloud or on your own hardware." type: software -version: "1.22.0" +version: "1.22.1" license: "NCSA" repository-code: "https://github.com/clowder-framework/clowder" keywords: diff --git a/version.sh b/version.sh index 3bc096ce6..509901c7c 100755 --- a/version.sh +++ b/version.sh @@ -3,6 +3,7 @@ VERSION="1.22.1" sed -i~ "s#^ val version = \".*\"\$# val version = \"${VERSION}\"#" project/Build.scala +sed -i~ "s#^version: .*\$#version: \"${VERSION}\"#" citation.cff sed -i~ "s#^ version: .*\$# version: ${VERSION}#" public/swagger.yml sed -i~ "s#^release = '.*'\$#release = '${VERSION}'#" doc/src/sphinx/conf.py sed -i~ "s/^##.*unreleased.*$/## ${VERSION} - $(date +'%Y-%m-%d')/i" CHANGELOG.md