Merge branch 'develop' into 277-Dataset-Thumbnail-404-Not-Found---Broken-Link-after-File-Deletion

Author: max-zilla

.github/workflows/docker.yml

@@ -36,7 +36,6 @@ jobs:
           - clowder
           - mongo-init
           - monitor
-          - check
         include:
           - name: clowder
             FOLDER: "."
@@ -50,10 +49,6 @@ jobs:
             FOLDER: scripts/monitor
             IMAGE: monitor
             README: ""
-          - name: check
-            FOLDER: scripts/check
-            IMAGE: check
-            README: ""
     steps:
       - uses: actions/checkout@v2
 

CHANGELOG.md

@@ -7,18 +7,31 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Unreleased
 
 ### Fixed
-- Can add dataset to spaces - fixed error when no spaces would load. [#274](https://github.com/clowder-framework/clowder/issues/274)
+- Upgraded extractor parameters jsonform to version `2.2.5`.
+- Fix the broken link after file deletion within a folder. [#277](https://github.com/clowder-framework/clowder/issues/277) 
+
+### Changed
+- now building mongo-init and monitor docker containers with python 3.8
+
+### Removed
+- check image is now part of [ncsa/checks](https://github.com/ncsa/checks/)
+
+## 1.19.0 - 2021-10-05
+**_Important:_** This update requires a MongoDB update schema due to the new ability of showing summary statistics at the
+space level. Make sure to start the application with -DMONGOUPDATE=1.
+
+### Fixed
+- Adding dataset to space. Space list on dataset page would be empty - fixed error when no spaces would load. [#274](https://github.com/clowder-framework/clowder/issues/274)
 - Typos "success" when returning status from API and "occurred" when logging to console.
 - If a dataset had multiple folders the layout would be wrong.
-- Fix the broken link after file deletion within a folder. [#277](https://github.com/clowder-framework/clowder/issues/277) 
+- Collections created using api route are now indexed upon creation. [#257](https://github.com/clowder-framework/clowder/issues/257)
 
 ### Added
-- Adding mime type for geojson
-- Add "when" parameter in a few GET API endpoints to enable pagination [#266](https://github.com/clowder-framework/clowder/issues/266)
-- Show statistics of spaces (bytes, users. etc) [#119](https://github.com/clowder-framework/clowder/issues/119)
-
-### Changed
-- Add "id" in GET metadata.jsonld endpoints [#278](https://github.com/clowder-framework/clowder/issues/278)
+- Mime type for geojson
+- "when" parameter in a few GET API endpoints to enable pagination [#266](https://github.com/clowder-framework/clowder/issues/266)
+- Show space statistics (bytes, users. etc) [#119](https://github.com/clowder-framework/clowder/issues/119)
+- "id" in GET metadata.jsonld endpoints [#278](https://github.com/clowder-framework/clowder/issues/278)
+- 'POST /api/files/uploadToDataset' now allows folder_id for uploading file to folder. [#232](https://github.com/clowder-framework/clowder/issues/232)
 
 ## 1.18.1 - 2021-08-16
 
@@ -35,7 +48,6 @@ If any files are returned, you should check to see if these files affected and a
 - Updated swagger documentation
 - Return 404 not found when calling file/dataset/space api endpoints with an invalid ID [#251](https://github.com/clowder-framework/clowder/issues/251)
 - Line breaks in welcome message breaks swagger build [#187](https://github.com/clowder-framework/clowder/issues/187)
-- Collections created using api route are now indexed upon creation. [#257](https://github.com/clowder-framework/clowder/issues/257)
 
 ### Changed
 - Added more information when writing files to make sure files are written correctly
@@ -58,9 +70,6 @@ If any files are returned, you should check to see if these files affected and a
 - If using S3 storage in docker, it was not reflected correctly in the docker-compose file.
 - Docker image for mongo-init now based on python:3.7-slim to reduce size.
 
-### Added
-- Endpoint '/api/files/uploadToDataset' now allows folder_id for uploading file to folder. [#232](https://github.com/clowder-framework/clowder/issues/232)
-
 ## 1.17.0 - 2021-04-29
 
 ### Fixed

app/views/extractions/submitDatasetExtraction.scala.html

@@ -27,8 +27,8 @@ <h1>Submit dataset for extraction</h1>
                     </tr>
                 </thead>
                 <tbody>
-                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.1.5/deps/underscore.js"></script>
-                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.1.5/lib/jsonform.min.js"></script>
+                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.2.5/deps/underscore.js"></script>
+                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.2.5/lib/jsonform.min.js"></script>
                     @for(e <- extractors) {
                         <tr>
                             <td>

app/views/extractions/submitFileExtraction.scala.html

@@ -64,8 +64,8 @@ <h1>Submit file for extraction</h1>
                     </tr>
                 </thead>
                 <tbody>
-                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.1.5/deps/underscore.js"></script>
-                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.1.5/lib/jsonform.min.js"></script>
+                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.2.5/deps/underscore.js"></script>
+                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.2.5/lib/jsonform.min.js"></script>
                     @for(e <- extractors) {
                         <tr>
                             <td>

app/views/extractions/submitSelectedExtraction.scala.html

@@ -32,8 +32,8 @@ <h1>Submit marked files for extraction</h1>
                     </tr>
                 </thead>
                 <tbody>
-                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.1.5/deps/underscore.js"></script>
-                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.1.5/lib/jsonform.min.js"></script>
+                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.2.5/deps/underscore.js"></script>
+                    <script src="https://cdn.jsdelivr.net/npm/jsonform@@2.2.5/lib/jsonform.min.js"></script>
                     @for(e <- extractors) {
                         <tr>
                             <td>

doc/src/sphinx/conf.py

@@ -22,7 +22,7 @@
 author = 'Luigi Marini'
 
 # The full version, including alpha/beta/rc tags
-release = '1.18.1'
+release = '1.19.0'
 
 
 # -- General configuration ---------------------------------------------------

project/Build.scala

@@ -13,7 +13,7 @@ import NativePackagerKeys._
 object ApplicationBuild extends Build {
 
   val appName = "clowder"
-  val version = "1.18.1"
+  val version = "1.19.0"
   val jvm = "1.7"
 
   def appVersion: String = {

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.18.1
+  version: 1.19.0
   termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos
   contact:
     name: Clowder