Feature: Add Details sub-tab and API cotextual button in Properties, Instances, Schemes, and Collections

app/components/display/taxonomy_card_component/taxonomy_card_component.html.haml

@@ -11,9 +11,12 @@
   .description
     = render TextAreaFieldComponent.new(value: @taxonomy.description)
   .ontologies-cards
-    - @taxonomy.ontologies.each do |ontology|
+    - @taxonomy.ontologies.each_with_index do |ontology, index|
+      - if index>10
+        = render ChipButtonComponent.new(url: "/ontologies?#{@taxonomy.id.split('/')[-2]}=#{@taxonomy.acronym}", text: "...", tooltip:"See all ontologies ...", type: "clickable")
+        - break
       = render ChipButtonComponent.new(url: "/ontologies/#{ontology.split('/').last}", text: ontology.split('/').last, tooltip: @ontologies_names[ontology], type: "clickable")
-
+    
   - if @taxonomy.children
     .taxonomy-children-reveal{'data-action': "click->reveal-component#toggle", 'data-id': reveal_id}
       .text

app/controllers/collections_controller.rb

@@ -37,7 +37,7 @@ def index
   end
 
   def show
-    redirect_to(ontology_path(id: params[:ontology_id], p: 'collections', collectionid: params[:id], lang: request_lang)) and return unless turbo_frame_request?
+    redirect_to(ontology_path(id: params[:ontology], p: 'collections', collectionid: params[:id], lang: request_lang)) and return if turbo_frame_request?
 
     @collection = get_request_collection
   end

app/controllers/instances_controller.rb

@@ -39,9 +39,9 @@ def show
     get_ontology(params)
     @instance = get_instance_details_json(params[:ontology], params[:id] || params[:instanceid], {include: 'all'})
 
-    redirect_to(ontology_path(id: params[:ontology], p: 'instances', instanceid: params[:id] || params[:instanceid], lang: request_lang)) and return unless turbo_frame_request?
+    redirect_to(ontology_path(id: params[:ontology], p: 'instances', instanceid: params[:id] || params[:instanceid], lang: request_lang)) and return if turbo_frame_request?
 
-    render partial: 'instances/details', layout: nil
+    render partial: 'show'
   end
 
   private

app/controllers/properties_controller.rb

@@ -34,9 +34,10 @@ def show
     @acronym = params[:ontology]
     @property = get_property(params[:id],  @acronym, include: 'all')
 
-    redirect_to(ontology_path(id: params[:ontology], p: 'properties', propertyid: params[:id], lang: request_lang)) and return unless turbo_frame_request?
+    redirect_to(ontology_path(id: params[:ontology], p: 'properties', propertyid: params[:id], lang: request_lang)) and return if turbo_frame_request?
 
     render partial: 'show'
+
   end
 
 

app/controllers/schemes_controller.rb

@@ -32,7 +32,7 @@ def index
   end
 
   def show
-    redirect_to(ontology_path(id: params[:ontology_id], p: 'schemes', schemeid: params[:id],lang: request_lang)) and return unless turbo_frame_request?
+    redirect_to(ontology_path(id: params[:ontology], p: 'schemes', schemeid: params[:id],lang: request_lang)) and return if turbo_frame_request?
 
     @scheme = get_request_scheme
   end

app/views/collections/_show.html.haml

@@ -0,0 +1,17 @@
+= render TurboFrameComponent.new(id: 'collection_show', data: {"turbo-frame-target": "frame"}) do
+  - if @collection
+    - if @collection.errors
+      = render Display::AlertComponent.new(type:'info', message: @collection.errors.join)
+    - else
+
+      = render TabsContainerComponent.new(type:'outline') do |c|
+        - apikey = "#{get_apikey}"
+        - c.pinned_right do
+          %div{'data-concepts-json-target': 'button'}
+            .concepts_json_button
+              = render RoundedButtonComponent.new(link: "#{@ontology.id}/collections/#{escape(@collection.id)}?display=all&apikey=#{apikey}", target:'_blank')
+
+        - c.item(title: t('concepts.details'), path: '#details', selected: true, json_link: "#{@ontology.id}/collections/#{escape(@collection.id)}?display=all&apikey=#{apikey}") 
+
+        - c.item_content do
+          = render :partial =>'/collections/collection', locals: {collection: @collection}

app/views/instances/_details.html.haml

