Merge pull request #87 from camicroscope/develop

configurable brushes
camicroscope · Nov 11, 2019 · faaea86 · faaea86
2 parents 9d547af + d8680b1
commit faaea86
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 5 deletions.
diff --git a/config/.gitignore b/config/.gitignore
@@ -0,0 +1,2 @@
+pathdbmysql.cnf
+pathdb/*.css
diff --git a/config/bindaas_projects/caMicroscope.project b/config/bindaas_projects/caMicroscope.project
@@ -1286,7 +1286,8 @@
           },
           "name": "csvFile",
           "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
-          "createdBy": "admin"
+          "createdBy": "admin",
+          "description": ""
         },
         "jsonFile": {
           "type": "MULTIPART",
@@ -1295,7 +1296,8 @@
           },
           "name": "jsonFile",
           "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
-          "createdBy": "admin"
+          "createdBy": "admin",
+          "description": ""
         },
         "csv": {
           "type": "FORM_DATA",
@@ -1304,7 +1306,8 @@
           },
           "name": "csv",
           "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
-          "createdBy": "admin"
+          "createdBy": "admin",
+          "description": ""
         },
         "json": {
           "type": "FORM_DATA",
@@ -1313,7 +1316,8 @@
           },
           "name": "json",
           "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
-          "createdBy": "admin"
+          "createdBy": "admin",
+          "description": ""
         }
       },
       "providerId": "edu.emory.cci.bindaas.datasource.provider.mongodb.MongoDBProvider",
@@ -1322,6 +1326,87 @@
       "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
       "createdBy": "admin",
       "description": "log"
+    },
+    "Configuration": {
+      "dataSource": {
+        "host": "ca-mongo",
+        "port": "27017",
+        "db": "camic",
+        "collection": "configuration",
+        "initialize": true
+      },
+      "queryEndpoints": {
+        "getConfigByName": {
+          "queryTemplate": "{\n\t\"_operation\" : \"find\" ,\n\t\"_operation_args\" : {\n\t\t\t\t\t\t\t\"query\" : { \u0027config_name\u0027 : \"$name$\"} ,\n\t\t\t\t\t\t\t\"limit\" : 1\n\t\t\t\t\t\t}\n}\n       ",
+          "metaData": {},
+          "tags": [],
+          "bindVariables": {
+            "name": {
+              "name": "name",
+              "required": true,
+              "defaultValue": "",
+              "description": ""
+            }
+          },
+          "stage": "UNVERIFIED",
+          "outputFormat": {
+            "outputFormat": "JSON"
+          },
+          "name": "getConfigByName",
+          "timeCreated": "Thu Nov 07 17:09:07 GMT 2019",
+          "createdBy": "admin",
+          "description": ""
+        }
+      },
+      "deleteEndpoints": {},
+      "submitEndpoints": {
+        "csvFile": {
+          "type": "MULTIPART",
+          "properties": {
+            "inputType": "CSV_FILE"
+          },
+          "name": "csvFile",
+          "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+          "createdBy": "admin",
+          "description": ""
+        },
+        "jsonFile": {
+          "type": "MULTIPART",
+          "properties": {
+            "inputType": "JSON_FILE"
+          },
+          "name": "jsonFile",
+          "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+          "createdBy": "admin",
+          "description": ""
+        },
+        "csv": {
+          "type": "FORM_DATA",
+          "properties": {
+            "inputType": "CSV"
+          },
+          "name": "csv",
+          "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+          "createdBy": "admin",
+          "description": ""
+        },
+        "json": {
+          "type": "FORM_DATA",
+          "properties": {
+            "inputType": "JSON"
+          },
+          "name": "json",
+          "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+          "createdBy": "admin",
+          "description": ""
+        }
+      },
+      "providerId": "edu.emory.cci.bindaas.datasource.provider.mongodb.MongoDBProvider",
+      "providerVersion": 1,
+      "name": "Configuration",
+      "timeCreated": "Tue Oct 29 20:54:11 GMT 2019",
+      "createdBy": "admin",
+      "description": "configuration"
     }
   },
   "params": {},

diff --git a/config/routes.json b/config/routes.json
@@ -58,6 +58,9 @@
       },
       "Log": {
         "post": "/Log/submit/json"
+      },
+      "Configuration": {
+        "getConfigByName": "/Configuration/query/getConfigByName"
       }
     },
     "private":{

diff --git a/data/.gitignore b/data/.gitignore
@@ -0,0 +1 @@
+pathdb/mysql
diff --git a/quip-pathdb.yml b/quip-pathdb.yml
@@ -53,7 +53,7 @@ services:
     logging:
       driver: none
   pathdb:
-    build: "https://github.com/SBU-BMI/PathDB.git#1.2.3"
+    build: "https://github.com/SBU-BMI/PathDB.git#1.3.0"
     container_name: quip-pathdb
     restart: unless-stopped
     ports: ["443:443","80:80"]