Merge pull request #288 from performant-software/develop

Develop into master
performant-software · Sep 3, 2024 · 0567727 · 0567727
2 parents e0ba25d + 444b528
commit 0567727
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -37,13 +37,13 @@ gem 'resource_api', git: 'https:/performant-software/resource-api.gi
 gem 'jwt_auth', git: 'https:/performant-software/jwt-auth.git', tag: 'v0.1.2'
 
 # Core data
-gem 'core_data_connector', git: 'https:/performant-software/core-data-connector.git', tag: 'v0.1.58'
+gem 'core_data_connector', git: 'https:/performant-software/core-data-connector.git', tag: 'v0.1.59'
 
 # IIIF
 gem 'triple_eye_effable', git: 'https:/performant-software/triple-eye-effable.git', tag: 'v0.2.1'
 
 # User defined fields
-gem 'user_defined_fields', git: 'https:/performant-software/user-defined-fields.git', tag: 'v0.1.10'
+gem 'user_defined_fields', git: 'https:/performant-software/user-defined-fields.git', tag: 'v0.1.11'
 
 # Fuzzy dates
 gem 'fuzzy_dates', git: 'https:/performant-software/fuzzy-dates.git', tag: 'v0.1.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
  remote: https:/performant-software/core-data-connector.git
- revision: ce171724eae739285bad89ffef632c7b893c45f8
- tag: v0.1.58
+ revision: 1eec3fe8c604ed155ba13215f9e4567a9a004b2a
+ tag: v0.1.59
  specs:
  core_data_connector (0.1.0)
  activerecord-postgis-adapter (~> 8.0)
@@ -59,8 +59,8 @@ GIT
 
 GIT
  remote: https:/performant-software/user-defined-fields.git
- revision: 79b74e12e5b1cbdfc3b3a32e4a030fe71494766b
- tag: v0.1.10
+ revision: e7f943143a829fc53e5dd99b338cb155e5366fb1
+ tag: v0.1.11
  specs:
  user_defined_fields (0.1.0)
  rails (>= 6.0.3.2, < 8)
@@ -254,7 +254,7 @@ GEM
  rake (13.0.6)
  reline (0.3.8)
  io-console (~> 0.5)
- rexml (3.3.5)
+ rexml (3.3.6)
  strscan
  rgeo (3.0.1)
  rgeo-activerecord (7.0.1)

diff --git a/client/src/components/MergeButton.js b/client/src/components/MergeButton.js
@@ -132,7 +132,7 @@ const MergeButton = (props: Props) => {
  title={props.title}
  />
  )}
- { item && (
+ { item && !saving && (
  <Confirm
  centered={false}
  content={t('MergeButton.messages.confirm.content')}

diff --git a/client/src/components/MergeModal.js b/client/src/components/MergeModal.js
@@ -359,6 +359,7 @@ const MergeModal = (props: Props) => {
  </Modal.Content>
  <Modal.Actions>
  <Button
+ disabled={props.saving}
  content={t('Common.buttons.cancel')}
  onClick={props.onClose}
  />