update form components and specs, removed inline form component

Author: Nils Henning

app/concepts/matestack/ui/core/form/form.js

@@ -10,7 +10,6 @@ const componentDef = {
   data: function () {
     return {
       data: {},
-      showInlineForm: false,
       errors: {},
     };
   },
@@ -29,17 +28,6 @@ const componentDef = {
         this.errors[key] = null;
       }
     },
-    launchInlineForm: function (key, value) {
-      this.showInlineForm = true;
-      this.data[key] = value;
-      const self = this;
-      setTimeout(function () {
-        self.$refs.inlineinput.focus();
-      }, 300);
-    },
-    closeInlineForm: function () {
-      this.showInlineForm = false;
-    },
     setProps: function (flat, newVal) {
       for (var i in flat) {
         if (flat[i] === null){
@@ -233,7 +221,6 @@ const componentDef = {
             self.setProps(self.data, null);
             self.initValues();
           }
-          self.showInlineForm = false;
         })
         .catch(function (error) {
           if (error.response && error.response.data && error.response.data.errors) {

app/concepts/matestack/ui/core/form/inline/inline.haml

@@ -89,6 +89,7 @@ def self.require_core_component(name)
   require_core_component "noscript"
   require_core_component "object"
   require_core_component "ol"
+  require_core_component "onclick"
   require_core_component "optgroup"
   require_core_component "option"
   require_core_component "output"
@@ -132,7 +133,6 @@ def self.require_core_component(name)
   require_core_component "form/input"
   require_core_component "form/select"
   require_core_component "form/submit"
-  require_core_component "onclick"
 end
 
 Matestack::Ui::Core::Component::Registry.register_components(
@@ -177,6 +177,10 @@ def self.require_core_component(name)
   fieldset: Matestack::Ui::Core::Fieldset::Fieldset,
   figure: Matestack::Ui::Core::Figure::Figure,
   footer: Matestack::Ui::Core::Footer::Footer,
+  form: Matestack::Ui::Core::Form::Form,
+  form_input: Matestack::Ui::Core::Form::Input::Input,
+  form_select: Matestack::Ui::Core::Form::Select::Select,
+  form_submit: Matestack::Ui::Core::Form::Submit::Submit,
   header: Matestack::Ui::Core::Header::Header,
   heading: Matestack::Ui::Core::Heading::Heading,
   hr: Matestack::Ui::Core::Hr::Hr,
@@ -199,6 +203,7 @@ def self.require_core_component(name)
   noscript: Matestack::Ui::Core::Noscript::Noscript,
   object: Matestack::Ui::Core::Object::Object,
   ol: Matestack::Ui::Core::Ol::Ol,
+  onclick: Matestack::Ui::Core::Onclick::Onclick,
   optgroup: Matestack::Ui::Core::Optgroup::Optgroup,
   option: Matestack::Ui::Core::Option::Option,
   output: Matestack::Ui::Core::Output::Output,
@@ -239,9 +244,4 @@ def self.require_core_component(name)
   video: Matestack::Ui::Core::Video::Video,
   wbr: Matestack::Ui::Core::Wbr::Wbr,
   youtube: Matestack::Ui::Core::Youtube::Youtube,
-  form: Matestack::Ui::Core::Form::Form,
-  form_input: Matestack::Ui::Core::Form::Input::Input,
-  form_select: Matestack::Ui::Core::Form::Select::Select,
-  form_submit: Matestack::Ui::Core::Form::Submit::Submit,
-  onclick: Matestack::Ui::Core::Onclick::Onclick,
 )

app/concepts/matestack/ui/core/form/inline/inline.rb

@@ -26,23 +26,19 @@ def success_submit
   describe "delay attribute" do
 
     it "if set, delays form submit" do
-
       class ExamplePage < Matestack::Ui::Page
-
         def response
-          components {
-            form form_config, :include do
-              form_input key: :foo, type: :text, id: "my-test-input"
-              form_submit do
-                button text: 'Submit me!'
-              end
+          form form_config, :include do
+            form_input key: :foo, type: :text, id: "my-test-input"
+            form_submit do
+              button text: 'Submit me!'
             end
-            div id: "timestamp" do
-              async show_on: "form_submitted_successfully" do
-                plain "{{event.data.received_at}}"
-              end
+          end
+          div id: "timestamp" do
+            async show_on: "form_submitted_successfully" do
+              paragraph id: 'received_timestamp', text: "{{event.data.received_at}}"
             end
-          }
+          end
         end
 
         def form_config
@@ -56,24 +52,17 @@ def form_config
             }
           }
         end
-
       end
 
       visit '/example'
-
       submit_timestamp = DateTime.now.strftime('%Q').to_i
       fill_in "my-test-input", with: submit_timestamp
       click_button "Submit me!"
-
-      sleep 1.5
-
-      element = page.find("#timestamp")
+      expect(page).to have_selector(:css, '#received_timestamp', wait: 2)
+      element = page.find("#received_timestamp")
       receive_timestamp = element.text.to_i
-
       expect(receive_timestamp - submit_timestamp).to be > 1000
-
     end
-
   end
 
 end

lib/matestack/ui/core/components.rb

@@ -21,15 +21,11 @@ def success_submit
     allow_any_instance_of(FormTestController).to receive(:expect_params)
   end
 
-
   describe "emit attribute" do
 
     it "if set, emits event directly when form is submitted (not waiting for success or failure)" do
-
       class ExamplePage < Matestack::Ui::Page
-
         def response
-          components {
             form form_config, :include do
               form_input key: :foo, type: :text, id: "my-test-input"
               form_submit do
@@ -39,7 +35,6 @@ def response
             async show_on: "form_submitted" do
               plain "form submitted!"
             end
-          }
         end
 
         def form_config
@@ -50,22 +45,16 @@ def form_config
             emit: "form_submitted"
           }
         end
-
       end
 
       visit '/example'
-
       fill_in "my-test-input", with: "bar"
-
       expect_any_instance_of(FormTestController).to receive(:expect_params)
         .with(hash_including(my_object: { foo: "bar" }))
 
       click_button "Submit me!"
-
       expect(page).to have_content("form submitted!")
-
     end
-
   end
 
 end