@@ -1,26 +1,20 @@
-= render TurboFrameComponent.new(id: params[:modal]&.to_s.eql?('true') ? modal_frame_id : 'instance_show') do
-  - if @instance && @instance["@id"]
-    %div
-      - ontology_acronym = params[:ontology_id] || @ontology.acronym
-      - filter_properties = ["http://www.w3.org/1999/02/22-rdf-syntax-ns#type", "http://www.w3.org/2000/01/rdf-schema#label", "http://www.w3.org/2004/02/skos/core#prefLabel"]
-
-      =  render ConceptDetailsComponent.new(id:'instance-details', acronym: ontology_acronym, concept_id: @instance["@id"]) do |c|
-        - c.header(stripped: true) do |t|
-          - t.add_row({th: t("instances.id")}, {td: link_to_with_actions(@instance["@id"], acronym: @ontology.acronym) })
-
-          - label = @instance['label'] || @instance['prefLabel']
-          - unless label.blank?
-            - t.add_row({th: t('instances.label') }, {td: label.join(',').html_safe})
-
-          - types = @instance.types.reject{|x| x['NamedIndividual']}
-          - unless types.empty?
-            - t.add_row({th: t('instances.type') }) do |r|
-              - r.td do
-                = types.reject{|x| x['NamedIndividual']}.map {|cls| link_to_class(ontology_acronym,cls)}.join(', ').html_safe
-          - properties = @instance[:properties].to_h.select{|k,v| !filter_properties.include? k.to_s}
-          - properties.each do |prop|
-            - if !prop[1].nil?
-              - t.add_row({th: link_to_property(prop[0], ontology_acronym)}, {td: prop[1].map { |value| instance_property_value(value , ontology_acronym) }.join(', ').html_safe})
+- ontology_acronym = params[:ontology_id] || @ontology.acronym
+- filter_properties = ["http://www.w3.org/1999/02/22-rdf-syntax-ns#type", "http://www.w3.org/2000/01/rdf-schema#label", "http://www.w3.org/2004/02/skos/core#prefLabel"]
+=  render ConceptDetailsComponent.new(id:'instance-details', acronym: ontology_acronym, concept_id: @instance["@id"]) do |c|
+  - c.header(stripped: true) do |t|
+    - t.add_row({th: t("instances.id")}, {td: link_to_with_actions(@instance["@id"], acronym: @ontology.acronym) })
+    - label = @instance['label'] || @instance['prefLabel']
+    - unless label.blank?
+      - t.add_row({th: t('instances.label') }, {td: label.join(',').html_safe})
+    - types = @instance.types.reject{|x| x['NamedIndividual']}
+    - unless types.empty?
+      - t.add_row({th: t('instances.type') }) do |r|
+        - r.td do
+          = types.reject{|x| x['NamedIndividual']}.map {|cls| link_to_class(ontology_acronym,cls)}.join(', ').html_safe
+    - properties = @instance[:properties].to_h.select{|k,v| !filter_properties.include? k.to_s}
+    - properties.each do |prop|
+      - if !prop[1].nil?
+        - t.add_row({th: link_to_property(prop[0], ontology_acronym)}, {td: prop[1].map { |value| instance_property_value(value , ontology_acronym) }.join(', ').html_safe})
 
 
 

app/views/instances/_instances.html.haml

@@ -9,7 +9,7 @@
 
     - if params[:p].eql?('instances')
       %div#prop_contents{data: {'container-splitter-target': 'container'}}
-        = render partial: 'instances/details'
+        = render partial: 'instances/show', locals: { concept: @concept}
 
 
 

app/views/instances/_show.html.haml

@@ -0,0 +1,16 @@
+= render TurboFrameComponent.new(id: 'instance_show') do
+  - if @instance
+    - if @instance.errors
+      = render Display::AlertComponent.new(type:'info', message: @instance.errors.join)
+    - else
+      = render TabsContainerComponent.new(type:'outline') do |c|
+        - apikey = "#{get_apikey}"
+        - c.pinned_right do
+          %div{'data-concepts-json-target': 'button'}
+            .concepts_json_button
+              = render RoundedButtonComponent.new(link: "#{@ontology.id}/instances/#{escape(@instance["@id"])}?display=all&apikey=#{apikey}", target:'_blank')
+
+        - c.item(title: t('concepts.details'), path: '#details', selected: true, json_link: "#{@ontology.id}/instances/#{escape(@instance.id)}?display=all&apikey=#{apikey}") 
+
+        - c.item_content do
+          = render :partial =>'/instances/details'

app/views/ontologies/sections/_collections.html.haml

@@ -12,6 +12,6 @@
       %div#collection_contents{data:{'container-splitter-target': 'container'}}
         = render TurboFrameComponent.new(id: 'collection') do
           - if @collection
-            = render partial: 'collections/collection', locals: {collection: @collection}
+            = render partial: 'collections/show', locals: {collection: @collection}
 
 

app/views/ontologies/sections/_schemes.html.haml

@@ -11,7 +11,7 @@
 
     %div#scheme_contents{data:{'container-splitter-target': 'container'}}
       = render TurboFrameComponent.new(id:'scheme') do
-        = render partial: 'schemes/scheme', locals: {scheme: @scheme}
+        = render partial: 'schemes/show', locals: {scheme: @scheme}
 
 
 

app/views/ontologies/sections/properties.html.haml

