Merge branch 'develop' into bug/CE-1004-arbimon-spectrograms-are-pixi…

…lated-in-safari
rfcx · Jul 22, 2021 · dd04857 · dd04857
2 parents bab027a + 72b7e1a
commit dd04857
Show file tree

Hide file tree

Showing 19 changed files with 483 additions and 318 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,21 @@
 # Arbimon Release Notes
 
-## v3.0.32 - July XX, 2021
+## v3.0.32 - June XX, 2021
+
+Resolved issues:
+
+- CE-1046 The synchronization to work in transactions between Arbimon and RFCx is updated
 
 Performance improvements:
 
 - CE-1065 Patten Matching list loads quicker
 - CE-1068 CNN list page loads quicker
 - CE-1069 CNN job details loads quicker
+- CE-323 When user creates/edits/deletes a project role for another user in Arbimon it's synced with Core API in transactions
+
+Resolved issues:
+
+- CE-1160 The opacity of PM' results is decreased on the Visualizer page
 
 Resolved issues:
 

diff --git a/TEST_NOTES.md b/TEST_NOTES.md
@@ -14,6 +14,9 @@ Test Notes are used to list what pages / components / features / user flows are
   - CNN details page: all data is still shown correctly and default filter works quicker
 - CE-1004 Fixed issue with pixelated ROI boxes in Safari browser
  - PM details page: all boxes are not pixelated in Safari browser
+- CE-1046 The synchronization to work in transactions between Arbimon and RFCx is updated
+  - Projects page/Sites page: When the user creates/edits/deleted a new project/site and the issue (authentication, validation issues, etc) is happened it is not add/change the db data in the Arbimon/Core API side.
+  - Test that user is still able to create / update / delete projects and create / update / delete sites.
 
 ## v3.0.31
 
@@ -30,3 +33,5 @@ Test Notes are used to list what pages / components / features / user flows are
   - Patten Matching details page: When site from sites list (button with map pin icon) is selected, it loads results for selected site
 - CE-1064 Update Pattern Matching query for Citizen Scientist PM list page
   - Citizen Scientist section: Patten Matching page: the list with pattern matchings should load relatively quick
+- CE-323 When user creates/edits/deletes a project role for another user in Arbimon it's synced with Core API in transactions
+  - Settings section: Users page: When the user creates/edits/deleted a project role for another user and the issue (authentication, validation issues, etc) is happened it is not change the db data the action in the Arbimon/Core API side
diff --git a/app/model/pattern_matchings.js b/app/model/pattern_matchings.js
@@ -640,6 +640,15 @@ var PatternMatchings = {
             rois,
         ]) : Promise.resolve();
     },
+
+    getRoi(patternMatchingId, roisId){
+        return dbpool.query(
+            "SELECT *\n" +
+            "FROM pattern_matching_rois\n" +
+            "WHERE pattern_matching_id = ? AND pattern_matching_roi_id IN (?)", [
+            patternMatchingId, roisId
+        ]);
+    },
 
     getCountRoisMatchByAttr(patternMatchingId, recordingId, validation){
         return dbpool.query(