-
@@ -28,7 +38,8 @@
attributeName: { type: String, required: true },
characterLimit: { type: Number },
placeholder: { type: String },
- autofocus: { type: Boolean, default: false }
+ autofocus: { type: Boolean, default: false },
+ multilinePaste: { type: Boolean, default: false }
},
data() {
return {
@@ -68,12 +79,21 @@
},
methods: {
handleAutofocus() {
- if (this.autofocus) {
- this.editing = true;
+ if (this.autofocus || !this.placeholder && this.isBlank) {
+ this.enableEdit();
setTimeout(this.focus, 50);
}
},
+ handleBlur() {
+ if (!this.isBlank) {
+ this.$nextTick(this.update);
+ } else {
+ this.$emit('delete');
+ }
+ },
focus() {
+ if (!this.$refs.input) return;
+
this.$nextTick(() => {
this.$refs.input.focus();
this.resize();
@@ -89,8 +109,18 @@
this.newValue = this.value || '';
this.$emit('editingDisabled');
},
+ handlePaste(e) {
+ if (!this.multilinePaste) return;
+ e.clipboardData.items[0].getAsString((data) => {
+ let lines = data.split(/[\n\r]/);
+ if (lines.length > 1) {
+ this.newValue = lines[0];
+ this.$emit('multilinePaste', lines);
+ }
+ })
+ },
handleInput() {
- this.newValue = this.newValue.trim();
+ this.newValue = this.newValue.replace(/^[\n\r]+|[\n\r]+$/g, '');
this.$nextTick(this.resize);
},
handleKeypress(e) {
@@ -108,12 +138,15 @@
this.$refs.input.style.height = (this.$refs.input.scrollHeight) + "px";
},
update() {
- if(this.isBlank) return;
- if(!this.editing) return;
+ setTimeout(() => {
+ if(!this.allowBlank && this.isBlank) return;
+ if(!this.editing) return;
- this.editing = false;
- this.$emit('editingDisabled');
- this.$emit('update', this.newValue);
+ this.newValue = this.newValue.trim();
+ this.editing = false;
+ this.$emit('editingDisabled');
+ this.$emit('update', this.newValue);
+ }, 100) // due to clicking 'x' also triggering a blur event
}
}
}
diff --git a/app/models/checklist_item.rb b/app/models/checklist_item.rb
index fa8d3ed7d..cf24b3159 100644
--- a/app/models/checklist_item.rb
+++ b/app/models/checklist_item.rb
@@ -17,4 +17,16 @@ class ChecklistItem < ApplicationRecord
foreign_key: 'last_modified_by_id',
class_name: 'User',
optional: true
+
+ after_destroy :update_positions
+
+ private
+
+ def update_positions
+ transaction do
+ checklist.checklist_items.order(position: :asc).each_with_index do |checklist_item, i|
+ checklist_item.update!(position: i + 1)
+ end
+ end
+ end
end
diff --git a/app/serializers/checklist_item_serializer.rb b/app/serializers/checklist_item_serializer.rb
new file mode 100644
index 000000000..fffab01ed
--- /dev/null
+++ b/app/serializers/checklist_item_serializer.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class ChecklistItemSerializer < ActiveModel::Serializer
+ include Rails.application.routes.url_helpers
+
+ attributes :id, :text, :checked, :position, :urls
+
+ def urls
+ return {} if object.destroyed? || !object.persisted?
+
+ {
+ update_url: step_checklist_checklist_item_path(object.checklist.step, object.checklist, object),
+ delete_url: step_checklist_checklist_item_path(object.checklist.step, object.checklist, object)
+ }
+ end
+end
diff --git a/app/serializers/checklist_serializer.rb b/app/serializers/checklist_serializer.rb
index 76289cb93..654f36893 100644
--- a/app/serializers/checklist_serializer.rb
+++ b/app/serializers/checklist_serializer.rb
@@ -3,14 +3,16 @@
class ChecklistSerializer < ActiveModel::Serializer
include Rails.application.routes.url_helpers
- attributes :name, :urls
+ attributes :id, :name, :urls
+ has_many :checklist_items, serializer: ChecklistItemSerializer
def urls
return {} if object.destroyed?
{
delete_url: step_checklist_path(object.step, object),
- update_url: step_checklist_path(object.step, object)
+ update_url: step_checklist_path(object.step, object),
+ create_item_url: step_checklist_checklist_items_path(object.step, object)
}
end
end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1102f83c8..dd7a76712 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2520,6 +2520,7 @@ en:
table: 'Add table'
text: 'Add text'
checklist: 'Add checklist'
+ checklist_item: 'Add a new checklist item...'
table:
default_name: 'Table %{position}'
edit_message: 'Use right click for table options'
@@ -3059,6 +3060,7 @@ en:
Protocol: "Protocol"
Protocols: "Protocols"
Checklist: "Checklist"
+ ChecklistItem: "Checklist item"
Checklists: "Checklists"
Table: "Table"
Tables: "Tables"
diff --git a/config/routes.rb b/config/routes.rb
index 919187c9a..1d93c9189 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -449,9 +449,11 @@ Rails.application.routes.draw do
path: '/comments',
only: %i(create index update destroy)
- resources :tables, controller: 'step_components/tables', only: %i(create destroy update)
- resources :texts, controller: 'step_components/texts', only: %i(create destroy update)
- resources :checklists, controller: 'step_components/checklists', only: %i(create destroy update)
+ resources :tables, controller: 'step_components/tables', only: %i(create destroy)
+ resources :texts, controller: 'step_components/texts', only: %i(create destroy)
+ resources :checklists, controller: 'step_components/checklists', only: %i(create destroy update) do
+ resources :checklist_items, controller: 'step_components/checklist_items', only: %i(create update destroy)
+ end
member do
get 'elements'
post 'checklistitem_state'