Merge pull request #85 from camicroscope/develop

for 3.5.7
camicroscope · Oct 31, 2019 · 7965f40 · 7965f40
2 parents 2ae0d93 + 1ec5690
commit 7965f40
Show file tree

Hide file tree

Showing 10 changed files with 1,476 additions and 16 deletions.
diff --git a/caMicroscope.yml b/caMicroscope.yml
@@ -40,7 +40,7 @@ services:
     volumes:
       - ./images/:/images/
   viewer:
-    build: "https://github.com/camicroscope/caMicroscope.git#v3.5.6"
+    build: "https://github.com/camicroscope/caMicroscope.git#v3.5.7"
     container_name: ca-front
     restart: unless-stopped
     volumes:
@@ -62,7 +62,7 @@ services:
     ports:
       - "4010:4010"
     volumes:
-      - ./config/routes.json:/root/src/routes.json
+      - ./config/non-pathdb-routes.json:/root/src/routes.json
       - ./jwt_keys/:/keys/
     environment:
       - DISABLE_SEC=true

diff --git a/config/bindaas_projects/caMicroscope.project b/config/bindaas_projects/caMicroscope.project
@@ -1267,6 +1267,61 @@
       "timeCreated": "Wed Apr 24 18:02:21 GMT 2019",
       "createdBy": "admin",
       "description": "Edit Data for Heatmaps"
+    },
+    "Log": {
+      "dataSource": {
+        "host": "ca-mongo",
+        "port": "27017",
+        "db": "camic",
+        "collection": "log",
+        "initialize": true
+      },
+      "queryEndpoints": {},
+      "deleteEndpoints": {},
+      "submitEndpoints": {
+        "csvFile": {
+          "type": "MULTIPART",
+          "properties": {
+            "inputType": "CSV_FILE"
+          },
+          "name": "csvFile",
+          "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+          "createdBy": "admin"
+        },
+        "jsonFile": {
+          "type": "MULTIPART",
+          "properties": {
+            "inputType": "JSON_FILE"
+          },
+          "name": "jsonFile",
+          "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+          "createdBy": "admin"
+        },
+        "csv": {
+          "type": "FORM_DATA",
+          "properties": {
+            "inputType": "CSV"
+          },
+          "name": "csv",
+          "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+          "createdBy": "admin"
+        },
+        "json": {
+          "type": "FORM_DATA",
+          "properties": {
+            "inputType": "JSON"
+          },
+          "name": "json",
+          "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+          "createdBy": "admin"
+        }
+      },
+      "providerId": "edu.emory.cci.bindaas.datasource.provider.mongodb.MongoDBProvider",
+      "providerVersion": 1,
+      "name": "Log",
+      "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+      "createdBy": "admin",
+      "description": "log"
     }
   },
   "params": {},