biovision-base 0.22.180920.0 → 0.34.190331.1

data/app/views/feedback_requests/create.js.erb

@@ -1,10 +1 @@
-{
-    const form = document.getElementById('<%= j(param_from_request(:form_id)) %>');
-    const fields = form.querySelector('.fields');
-    const buttons = form.querySelector('.buttons');
-    const result = form.querySelector('.result');
-
-    fields.classList.add('hidden');
-    buttons.classList.add('hidden')
-    result.classList.remove('hidden');
-}
+Biovision.switchFormElements('<%= j(param_from_request(:form_id)) %>', '.state-1', '.state-2');

data/app/views/index/index/_editable.html.erb

@@ -1,8 +1,4 @@
 <% unless entity.nil? %>
-  <% unless entity.title.blank? %>
-    <h1><%= entity.title %></h1>
-  <% end %>
-
   <div class="index-editable">
     <%= raw(entity.body) %>
   </div>

data/app/views/metrics/_form.html.erb

@@ -1,43 +1,45 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+<% model_name = entity.class.to_s.underscore %>
+<%= form_with(model: entity, html: { id: "#{model_name}-form" }) do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+  <dl>
+    <dt><%= t('activerecord.attributes.metric.name') %></dt>
+    <dd>
+      <%= entity.name %>
+    </dd>
 
-<%= form_for entity do |f| %>
-    <dl>
-        <dt><%= t('activerecord.attributes.metric.name') %></dt>
-        <dd>
-          <%= entity.name %>
-        </dd>
+    <dt><%= f.label :description %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :description,
+            id: "#{model_name}_description",
+            size: nil,
+            maxlength: Metric::DESCRIPTION_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.description') %></div>
+    </dd>
 
-        <dt><%= f.label :description %></dt>
-        <dd>
-          <%= f.text_field :description %>
-          <div class="guideline"><%= t('.guidelines.description') %></div>
-        </dd>
+    <dt><%= f.label :default_period %></dt>
+    <dd>
+      <%=
+        f.number_field(
+            :default_period,
+            id: "#{model_name}_default_period",
+            in: Metric::PERIOD_RANGE,
+            size: 3,
+            required: true
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.default_period') %></div>
+    </dd>
 
-        <dt><%= f.label :default_period %></dt>
-        <dd>
-          <%= f.number_field :default_period, in: Metric::PERIOD_RANGE, size: 3, required: true %>
-          <div class="guideline"><%= t('.guidelines.default_period') %></div>
-        </dd>
-    </dl>
-    
-    <ul class="flags">
-      <li>
-        <%= f.check_box :incremental %>
-        <%= f.label :incremental %>
-      </li>
-      <li>
-        <%= f.check_box :start_with_zero %>
-        <%= f.label :start_with_zero %>
-      </li>
-      <li>
-        <%= f.check_box :show_on_dashboard %>
-        <%= f.label :show_on_dashboard %>
-      </li>
-    </ul>
+    <%= render partial: 'shared/forms/entity_flags', locals: { f: f } %>
+  </dl>
 
   <%= render 'shared/forms/state_container' %>
 
-    <div class="buttons">
-      <%= f.button t(:save), type: :submit %>
-    </div>
+  <div class="buttons">
+    <%= f.button t(:save), type: :submit %>
+  </div>
 <% end %>

data/app/views/my/confirmations/show.html.erb

@@ -3,11 +3,13 @@
 <article class="profile-content my-confirmation">
   <h1><%= t('.title') %></h1>
   <% if current_user&.email_confirmed? %>
-      <div class="message-box-notice"><%= t('activerecord.attributes.user.email_confirmed') %></div>
+      <div class="message-box-notice">
+        <%= t('activerecord.attributes.user.email_confirmed') %>
+      </div>
   <% else %>
       <section id="confirmation-container">
         <h2><%= t('.got_code') %></h2>
-        <%= form_tag my_confirmation_path, method: :patch do %>
+        <%= form_with url: my_confirmation_path, method: :patch, local: true do %>
             <dl>
               <dt>
                 <%= label_tag :code, t('activerecord.attributes.code.body') %>
@@ -35,7 +37,7 @@
       <% unless current_user.nil? %>
           <section>
             <h2><%= t('.no_code') %></h2>
-            <%= form_tag my_confirmation_path, method: :post do %>
+            <%= form_with url: my_confirmation_path, method: :post, local: true do %>
                 <div>
                   <%= button_tag t('.send_code'), type: :submit %>
                 </div>

data/app/views/my/profiles/closed.html.erb

@@ -0,0 +1,7 @@
+<% content_for :meta_title, t('.title') %>
+
+<article>
+  <h1><%= t('.heading') %></h1>
+
+  <div class="message-box-alert"><%= t('.registration_is_closed') %></div>
+</article>

data/app/views/my/profiles/edit/_form.html.erb

@@ -1,9 +1,9 @@
 <%=
   form_with(
-      url: my_profile_path,
-      method: :patch,
+      url:       my_profile_path,
+      method:    :patch,
       multipart: true,
-      id: 'user-form'
+      id:        'user-form'
   ) do
 %>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
@@ -27,7 +27,7 @@
               file_field_tag(
                   'user[image]',
                   accept: 'image/jpeg,image/png',
-                  data: { image: 'user-image' }
+                  data:   { image: 'user-image' }
               )
             %>
           </figcaption>
@@ -35,7 +35,7 @@
       </dd>
 
       <dt>
-        <%= label_tag :user_profile_birthday, t('activerecord.attributes.user.birthday') %>
+        <%= label_tag :user_birthday, t('activerecord.attributes.user.birthday') %>
       </dt>
       <dd>
         <%=
@@ -47,7 +47,7 @@
         %>
       </dd>
 
-      <%= render partial: 'my/profiles/edit/form/profile_data', locals: { data: entity.profile_data } %>
+      <%= render partial: 'my/profiles/edit/form/profile_data', locals: { data: entity.data['profile'] || {} } %>
 
       <dt>
         <%= t('.flags') %>
@@ -85,9 +85,9 @@
           email_field_tag(
               'user[email]',
               entity.email,
-              size: nil,
+              size:      nil,
               maxlength: User::EMAIL_LIMIT,
-              required: true
+              required:  true
           )
         %>
       </dd>
@@ -100,7 +100,7 @@
           telephone_field_tag(
               'user[phone]',
               entity.phone,
-              size: nil,
+              size:      nil,
               maxlength: User::PHONE_LIMIT
           )
         %>

data/app/views/my/profiles/new.html.erb

@@ -3,5 +3,13 @@
 <article class="my-profile-new">
   <h1><%= t('.heading') %></h1>
 
-  <%= render partial: 'my/profiles/new/form', locals: { entity: @entity } %>
+  <%=
+    render(
+        partial: 'my/profiles/new/form',
+        locals:  {
+            entity:            @entity,
+            component_handler: @handler
+        }
+    )
+  %>
 </article>

data/app/views/my/profiles/new/_form.html.erb

@@ -76,13 +76,34 @@
             id:        "#{model_name}_email",
             size:      nil,
             maxlength: User::EMAIL_LIMIT,
-            required:  true,
+            required:  local_assigns[:component_handler] && component_handler.require_email?,
             data:      { check: :email }
         )
       %>
       <div class="check-result-error hidden" data-field="email"></div>
       <div class="guideline"><%= t('.guidelines.email') %></div>
     </dd>
+
+    <% if local_assigns[:component_handler] && component_handler.use_invites? %>
+      <dt>
+        <%= label_tag :code, t('.invitation_code') %>
+      </dt>
+      <dd>
+        <%=
+          text_field_tag(
+              :code,
+              param_from_request(:code),
+              required: component_handler.invite_only?,
+              size: nil,
+              maxlength: Code::BODY_LIMIT,
+              data: {
+                  check: :code
+              }
+          )
+        %>
+        <div class="check-result-error hidden" data-field="code"></div>
+      </dd>
+    <% end %>
   </dl>
 
   <ul class="flags">

data/app/views/my/recoveries/show.html.erb

@@ -5,7 +5,7 @@
 
   <section>
     <h2><%= t('.got_code') %></h2>
-    <%= form_tag my_recovery_path, method: :patch do %>
+    <%= form_with url: my_recovery_path, method: :patch, local: true do %>
         <dl>
           <dt>
             <%= label_tag :code, t('activerecord.attributes.code.body') %>
@@ -37,7 +37,7 @@
 
   <section>
     <h2><%= t('.no_code') %></h2>
-    <%= form_tag my_recovery_path, method: :post do %>
+    <%= form_with url: my_recovery_path, method: :post, local: true do %>
         <dl>
           <dt><%= label_tag :email, t('activerecord.attributes.user.email') %></dt>
           <dd><%= email_field_tag :email, param_from_request(:email), required: true %></dd>

data/app/views/privilege_groups/_form.html.erb

@@ -1,28 +1,55 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+<% model_name = entity.class.to_s.underscore %>
+<%= form_with(model: entity, html: { id: "#{model_name}-form" }) do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
-<%= form_for entity do |f| %>
-    <dl>
-      <dt><%= f.label :name %></dt>
-      <dd>
-        <%= f.text_field :name, size: nil, maxlenght: PrivilegeGroup::NAME_LIMIT, required: true, placeholder: t('.placeholders.name') %>
-      </dd>
+  <dl>
+    <dt><%= f.label :name %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :name,
+            id: "#{model_name}_name",
+            size: nil,
+            maxlenght: PrivilegeGroup::NAME_LIMIT,
+            required: true,
+            placeholder: t('.placeholders.name')
+        )
+      %>
+    </dd>
 
-      <dt><%= f.label :slug %></dt>
-      <dd>
-        <%= f.text_field :slug, size: nil, maxlenght: PrivilegeGroup::SLUG_LIMIT, required: true, placeholder: t('.placeholders.slug') %>
-        <div class="guideline"><%= t('.guidelines.slug') %></div>
-      </dd>
+    <dt><%= f.label :slug %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :slug,
+            id: "#{model_name}_slug",
+            size: nil,
+            maxlenght: PrivilegeGroup::SLUG_LIMIT,
+            required: true,
+            placeholder: t('.placeholders.slug')
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.slug') %></div>
+    </dd>
 
-      <dt><%= f.label :description %></dt>
-      <dd>
-        <%= f.text_area :description, cols: 80, rows: 3, maxlenght: PrivilegeGroup::DESCRIPTION_LIMIT %>
-        <div class="guideline"><%= t('.guidelines.description') %></div>
-      </dd>
-    </dl>
+    <dt><%= f.label :description %></dt>
+    <dd>
+      <%=
+        f.text_area(
+            :description,
+            id: "#{model_name}_description",
+            cols: 80,
+            rows: 3,
+            maxlenght: PrivilegeGroup::DESCRIPTION_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.description') %></div>
+    </dd>
+  </dl>
 
   <%= render 'shared/forms/state_container' %>
 
-    <div class="buttons">
-      <%= f.button t(:save), type: :submit %>
-    </div>
+  <div class="buttons">
+    <%= f.button t(:save), type: :submit %>
+  </div>
 <% end %>

data/app/views/privileges/_form.html.erb

@@ -1,46 +1,78 @@
-<%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
-
-<%= form_for entity do |f| %>
-    <dl>
-      <% unless entity.id.nil? %>
-          <% unless entity.parent_id.nil? %>
-              <dt><%= t('activerecord.attributes.privilege.parent_id') %></dt>
-              <dd>
-                <%= admin_privilege_link(entity.parent) %>
-              </dd>
-          <% end %>
+<% model_name = entity.class.to_s.underscore %>
+<%= form_with(model: entity, html: { id: "#{model_name}-form" }) do |f| %>
+  <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
+  <dl>
+    <% unless entity.id.nil? %>
+      <% unless entity.parent_id.nil? %>
+        <dt><%= t('activerecord.attributes.privilege.parent_id') %></dt>
+        <dd>
+          <%= admin_privilege_link(entity.parent) %>
+        </dd>
       <% end %>
+    <% end %>
 
-      <dt><%= f.label :name %></dt>
-      <dd>
-        <%= f.text_field :name, size: nil, maxlength: Privilege::NAME_LIMIT, required: true %>
-        <div class="guideline"><%= t('.guidelines.name') %></div>
-      </dd>
+    <dt><%= f.label :name %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :name,
+            id: "#{model_name}_name",
+            size: nil,
+            maxlength: Privilege::NAME_LIMIT,
+            required: true
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.name') %></div>
+    </dd>
 
-      <dt><%= f.label :slug %></dt>
-      <dd>
-        <%= f.text_field :slug, size: nil, maxlength: Privilege::SLUG_LIMIT, required: true, placeholder: t('.placeholders.slug') %>
-        <div class="guideline"><%= t('.guidelines.slug') %></div>
-      </dd>
+    <dt><%= f.label :slug %></dt>
+    <dd>
+      <%=
+        f.text_field(
+            :slug,
+            id: "#{model_name}_slug",
+            size: nil,
+            maxlength: Privilege::SLUG_LIMIT,
+            required: true,
+            placeholder: t('.placeholders.slug')
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.slug') %></div>
+    </dd>
 
-      <dt><%= f.label :priority %></dt>
-      <dd>
-        <%= f.number_field :priority, in: Privilege::PRIORITY_RANGE, required: true %>
-      </dd>
+    <dt><%= f.label :priority %></dt>
+    <dd>
+      <%=
+        f.number_field(
+            :priority,
+            id: "#{model_name}_priority",
+            in: Privilege::PRIORITY_RANGE,
+            required: true
+        )
+      %>
+    </dd>
 
-      <dt><%= f.label :description %></dt>
-      <dd>
-        <%= f.text_area :description, cols: 50, rows: 3, maxlength: Privilege::DESCRIPTION_LIMIT %>
-        <div class="guideline"><%= t('.guidelines.description') %></div>
-      </dd>
+    <dt><%= f.label :description %></dt>
+    <dd>
+      <%=
+        f.text_area(
+            :description,
+            id: "#{model_name}_description",
+            cols: 50,
+            rows: 3,
+            maxlength: Privilege::DESCRIPTION_LIMIT
+        )
+      %>
+      <div class="guideline"><%= t('.guidelines.description') %></div>
+    </dd>
 
-      <%= render partial: 'shared/forms/entity_flags', locals: { f: f } %>
-    </dl>
+    <%= render partial: 'shared/forms/entity_flags', locals: { f: f } %>
+  </dl>
 
   <%= render 'shared/forms/state_container' %>
 
-    <div class="buttons">
-      <%= f.hidden_field :parent_id if entity.id.nil? %>
-      <%= f.button t(:save), type: :submit %>
-    </div>
+  <div class="buttons">
+    <%= f.hidden_field :parent_id if entity.id.nil? %>
+    <%= f.button t(:save), type: :submit %>
+  </div>
 <% end %>