From 3694f01f1f9dec30a558502c64b0c6f55f326e8f Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Thu, 2 Apr 2020 18:28:34 -0400 Subject: [PATCH 1/3] use config and name instead of longer forms --- config/default_data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/default_data.js b/config/default_data.js index 0105eb09..4415e1f4 100644 --- a/config/default_data.js +++ b/config/default_data.js @@ -26,7 +26,7 @@ let defaultTemplate = { db.template.insert(defaultTemplate) var defaultConfigs=[{ - config_name:"preset_label", + name:"preset_label", configuration:[ { title:"Lymph", @@ -431,4 +431,4 @@ var defaultConfigs=[{ ] }]; -db.configuration.insertMany(defaultConfigs) +db.config.insertMany(defaultConfigs) From d50690b4395fe162e6862b786b7fd3d95117d97a Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Thu, 2 Apr 2020 19:59:19 -0400 Subject: [PATCH 2/3] index config --- config/mongo_idx.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mongo_idx.js b/config/mongo_idx.js index 1b8ad988..960c94ce 100644 --- a/config/mongo_idx.js +++ b/config/mongo_idx.js @@ -11,4 +11,4 @@ db.template.createIndex({'name': 1}) db.heatmap.createIndex({"provenance.image.slide": 1, "provenance.analysis.execution_id": 1}) db.heatmap.createIndex({"provenance.image.slide": 1}) db.heatmapEdit.createIndex({"provenance.image.slide":1, "provenance.analysis.execution_id":1, "user_id":1}) -db.configuration.createIndex({'config_name': 1}, { unique: true }) +db.config.createIndex({'name': 1}, { unique: true }) From f734b6099778be44666a148ae6cad5fc8416e92d Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Fri, 3 Apr 2020 14:42:30 -0400 Subject: [PATCH 3/3] for 3.7.1 --- caMicroscope.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/caMicroscope.yml b/caMicroscope.yml index a55340e0..39d7278e 100644 --- a/caMicroscope.yml +++ b/caMicroscope.yml @@ -23,9 +23,9 @@ services: - mongo back: build: - context: "https://github.com/camicroscope/caracal.git#v3.7.0" + context: "https://github.com/camicroscope/caracal.git#v3.7.1" args: - viewer: "v3.7.0" + viewer: "v3.7.1" depends_on: - "mongo" ports: