card 1.96.1 → 1.96.2

data/mod/search/set/abstract/wql_search.rb

@@ -59,6 +59,12 @@ def empty_query_error!
         "Error in card '#{name}':can't run search with empty content"
 end
 
+def item_type
+  type = wql_hash[:type]
+  return if type.is_a?(Array) || type.is_a?(Hash)
+  type
+end
+
 format do
   def default_limit
     card_content_limit || super
@@ -70,6 +76,10 @@ format do
     nil
   end
 
+  def implicit_item_view
+    super query_with_params.statement[:item]
+  end
+
   def query_with_params
     @query_with_params ||= card.fetch_query search_params
   end

data/mod/search/set/self/search.rb

@@ -1,5 +1,3 @@
-include_set Abstract::SearchParams
-
 def query_args args={}
   return super unless keyword_contains_wql? args
   args.merge parse_keyword_wql(args)
@@ -48,7 +46,7 @@ end
 
 format :json do
   view :complete, cache: :never do
-    term = complete_term
+    term = term_param
     exact = Card.fetch term, new: {}
 
     {
@@ -75,7 +73,7 @@ format :json do
   end
 
   def goto_items term, exact
-    goto_names = Card.search goto_wql(term), "goto items for term: #{term}"
+    goto_names = complete_or_match_search
     goto_names.unshift exact.name if add_exact_to_goto_names? exact, goto_names
     goto_names.map do |name|
       [name, name.to_name.url_key, highlight(name, term)]
@@ -86,16 +84,11 @@ format :json do
     exact.known? && !goto_names.find { |n| n.to_name.key == exact.key }
   end
 
-  def complete_term
+  def term_param
     term = query_params[:keyword]
     if (term =~ /^\+/) && (main = params["main"])
       term = main + term
     end
     term
   end
-
-  # hacky.  here for override
-  def goto_wql term
-    { complete: term, limit: 8, sort: "name", return: "name" }
-  end
 end

data/mod/search/set/type/search_type.rb

@@ -1,5 +1,5 @@
-include_set Abstract::WqlSearch
 include_set Type::Json
+include_set Abstract::WqlSearch
 
 format do
   view :core, cache: :never do
@@ -48,6 +48,10 @@ format :rss do
 end
 
 format :html do
+  view :core do
+    _render search_result_view
+  end
+
   view :closed do
     voo.hide :closed_content
     super()

data/mod/search/template/abstract/03_filter/filter_form.haml

@@ -1,5 +1,5 @@
 
-.card.w-100
+.card.w-100.nodblclick
   .card-body
     ._filter-widget
       ._filter-input-field-prototypes.d-none

data/mod/standard/set/all/error.rb

@@ -9,222 +9,54 @@ format do
     ""
   end
 
-  view :unsupported_view, perms: :none, tags: :unknown_ok, error_code: 404 do
-    tr(:unsupported_view, view: voo.unsupported_view, cardname: error_cardname)
-  end
-
   view :missing, perms: :none do
     ""
   end
 
-  view :not_found, perms: :none, error_code: 404 do
-    error_name = card.name.present? ? safe_name : tr(:not_found_no_name)
-    tr(:not_found_named, cardname: error_name)
-  end
-
-  view :server_error, perms: :none, error_code: 500 do
+  view :server_error, perms: :none do
     tr(:server_error)
   end
 
-  view :denial, perms: :none, error_code: 403 do
+  view :denial, perms: :none do
     focal? ? tr(:denial) : ""
   end
 
-  view :bad_address, perms: :none, error_code: 404 do
-    tr(:bad_address)
+  view :not_found, perms: :none do
+    error_name = card.name.present? ? safe_name : tr(:not_found_no_name)
+    tr(:not_found_named, cardname: error_name)
   end
 
-  view :too_deep, perms: :none, closed: true do
-    tr(:too_deep)
+  view :bad_address, perms: :none do
+    root.error_status = 404
+    tr(:bad_address)
   end
 
-  view :too_slow, perms: :none, closed: true, error_code: 408 do
-    tr(:too_slow, showname: title_in_context)
+  def unsupported_view_error_message view
+    tr(:unsupported_view, view: view, cardname: card.name)
   end
 end
 
-format :html do
-  def view_for_unknown view
-    case
-    when focal? && ok?(:create) then :new
-    when commentable?(view)     then view
-    else super
-    end
-  end
-
-  def commentable? view
-    return false unless self.class.tagged(view, :comment) &&
-                        show_view?(:comment_box, :hide)
-    ok? :comment
-  end
-
-  def nested_error exception, view
-    debug_error exception if Auth.always_ok?
-    details = Auth.always_ok? ? backtrace_link(exception) : error_cardname
-    wrap_with :span, class: "render-error alert alert-danger" do
-      [tr(:error_rendering), details, "(#{view} view)"].join "\n"
-    end
-  end
-
-  def backtrace_link exception
-    class_up "alert", "render-error-message errors-view admin-error-message"
-    warning = alert("warning", true) do
-      %{
-        <h3>Error message (visible to admin only)</h3>
-        <p><strong>#{CGI.escapeHTML exception.message}</strong></p>
-        <div>#{exception.backtrace * "<br>\n"}</div>
-      }
-    end
-    link = link_to_card error_cardname, nil, class: "render-error-link"
-    link + warning
-  end
-
-  view :unsupported_view, perms: :none, tags: :unknown_ok do
-    %(
-      <strong>
-        view <em>#{voo.unsupported_view}</em>
-        not supported for <em>#{error_cardname}</em>
-      </strong>
-    )
-  end
-
-  view :message, perms: :none, tags: :unknown_ok do
-    frame { params[:message] }
-  end
-
-  view :missing do
-    return "" unless card.ok? :create  # should this be moved into ok_view?
-    path_opts = voo.type ? { card: { type: voo.type } } : {}
-    link_text = "Add #{_render_title}"
-    klass = "slotter missing-#{@denied_view || voo.home_view}"
-    wrap { link_to_view :new, link_text, path: path_opts, class: klass }
-  end
-
-  view :closed_missing, perms: :none do
-    wrap_with :span, h(title_in_context), class: "faint"
-  end
-
-  view :conflict, error_code: 409, cache: :never do
-    actor_link = link_to_card card.last_action.act.actor.name
-    class_up "card-slot", "error-view"
-    wrap do # ENGLISH below
-      alert "warning" do
-        %(
-          <strong>Conflict!</strong>
-          <span class="new-current-revision-id">#{card.last_action_id}</span>
-          <div>#{actor_link} has also been making changes.</div>
-          <div>Please examine below, resolve above, and re-submit.</div>
-          #{render_act}
-        )
-      end
-    end
-  end
-
-  view :errors, perms: :none do
-    return if card.errors.empty?
-    voo.title = card.name.blank? ? "Problems" : tr(:problems_name, cardname: card.name)
-    voo.hide! :menu
-    class_up "d0-card-frame", "card card-warning card-inverse"
-    class_up "alert", "card-error-msg"
-    frame { standard_errors }
+format :json do
+  view :errors do
+    format_error error_list
   end
 
-  def standard_errors
-    card.errors.map do |attrib, msg|
-      alert "warning", true do
-        attrib == :abort ? h(msg) : standard_error_message(attrib, msg)
-      end
-    end
-  end
-
-  def standard_error_message attribute, message
-    "<strong>#{h attribute.to_s.upcase}:</strong> #{h message}"
-  end
-
-  view :not_found do # ug.  bad name.
-    voo.hide! :menu
-    voo.title = "Not Found"
-    frame do
-      [not_found_errors, sign_in_or_up_links("to create it")]
-    end
-  end
-
-  def not_found_errors
-    if card.errors.any?
-      standard_errors
-    else
-      haml :not_found
-    end
-  end
-
-  def sign_in_or_up_links to_task
-    return if Auth.signed_in?
-    links = [signin_link, signup_link].compact.join " #{tr :or} "
-    wrap_with(:div) do
-      [tr(:please), links, to_task].join(" ") + "."
-    end
-  end
-
-  def signin_link
-    link_to_card :signin, tr(:sign_in_c)
-  end
-
-  def signup_link
-    return unless signup_ok?
-    link_to tr(:sign_up_c), path: { action: :new, mark: :signup }
-  end
-
-  def signup_ok?
-    Card.new(type_id: Card::SignupID).ok? :create
-  end
-
-  view :denial do
-    focal? ? loud_denial : quiet_denial
-  end
-
-  def quiet_denial
-    wrap_with :span, class: "denied" do
-      "<!-- Sorry, you don't have permission (#{@denied_task}) -->"
-    end
-  end
+  view :server_error, :errors
+  view :denial, :errors
+  view :not_found, :errors
 
-  def loud_denial
-    frame do
-      [wrap_with(:h1, tr(:sorry)),
-       wrap_with(:div, loud_denial_message)]
-    end
-  end
-
-  def loud_denial_message
-    to_task = @denied_task ? tr(:denied_task, denied_task: @denied_task) : tr(:to_do_that)
-
-    case
-    when not_denied_task_read?
-      tr(:read_only)
-    when Auth.signed_in?
-      tr(:need_permission_task, task: to_task)
-    else
-      Env.save_interrupted_action request.env["REQUEST_URI"]
-      sign_in_or_up_links to_do_unauthorized_task
-    end
-  end
-
-  def not_denied_task_read?
-    @denied_task != :read && Card.config.read_only
+  view :bad_address do
+    format_error super()
   end
 
-  def to_do_unauthorized_task
-    @denied_task ? tr(:denied_task, denied_task: @denied_task) : tr(:to_do_that)
+  def format_error error
+    { error_status: error_status,
+      errors: error }
   end
 
-  def denial_message_with_links to_task
-    linx = [link_to_card(:signin, "sign in")]
-    if Card.new(type_id: Card::SignupID).ok?(:create)
-      [tr(:or), link_to(tr(:sign_up), path: { action: "new", mark: :signup })]
+  def error_list
+    card.errors.each_with_object([]) do |(field, message), list|
+      list << { field: field, message: message }
     end
-    Env.save_interrupted_action request.env["REQUEST_URI"]
-    "#{tr(:please)} #{linx.join ' '} #{to_task}"
   end
-
-  view :server_error, template: :haml
 end

data/mod/standard/set/all/rich_html/content.rb

@@ -147,7 +147,7 @@ format :html do
   def rule_based_help
     return "" unless (rule_card = card.help_rule_card)
     with_nest_mode :normal do
-      process_content _render_raw(structure: rule_card.name), chunk_list: :references
+      process_content rule_card.content, chunk_list: :references
       # render help card with current card's format
       # so current card's context is used in help card nests
     end

data/mod/standard/set/all/rich_html/error.rb

@@ -0,0 +1,177 @@
+format :html do
+  view :server_error, template: :haml
+
+  view :message, perms: :none, tags: :unknown_ok do
+    frame { params[:message] }
+  end
+
+  view :missing do
+    return "" unless card.ok? :create  # should this be moved into ok_view?
+    path_opts = voo.type ? { card: { type: voo.type } } : {}
+    link_text = "Add #{_render_title}"
+    klass = "slotter missing-#{@denied_view || voo.home_view}"
+    wrap { link_to_view :new, link_text, path: path_opts, class: klass }
+  end
+
+  view :closed_missing, perms: :none do
+    wrap_with :span, h(title_in_context), class: "faint"
+  end
+
+  view :conflict, cache: :never do
+    actor_link = link_to_card card.last_action.act.actor.name
+    class_up "card-slot", "error-view"
+    wrap do # ENGLISH below
+      alert "warning" do
+        %(
+          <strong>Conflict!</strong>
+          <span class="new-current-revision-id">#{card.last_action_id}</span>
+          <div>#{actor_link} has also been making changes.</div>
+          <div>Please examine below, resolve above, and re-submit.</div>
+          #{render_act}
+        )
+      end
+    end
+  end
+
+  view :errors, perms: :none do
+    return if card.errors.empty?
+    voo.title = card.name.blank? ? "Problems" : tr(:problems_name, cardname: card.name)
+    voo.hide! :menu
+    class_up "d0-card-frame", "card card-warning card-inverse"
+    class_up "alert", "card-error-msg"
+    frame { standard_errors }
+  end
+
+  view :not_found do
+    voo.hide! :menu
+    voo.title = "Not Found"
+    frame do
+      [not_found_errors, sign_in_or_up_links("to create it")]
+    end
+  end
+
+  view :denial do
+    focal? ? loud_denial : quiet_denial
+  end
+
+  def view_for_unknown view
+    case
+    when focal? && ok?(:create) then :new
+    when commentable?(view)     then view
+    else super
+    end
+  end
+
+  def commentable? view
+    return false unless self.class.tagged(view, :comment) &&
+                        show_view?(:comment_box, :hide)
+    ok? :comment
+  end
+
+  def show_all_errors?
+    # make configurable by env
+    Auth.always_ok? || Rails.env.development?
+  end
+
+  def error_cardname exception
+    cardname = super
+    show_all_errors? ? backtrace_link(cardname, exception) : cardname
+  end
+
+  def rendering_error exception, view
+    wrap_with(:span, class: "render-error alert alert-danger") { super }
+  end
+
+  def error_modal_id
+    @error_modal_id ||= unique_id
+  end
+
+  def error_message exception
+    %{
+      <h3>Error message (visible to admin only)</h3>
+      <p><strong>#{CGI.escapeHTML exception.message}</strong></p>
+      <div>#{exception.backtrace * "<br>\n"}</div>
+    }
+  end
+
+  def backtrace_link cardname, exception
+    # TODO: make this a modal link after new modal handling is merged in
+    wrap_with(:span, title: error_message(exception)) { cardname }
+  end
+
+  def standard_errors
+    card.errors.map do |attrib, msg|
+      alert "warning", true do
+        attrib == :abort ? h(msg) : standard_error_message(attrib, msg)
+      end
+    end
+  end
+
+  def standard_error_message attribute, message
+    "<strong>#{h attribute.to_s.upcase}:</strong> #{h message}"
+  end
+
+  def not_found_errors
+    if card.errors.any?
+      standard_errors
+    else
+      haml :not_found
+    end
+  end
+
+  def sign_in_or_up_links to_task
+    return if Auth.signed_in?
+    links = [signin_link, signup_link].compact.join " #{tr :or} "
+    wrap_with(:div) do
+      [tr(:please), links, to_task].join(" ") + "."
+    end
+  end
+
+  def signin_link
+    link_to_card :signin, tr(:sign_in)
+  end
+
+  def signup_link
+    return unless signup_ok?
+    link_to tr(:sign_up), path: { action: :new, mark: :signup }
+  end
+
+  def signup_ok?
+    Card.new(type_id: Card::SignupID).ok? :create
+  end
+
+  def quiet_denial
+    wrap_with :span, class: "denied" do
+      "<!-- Sorry, you don't have permission (#{@denied_task}) -->"
+    end
+  end
+
+  def loud_denial
+    frame do
+      [wrap_with(:h1, tr(:sorry)),
+       wrap_with(:div, loud_denial_message)]
+    end
+  end
+
+  def loud_denial_message
+    to_task = @denied_task ? tr(:denied_task, denied_task: @denied_task) : tr(:to_do_that)
+
+    case
+    when not_denied_task_read?
+      tr(:read_only)
+    when Auth.signed_in?
+      tr(:need_permission_task, task: to_task)
+    else
+      Env.save_interrupted_action request.env["REQUEST_URI"]
+      sign_in_or_up_links to_do_unauthorized_task
+    end
+  end
+
+  def not_denied_task_read?
+    @denied_task != :read && Card.config.read_only
+  end
+
+  def to_do_unauthorized_task
+    @denied_task ? tr(:denied_task, denied_task: @denied_task) : tr(:to_do_that)
+  end
+end