Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Add see more items component #910

Merged
merged 4 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/components/concept_details_component.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ class ConceptDetailsComponent < ViewComponent::Base

attr_reader :concept_properties

def initialize(id:, acronym:, concept_id: nil , properties: nil, top_keys: [], bottom_keys: [], exclude_keys: [])
def initialize(id:, acronym:, concept_id: nil, properties: nil, top_keys: [], bottom_keys: [], exclude_keys: [])
@acronym = acronym
@properties = properties
@top_keys = top_keys
@bottom_keys = bottom_keys
@exclude_keys = exclude_keys
@id = id
@concept_id=concept_id
@concept_id = concept_id

@concept_properties = concept_properties2hash(@properties) if @properties
end
Expand Down Expand Up @@ -55,8 +55,8 @@ def row_hash_properties(properties_set, ontology_acronym, &block)
end

out << [
{ th: content_tag(:span, remove_owl_notation(key), title: url, 'data-controller': 'tooltip') },
{ td: content_tag(:span, ajax_links.join.html_safe) }
{ th: content_tag(:span, remove_owl_notation(key), title: url, 'data-controller': 'tooltip') },
{ td: list_items_component(max_items: 5) { |r| ajax_links.map { |val| r.container { val.html_safe } } } }
]
end
out
Expand All @@ -81,7 +81,7 @@ def filter_properties(top_keys, bottom_keys, exclude_keys, concept_properties)
private

def link_to_format_modal(format, icon)
link_to_modal(nil, "/ontologies/#{@acronym}/#{escape(@concept_id)}/serialize/#{format}",{ id: "resource_content_#{format}", data: {show_modal_title_value: @concept_id, show_modal_size_value: 'modal-xl'}}) do
link_to_modal(nil, "/ontologies/#{@acronym}/#{escape(@concept_id)}/serialize/#{format}", { id: "resource_content_#{format}", data: { show_modal_title_value: @concept_id, show_modal_size_value: 'modal-xl' } }) do
inline_svg("icons/#{icon}.svg", width: '50px', height: '50px')
end
end
Expand Down
10 changes: 10 additions & 0 deletions app/components/list_items_show_more_component.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# frozen_string_literal: true
class ListItemsShowMoreComponent < ViewComponent::Base
renders_many :containers

def initialize(max_items: 10)
super
@max_items = max_items - 1
end

end
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
%div{data: {controller: 'reveal-component'}}
- containers[..@max_items].each do |item|
= item

- if (@max_items + 1) < containers.size
- Array(containers[@max_items+1..]).each do |item|
%span{'data-reveal-component-target': "item", class: 'd-none'}
= item
%div{'data-reveal-component-target': "showButton", 'data-action': "click->reveal-component#show" }
%span.btn-link
See more
%div.d-none{'data-reveal-component-target': "hideButton", 'data-action': "click->reveal-component#hide" }
%span.btn-link
See less
7 changes: 6 additions & 1 deletion app/helpers/components_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ def chips_component(id: , name: , label: , value: , checked: false , tooltip: ni
check_input(id: id, name: name, value: value, label: label, checked: checked, disabled: disabled, &block)
end
end
def list_items_component(max_items:, &block)
render ListItemsShowMoreComponent.new(max_items: max_items) do |r|
capture(r, &block)
end
end

def group_chip_component(id: nil, name: , object: , checked: , value: nil, title: nil, disabled: false, &block)
title ||= object["name"]
Expand Down Expand Up @@ -111,7 +116,7 @@ def resolvability_check_tag(url)
end

def rounded_button_component(link)
render RoundedButtonComponent.new(link: link, target: '_blank',size: 'small',title: t("components.go_to_api"))
render RoundedButtonComponent.new(link: link, target: '_blank', size: 'small', title: t("components.go_to_api"))
end

def copy_link_to_clipboard(url, show_content: false)
Expand Down
9 changes: 5 additions & 4 deletions app/helpers/multi_languages_helper.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module MultiLanguagesHelper
include OntologiesHelper, ComponentsHelper
def portal_lang
session[:locale] || 'en'
end
Expand Down Expand Up @@ -172,15 +173,15 @@ def display_in_multiple_languages(label)
closable: true)
end



label = label.to_h.reject { |key, _| %i[links context].include?(key) } if label.is_a?(OpenStruct)

if label.is_a?(String)
content_tag(:p, label)
elsif label.is_a?(Array)
content_tag(:div) do
raw(label.map { |x| content_tag(:div, x) }.join)
list_items_component(max_items: show_max) do |r|
label.map do |x|
r.container { content_tag(:span, x, class: style_as_badge ? 'badge bg-secondary' : '').html_safe }
end
end
else
content_tag(:div) do
Expand Down
1 change: 0 additions & 1 deletion app/helpers/ontologies_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'iso-639'
module OntologiesHelper
include ApplicationHelper
REST_URI = $REST_URL
API_KEY = $API_KEY
LANGUAGE_FILTERABLE_SECTIONS = %w[classes schemes collections instances properties].freeze
Expand Down
3 changes: 1 addition & 2 deletions app/views/concepts/_details.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
- t.add_row({th: t('ontology_details.concept.synonyms')}) do |h|
- h.td do
%div.d-flex
%div.d-flex
= display_in_multiple_languages(@concept.synonym)
= display_in_multiple_languages(@concept.synonym, style_as_badge: true, show_max: 5)
%div.synonym-change-request
= add_synonym_button
= remove_synonym_button
Expand Down
Loading