Merge pull request #129 from clowder-framework/release/1.12.1

fix to rabbitmq

Author: lmarini

.github/workflows/docker.yml

@@ -93,36 +93,44 @@ jobs:
       # build the docker image, this will always run to make sure
       # the Dockerfile still works.
       - name: Build image
-        run: |
-          docker build \
-            --build-arg BRANCH=${GITHUB_BRANCH} \
-            --build-arg VERSION=${CLOWDER_VERSION} \
-            --build-arg BUILDNUMBER=${{ github.run_number }} \
-            --build-arg GITSHA1=${{ github.sha  }} \
-            --tag image ${{ matrix.FOLDER }}
-
-      # this will publish to the actor (person) github packages
-      - name: Publish to GitHub
-        if: github.event_name == 'push'
-        uses: elgohr/[email protected]
+        uses: elgohr/[email protected]
         env:
           BRANCH: ${{ env.GITHUB_BRANCH }}
           VERSION: ${{ env.CLOWDER_VERSION }}
           BUILDNUMBER: ${{ github.run_number }}
           GITSHA1: ${{ github.sha  }}
         with:
-          name: ${{ github.repository_owner }}/clowder/${{ matrix.IMAGE }}
+          registry: docker.pkg.github.com
+          name: ${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ matrix.IMAGE }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           context: ${{ matrix.FOLDER }}
+          tags: "${{ env.TAGS }}"
+          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
+          no_push: true
+
+      # this will publish to github container registry
+      - name: Publish to GitHub
+        if: github.event_name != 'pull_request' && github.repository == env.MASTER_REPO
+        uses: elgohr/[email protected]
+        env:
+          BRANCH: ${{ env.GITHUB_BRANCH }}
+          VERSION: ${{ env.CLOWDER_VERSION }}
+          BUILDNUMBER: ${{ github.run_number }}
+          GITSHA1: ${{ github.sha  }}
+        with:
+          registry: ghcr.io
+          name: ${{ github.repository_owner }}/${{ matrix.IMAGE }}
+          username: ${{ secrets.GHCR_USERNAME }}
+          password: ${{ secrets.GHCR_PASSWORD }}
+          context: ${{ matrix.FOLDER }}
           tags: "${{ env.CLOWDER_TAGS }}"
-          registry: docker.pkg.github.com
           buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
 
       # this will publish to the clowder dockerhub repo
       - name: Publish to Docker Hub
-        if: github.event_name == 'push' && github.repository == env.MASTER_REPO
-        uses: elgohr/Publish-Docker-Github-Action@2.18
+        if: github.event_name != 'pull_request' && github.repository == env.MASTER_REPO
+        uses: elgohr/Publish-Docker-Github-Action@2.22
         env:
           BRANCH: ${{ env.GITHUB_BRANCH }}
           VERSION: ${{ env.CLOWDER_VERSION }}

CHANGELOG.md

@@ -4,6 +4,16 @@ 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.12.1 - 2020-11-05
+
+### Fixed
+- Error uploading to spaces that did not have extractors enabled/disabled (personel spaces).
+- If extractor does not have any parameters, there would be an error message in the console of the browser.
+- If the extractor did not have a user_id it would create an error and not record the event.
+
+### Changed
+- Docker Images are now pushed to [github container registry](https://github.com/orgs/clowder-framework/packages)
+
 ## 1.12.0 - 2020-10-19
 **_Warning:_**
 - This update modifies the MongoDB schema. Make sure to start the application with `-DMONGOUPDATE=1`.

app/services/RabbitmqPlugin.scala

@@ -362,15 +362,16 @@ class RabbitmqPlugin(application: Application) extends Plugin {
     var enabledExtractors = new ListBuffer[String]()
     var disabledExtractors = new ListBuffer[String]()
     dataset.spaces.map(space => {
-      val extractors = spacesService.getAllExtractors(space)
-      enabledExtractors.appendAll(extractors.get.enabled.flatMap { exId =>
-        extractorsService.getExtractorInfo(exId).filter(exInfo =>
-          containsOperation(exInfo.process.dataset, operation) || containsOperation(exInfo.process.file, operation)).map(_.name)
-      })
-      disabledExtractors.appendAll(extractors.get.disabled.flatMap { exId =>
-        extractorsService.getExtractorInfo(exId).filter(exInfo =>
-          containsOperation(exInfo.process.dataset, operation) || containsOperation(exInfo.process.file, operation)).map(_.name)
-      })
+      spacesService.getAllExtractors(space).foreach { extractors =>
+        enabledExtractors.appendAll(extractors.enabled.flatMap { exId =>
+          extractorsService.getExtractorInfo(exId).filter(exInfo =>
+            containsOperation(exInfo.process.dataset, operation) || containsOperation(exInfo.process.file, operation)).map(_.name)
+        })
+        disabledExtractors.appendAll(extractors.disabled.flatMap { exId =>
+          extractorsService.getExtractorInfo(exId).filter(exInfo =>
+            containsOperation(exInfo.process.dataset, operation) || containsOperation(exInfo.process.file, operation)).map(_.name)
+        })
+      }
     })
     (enabledExtractors.toList, disabledExtractors.toList)
   }
@@ -1204,7 +1205,7 @@ class EventFilter(channel: Channel, queue: String) extends Actor {
       Logger.debug("Received extractor status: " + statusBody)
       val json = Json.parse(statusBody)
       val file_id = UUID((json \ "file_id").as[String])
-      val user_id = UUID((json \ "user_id").as[String])
+      val user_id = (json \ "user_id").asOpt[String].fold(User.anonymous.id)(s => UUID(s))
       val job_id: Option[UUID] = (json \ "job_id").asOpt[String] match {
         case Some(jid) => { Some(UUID(jid)) }
         case None => { None }

app/views/extractions/submitFileExtraction.scala.html

@@ -80,7 +80,9 @@ <h1>Submit file for extraction</h1>
                         <script>
                                 var params = JSON.parse("@Json.stringify(e.parameters)".replace(/&quot;/g, "\""));
                                 var selector = "#@(e.name.replaceAll("\\.", "_"))_parameters";
-                                $(selector).jsonForm(params);
+                                if (Object.keys(params).length != 0) {
+                                    $(selector).jsonForm(params);
+                                }
                         </script>
                     }
                 </tbody>

doc/src/sphinx/conf.py

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

project/Build.scala

@@ -13,7 +13,7 @@ import NativePackagerKeys._
 object ApplicationBuild extends Build {
 
   val appName = "clowder"
-  val version = "1.12.0"
+  val version = "1.12.1"
   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.12.0
+  version: 1.12.1
   termsOfService: https://clowder.ncsa.illinois.edu/clowder/tos
   contact:
     name: Clowder