card 1.98.0 → 1.99.1

data/mod/edit/set/all/nest_editor.rb

@@ -4,17 +4,20 @@ format :html do
   # TODO: connect to Card::View::Options
   # (that way a mod can add an option that becomes available to nests)
 
-  view :nest_editor, cache: :never, template: :haml,
+  view :nest_editor, cache: :never, unknown: true, template: :haml,
                      wrap: { slot: { class: "_overlay d0-card-overlay card nodblclick" } } do
     @nest_editor_mode = :overlay
   end
 
-  view :modal_nest_editor, cache: :never, wrap: { slot: { class: "nodblclick" } } do
+  view :modal_nest_editor, cache: :never, unknown: true,
+                           wrap: { slot: { class: "nodblclick" } } do
     modal_nest_editor
   end
 
   def nest_editor_tabs
-    static_tabs({ rules: nest_rules_tab, options: haml_partial(:options) },
+    static_tabs({ rules: nest_rules_tab,
+                  options: haml_partial(:options),
+                  help: haml_partial(:help) },
                 :options, "tabs")
   end
 
@@ -29,7 +32,7 @@ format :html do
     if edit_nest.name.blank?
       content_tag :div, "", class: "card-slot" # placeholder
     else
-      nest([edit_nest.name, :right], view: :nest_rules)
+      nest(set_name_for_nest_rules, view: :nest_rules)
     end
   end
 
@@ -50,6 +53,19 @@ format :html do
     @edit_nest ||= NestParser.new params[:edit_nest], default_nest_view, default_item_view
   end
 
+  def left_type_for_nest_editor_set_selection
+    card.type_name
+  end
+
+  def set_name_for_nest_rules
+    nest_name = edit_nest.name
+    if left_type_for_nest_editor_set_selection
+      [left_type_for_nest_editor_set_selection, nest_name, :type_plus_right]
+    else
+      [nest_name, :right]
+    end
+  end
+
   def tinymce_id
     params[:tinymce_id]
   end

data/mod/edit/set/all/nest_editor/_help.haml

@@ -0,0 +1,7 @@
+.m-2
+  Nest one card in another.
+  %p
+    This panel will help you:
+    %ul
+      %li create/edit the nest syntax.
+      %li set rules that apply to nested cards

data/mod/edit/set/all/nest_editor/nest_editor.haml

@@ -1,4 +1,4 @@
-%div
+%div._nest-editor
   .nest-header.d-flex.ml-2
     %h5.mt-1 Nest
     .ml-auto
@@ -11,7 +11,8 @@
           .input-group-prepend._field-indicator
             .input-group-text.text-muted
               +
-          = text_field_tag "nest_name", edit_nest.name, class: "form-control _nest-name"
+          = text_field_tag "nest_name", edit_nest.name, class: "form-control _nest-name",
+                           "data-left-type" => left_type_for_nest_editor_set_selection
 
       .col-3
         = check_box_tag :field, "field", edit_nest.field?,

data/mod/edit/set/all/new.rb

@@ -3,6 +3,40 @@ format :html do
     new_view_frame_and_form new_form_opts
   end
 
+  view :new_content_form, wrap: :slot, unknown: true, cache: :never do
+    with_nest_mode :edit do
+      create_form
+    end
+  end
+
+  view :new_in_modal, perms: :create, unknown: true, cache: :never,
+                      wrap: { modal: { footer: "", size: :edit_modal_size,
+                                       title: :new_in_modal_title,
+                                       menu: :new_modal_menu } } do
+    _render_new_content_form
+  end
+
+  def create_form
+    form_opts = new_in_modal_form_opts.reverse_merge(success: new_in_modal_success)
+    buttons = form_opts.delete(:buttons) || _render_new_buttons
+
+    voo.title ||= new_view_title if new_name_prompt?
+    voo.show :help
+    card_form(:create, form_opts) do
+      create_form_with_alert_guide buttons
+    end
+  end
+
+  def new_modal_size
+    :large
+  end
+
+  def new_modal_menu
+    wrap_with_modal_menu do
+      [close_modal_window, render_bridge_link]
+    end
+  end
+
   def new_view_frame_and_form form_opts
     buttons = form_opts.delete(:buttons) || _render_new_buttons
     form_opts = form_opts.reverse_merge(success: new_success)
@@ -11,19 +45,33 @@ format :html do
       voo.title ||= new_view_title if new_name_prompt?
       voo.show :help
       frame_and_form :create, form_opts do
+        create_form_with_alert_guide buttons
+      end
+    end
+  end
+
+  def create_form_with_alert_guide buttons
+    wrap_with :div, class: "d-flex justify-content-between" do
+      [(wrap_with(:div, class: "w-100") do
         [
           new_view_hidden,
           new_view_name,
           new_view_type,
-          _render_content_formgroup,
+          _render_content_formgroups,
           buttons
         ]
-      end
+      end),
+       alert_guide]
     end
   end
 
   def new_view_hidden; end
 
+  def new_in_modal_form_opts
+    { "data-slot-selector": "modal-origin", "data-slot-error-selector": ".card-slot",
+      buttons: _render_new_in_modal_buttons }
+  end
+
   def new_form_opts
     { "main-success" => "REDIRECT" }
   end
@@ -35,10 +83,16 @@ format :html do
     )
   end
 
+  def new_in_modal_title
+    new_name_prompt? ? new_view_title : render_title
+  end
+
   def new_success
     card.rule(:thanks) || "_self"
   end
 
+  def new_in_modal_success; end
+
   # NAME HANDLING
 
   def new_view_name
@@ -110,12 +164,20 @@ format :html do
     end
   end
 
+  view :new_in_modal_buttons do
+    button_formgroup do
+      wrap_with "div", class: "d-flex" do
+        [standard_save_and_close_button(text: "Submit"), modal_cancel_button]
+      end
+    end
+  end
+
   # path to redirect to after canceling a new form
   def cancel_button_new_args
     href = case
            when main?          then path_to_previous
            when voo&.home_view then path(view: voo.home_view)
-           else                     path(view: :missing)
+           else                     path(view: :unknown)
            end
     { href: href }
   end

data/mod/edit/set/all/overlay_guide.haml

@@ -0,0 +1,7 @@
+%div
+  .d-flex.ml-2
+    .ml-auto
+      = link_to fa_icon(:close), path: "#", "data-dismiss": "overlay", class: "text-dark p-1 ml-1"
+
+  = guide
+

data/mod/edit/set/all/overlay_guide.rb

@@ -0,0 +1,9 @@
+format :html do
+  view :overlay_guide,
+       cache: :never, unknown: true, template: :haml,
+       wrap: { slot: { class: "_overlay d0-card-overlay card nodblclick" } } do
+    # TODO: use a common template for this and the nest editor
+    # (the common thing is that they both are an overlay of the bridge sidebar)
+    #  and maybe make it look more like the overlay on the left with the same close icon
+  end
+end

data/mod/edit/set/all/template_nest.rb

@@ -0,0 +1,42 @@
+format do
+  view :template_nest, cache: :never, unknown: true do
+    return "" unless voo.nest_name
+
+    if voo.nest_name.to_name.field_only?
+      with_nest_mode :normal do
+        nest template_link_set_name, view: :template_link
+      end
+    else
+      "{{#{voo.nest_syntax}}}"
+    end
+  end
+
+  def template_link_set_name
+    name = voo.nest_name.to_name
+    if name.absolute?
+      name.trait_name :self
+    else
+      template_link_set_name_for_relative_name name
+    end
+  end
+
+  def template_link_set_name_for_relative_name name
+    name = name.stripped.gsub(/^\+/, "")
+
+    if (type = on_type_set)
+      [type, name].to_name.trait_name :type_plus_right
+    else
+      name.to_name.trait_name :right
+    end
+  end
+
+  def on_type_set
+    return unless
+      (tmpl_set_name = parent.card.name.trunk_name) &&
+      (tmpl_set_class_name = tmpl_set_name.tag_name) &&
+      (tmpl_set_class_card = Card[tmpl_set_class_name]) &&
+      (tmpl_set_class_card.codename == :type)
+
+    tmpl_set_name.left_name
+  end
+end

data/mod/edit/set/type/list.rb

@@ -0,0 +1,15 @@
+def input_type_content_options
+  ["multiselect", "checkbox", "autocompleted list", "filtered list"]
+end
+
+def show_content_options?
+  true
+end
+
+def show_input_type?
+  true
+end
+
+def field_settings
+  %i[default help input_type content_options content_option_view]
+end

data/mod/edit/set/type/plain_text.rb

@@ -0,0 +1,13 @@
+format :html do
+  def input_type_content_options
+    ["text area", "text field", "ace editor"]
+  end
+end
+
+def field_settings
+  %i[default help input_type]
+end
+
+def show_input_type?
+  true
+end

data/mod/edit/set/type/pointer.rb

@@ -0,0 +1,11 @@
+def show_content_options?
+  true
+end
+
+def show_input_type?
+  true
+end
+
+def input_type_content_options
+  %w[select radio autocomplete]
+end

data/mod/edit/spec/set/all/bridge/tab_views_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::All::Bridge::TabViews do
+RSpec.describe Card::Set::All::Bridge::TabViews do
   check_views_for_errors :engage_tab, :history_tab, :related_tab, :rules_tab,
                          :account_tab, :follow_section
 

data/mod/edit/spec/set/all/nest_editor_spec.rb

@@ -50,7 +50,7 @@ RSpec.describe Card::Set::All::NestEditor do
       end
     end
 
-    example "with given field nest sytnax", params: { edit_nest: "{{+hi|view: open; show: menu, toggle|view: titled}}" } do
+    example "with given field nest syntax", params: { edit_nest: "{{+hi|view: open; show: menu, toggle|view: titled}}" } do
       expect_view(:nest_editor).to have_tag "div.nest_editor-view" do
         with_name "hi", true
         with_tag "div.options-container" do

data/mod/email/set/all/email_html.rb

@@ -1,9 +1,9 @@
 format :email_html do
-  view :missing do
+  view :unknown do
     ""
   end
 
-  view :closed_missing do
+  view :compact_missing do
     ""
   end
 end

data/mod/email/set/all/email_text.rb

@@ -1,10 +1,10 @@
 
 format :email_text do
-  view :missing do
+  view :unknown do
     ""
   end
 
-  view :closed_missing do
+  view :compact_missing do
     ""
   end
 

data/mod/follow/lib/card/follower_stash.rb

@@ -58,7 +58,7 @@ class Card
     end
 
     def includes_card_key
-      @includes_card_key ||= :includes.cardname.key
+      @includes_card_key ||= :nests.cardname.key
     end
 
     def nestee_set card

data/mod/follow/set/all/follow/followed_by.rb

@@ -21,7 +21,7 @@ def followed_field? field_card
   follow_field_rule.item_names(context: self).find do |item|
     case item.to_name.key
     when field_card.key         then true
-    when :includes.cardname.key then nested_card?(field_card)
+    when :nests.cardname.key then nested_card?(field_card)
     end
   end
 end

data/mod/follow/set/all/notify/base_views.rb

@@ -26,7 +26,7 @@ format do
     end
   end
 
-  view :followed, perms: :none, closed: true do
+  view :followed, perms: :none, compact: true do
     if (set_card = followed_set_card) && (option_card = follow_option_card)
       option_card.description set_card
     else
@@ -34,17 +34,15 @@ format do
     end
   end
 
-  view :follower, perms: :none, closed: true do
+  view :follower, perms: :none, compact: true do
     active_notice(:follower) || "follower"
   end
 
   view :last_action_verb, cache: :never do
-    return unless notification_act
-
-    "#{notification_act.main_action.action_type}d"
+    "#{notification_act&.main_action&.action_type || 'edite'}d"
   end
 
-  view :unfollow_url, perms: :none, closed: true, cache: :never do
+  view :unfollow_url, perms: :none, compact: true, cache: :never do
     return "" unless (rule_name = live_follow_rule_name)
 
     card_url path(mark: "#{active_notice(:follower)}+#{Card[:follow].name}",

data/mod/follow/set/right/following.rb

@@ -23,7 +23,7 @@ format :html do
     end
   end
 
-  view :closed_content do
+  view :one_line_content do
     ""
   end
 

data/mod/follow/set/self/follow_defaults.rb

@@ -48,7 +48,7 @@ format :html do
     frame_and_form :update, hidden: { success: "_self",
                                       card: { update_all_users: false } } do
       [
-        _render_content_formgroup,
+        _render_content_formgroups,
         _render_confirm_update_all,
         _render_edit_buttons
       ]

data/mod/follow/set/type/cardtype.rb

@@ -13,3 +13,9 @@ end
 def list_direct_followers?
   true
 end
+
+format :html do
+  def related_by_type_items
+    super.unshift ["#{card.name} cards", [card, :type, :by_name], mark: :absolute]
+  end
+end

data/mod/follow/set/type_plus_right/user/follow.rb

@@ -28,7 +28,7 @@ def current_user?
 end
 
 format :html do
-  view :closed_content do
+  view :one_line_content do
     ""
   end
 

data/mod/history/lib/card/act/act_renderer.rb

@@ -82,7 +82,7 @@ class Card
       end
 
       def approved_actions
-        @approved_actions ||= actions # .select { |a| a.card && a.card.ok?(:read) }
+        @approved_actions ||= actions.select { |a| a.card&.ok?(:read) }
         # FIXME: should not need to test for presence of card here.
       end