@@ -10,4 +10,4 @@
                                    tree_url:  "/ontologies/#{@ontology.acronym}/properties?propertyid=#{escape(params[:propertyid])}&ontology=#{@ontology.acronym}&auto_click=false&language=#{request_lang}")
 
       %div#prop_contents{data: {'container-splitter-target': 'container'}}
-        = render partial: 'properties/show'
+        = render partial: 'properties/show', locals: { property: @property, acronym: @ontology}

app/views/properties/_details.html.haml

@@ -0,0 +1,13 @@
+- properties = LinkedData::Client::Models::Property.properties_to_hash(@property).first
+= render ConceptDetailsComponent.new(id:'property-details', acronym: @acronym, concept_id: @property.id,
+                properties: @property.properties,
+                top_keys: [],
+                bottom_keys: properties.keys.map(&:to_s),
+                exclude_keys: []) do |c|
+  - c.header(stripped: true) do |t|
+    - t.add_row({th: t('properties.id')}, {td: link_to_with_actions(@property.id, acronym: @acronym)})
+    - t.add_row({th: t('properties.type')}, {td: @property.type })
+    - t.add_row({th: t('properties.preferred_name')}, {td: display_in_multiple_languages(@property.label)}) unless  @property.label.blank?
+    - t.add_row({th: t('properties.definitions')}, {td: display_in_multiple_languages(@property.definition)}) unless @property.definition.blank?
+    - t.add_row({th: t('properties.domain')}, {td:  get_link_for_cls_ajax(@property.domain, @acronym, '_top')}) unless @property.domain.blank?
+    - t.add_row({th: t('properties.range')}, {td: get_link_for_cls_ajax(@property.range, @acronym, '_top')}) unless @property.range.blank?

app/views/properties/_show.html.haml

@@ -4,15 +4,14 @@
       = render Display::AlertComponent.new(type:'info', message: @property.errors.join)
     - else
       - properties = LinkedData::Client::Models::Property.properties_to_hash(@property).first
-      = render ConceptDetailsComponent.new(id:'property-details', acronym: @acronym, concept_id: @property.id,
-                      properties: @property.properties,
-                      top_keys: [],
-                      bottom_keys: properties.keys.map(&:to_s),
-                      exclude_keys: []) do |c|
-        - c.header(stripped: true) do |t|
-          - t.add_row({th: t('properties.id')}, {td: link_to_with_actions(@property.id, acronym: @acronym)})
-          - t.add_row({th: t('properties.type')}, {td: @property.type })
-          - t.add_row({th: t('properties.preferred_name')}, {td: display_in_multiple_languages(@property.label)}) unless  @property.label.blank?
-          - t.add_row({th: t('properties.definitions')}, {td: display_in_multiple_languages(@property.definition)}) unless @property.definition.blank?
-          - t.add_row({th: t('properties.domain')}, {td:  get_link_for_cls_ajax(@property.domain, @acronym, '_top')}) unless @property.domain.blank?
-          - t.add_row({th: t('properties.range')}, {td: get_link_for_cls_ajax(@property.range, @acronym, '_top')}) unless @property.range.blank?
+      = render TabsContainerComponent.new(type:'outline') do |c|
+        - apikey = "#{get_apikey}"
+        - c.pinned_right do
+          %div{'data-concepts-json-target': 'button'}
+            .concepts_json_button
+              = render RoundedButtonComponent.new(link: "#{@ontology.id}/properties/#{escape(@property.id)}?display=all&apikey=#{apikey}", target:'_blank')
+
+        - c.item(title: t('concepts.details'), path: '#details', selected: true, json_link: "#{@ontology.id}/properties/#{escape(@property.id)}?display=all&apikey=#{apikey}") 
+
+        - c.item_content do
+          = render :partial =>'/properties/details'

app/views/schemes/_show.html.haml

@@ -0,0 +1,17 @@
+= render TurboFrameComponent.new(id: 'scheme_show', data: {"turbo-frame-target": "frame"}) do
+  - if @scheme
+    - if @scheme.errors
+      = render Display::AlertComponent.new(type:'info', message: @scheme.errors.join)
+    - else
+
+      = render TabsContainerComponent.new(type:'outline') do |c|
+        - apikey = "#{get_apikey}"
+        - c.pinned_right do
+          %div{'data-concepts-json-target': 'button'}
+            .concepts_json_button
+              = render RoundedButtonComponent.new(link: "#{@ontology.id}/schemes/#{escape(@scheme.id)}?display=all&apikey=#{apikey}", target:'_blank')
+
+        - c.item(title: t('concepts.details'), path: '#details', selected: true, json_link: "#{@ontology.id}/scheme/#{escape(@scheme.id)}?display=all&apikey=#{apikey}") 
+
+        - c.item_content do
+          = render :partial =>'/schemes/scheme', locals: {scheme: @scheme}