Merge pull request #101 from mahos/betaRelease

add 409 error to message
datajoint · Feb 27, 2021 · 8fa7189 · 8fa7189
2 parents 3159dc2 + 3001f87
commit 8fa7189
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
-## [0.1.0-beta.0] - 2021-02-26
+## [0.1.0-beta.1] - 2021-02-26
 ### Added
 - Support for double data type (#72) PR #86
 - Added search functionailty for table list similar to schema. (#73) PR #88
@@ -47,5 +47,5 @@ Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
 - Multi database server connections supported by opening new tabs.
 - Support of DJ NEURO - [Managed Database Hosting](https://djneuro.io/services/) users.
 
-[0.1.0-beta.0]: https://github.com/datajoint/datajoint-labbook/compare/0.1.0-alpha.2...0.1.0-beta.0
+[0.1.0-beta.1]: https://github.com/datajoint/datajoint-labbook/compare/0.1.0-alpha.2...0.1.0-beta.1
 [0.1.0-alpha.2]: https://github.com/datajoint/datajoint-labbook/releases/tag/0.1.0-alpha.2
diff --git a/docker-compose-deploy.yaml b/docker-compose-deploy.yaml
@@ -1,5 +1,5 @@
-# PHARUS_VERSION=0.1.0b0 DJLABBOOK_VERSION=0.1.0-beta.0 docker-compose -f docker-compose-deploy.yaml pull
-# PHARUS_VERSION=0.1.0b0 DJLABBOOK_VERSION=0.1.0-beta.0 docker-compose -f docker-compose-deploy.yaml up -d
+# PHARUS_VERSION=0.1.0b0 DJLABBOOK_VERSION=0.1.0-beta.1 docker-compose -f docker-compose-deploy.yaml pull
+# PHARUS_VERSION=0.1.0b0 DJLABBOOK_VERSION=0.1.0-beta.1 docker-compose -f docker-compose-deploy.yaml up -d
 #
 # Intended for production deployment.
 # Note: You must run both commands above for minimal outage.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "datajoint-labbook",
-  "version": "0.1.0-beta.0",
+  "version": "0.1.0-beta.1",
   "description": "A frontend with graphical user interface for DataJoint pipelines built using React.",
   "private": false,
   "repository": {

diff --git a/src/Components/MainTableView/DeleteTuple/DeleteTuple.tsx b/src/Components/MainTableView/DeleteTuple/DeleteTuple.tsx
@@ -102,8 +102,14 @@ class DeleteTuple extends React.Component<{
         this.setState({isDeletingEntry: false, dependencies: []})
 
         // Check for error mesage 500, if so throw error - shouldn't happen as often once real dependency check is in place
-        if (result.status === 500) {
-          throw Error(`${result.status} - ${result.statusText}`)
+        if (result.status === 500 || result.status === 409) {
+          result.text()
+          .then(errorMessage => {
+            throw Error(`${result.status} - ${result.statusText}: (${errorMessage})`)
+          })
+          .catch(error => {
+            this.setState({deleteStatusMessage: error.message})
+          })
         }
 
         // return result - expecting a Delete Succesful string