From b8fafc34eb9f99c5601e3c9cad5e3f02894c7a24 Mon Sep 17 00:00:00 2001 From: Finn Bacall Date: Tue, 18 Jun 2024 16:25:15 +0100 Subject: [PATCH] Strip `.json` extension from URLs returned from API endpoints They are used to render snippets in the UI --- app/views/collections/index.json.jbuilder | 2 +- app/views/content_providers/index.json.jbuilder | 2 +- app/views/learning_path_topics/index.json.jbuilder | 2 +- app/views/materials/index.json.jbuilder | 2 +- app/views/nodes/index.json.jbuilder | 2 +- app/views/sources/index.json.jbuilder | 2 +- app/views/users/_list.json.jbuilder | 2 +- app/views/workflows/index.json.jbuilder | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/collections/index.json.jbuilder b/app/views/collections/index.json.jbuilder index 4733c4433..9c00368d9 100644 --- a/app/views/collections/index.json.jbuilder +++ b/app/views/collections/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@collections) do |collection| json.extract! collection, :id, :title, :description, :image_url - json.url collection_url(collection, format: :json) + json.url collection_url(collection) end diff --git a/app/views/content_providers/index.json.jbuilder b/app/views/content_providers/index.json.jbuilder index 5139760eb..cd4efff95 100644 --- a/app/views/content_providers/index.json.jbuilder +++ b/app/views/content_providers/index.json.jbuilder @@ -1,5 +1,5 @@ json.array!(@content_providers) do |content_provider| json.extract! content_provider, :id, :id, :title, :image_url, :description, :url, :created_at, :updated_at, :contact - json.url content_provider_url(content_provider, format: :json) + json.url content_provider_url(content_provider) end diff --git a/app/views/learning_path_topics/index.json.jbuilder b/app/views/learning_path_topics/index.json.jbuilder index 80e2f1b70..60497efef 100644 --- a/app/views/learning_path_topics/index.json.jbuilder +++ b/app/views/learning_path_topics/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@learning_path_topics) do |learning_path_topic| json.extract! learning_path_topic, :id, :title, :description - json.url learning_path_topic_url(learning_path_topic, format: :json) + json.url learning_path_topic_url(learning_path_topic) end diff --git a/app/views/materials/index.json.jbuilder b/app/views/materials/index.json.jbuilder index b22afacbc..fcbde996a 100644 --- a/app/views/materials/index.json.jbuilder +++ b/app/views/materials/index.json.jbuilder @@ -1,6 +1,6 @@ json.array!(@materials) do |material| json.extract! material, :id, :title, :url, :description, :doi, :remote_updated_date, :remote_created_date - json.url material_url(material, format: :json) + json.url material_url(material) json.partial! 'common/ontology_terms', type: 'scientific_topics', resource: material json.partial! 'common/ontology_terms', type: 'operations', resource: material diff --git a/app/views/nodes/index.json.jbuilder b/app/views/nodes/index.json.jbuilder index 7ccfefaae..c274c8156 100644 --- a/app/views/nodes/index.json.jbuilder +++ b/app/views/nodes/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@nodes) do |node| json.extract! node, :id, :title, :description, :image_url, :events, :materials, :created_at, :updated_at - json.url node_url(node, format: :json) + json.url node_url(node) end diff --git a/app/views/sources/index.json.jbuilder b/app/views/sources/index.json.jbuilder index e2e4d355c..d7af60eb7 100644 --- a/app/views/sources/index.json.jbuilder +++ b/app/views/sources/index.json.jbuilder @@ -1,5 +1,5 @@ json.array!(@sources) do |source| json.extract! source, :content_provider, :created_at, :url, :method, :enabled - json.url source_url(source, format: :json) + json.url source_url(source) end diff --git a/app/views/users/_list.json.jbuilder b/app/views/users/_list.json.jbuilder index d3a437cdd..e0c759ab8 100644 --- a/app/views/users/_list.json.jbuilder +++ b/app/views/users/_list.json.jbuilder @@ -1,5 +1,5 @@ json.array!(users) do |user| json.extract! user, :id, :username json.extract! user.profile, :firstname, :surname if user.profile - json.url user_url(user, format: :json) + json.url user_url(user) end diff --git a/app/views/workflows/index.json.jbuilder b/app/views/workflows/index.json.jbuilder index 700db4dec..7205ea416 100644 --- a/app/views/workflows/index.json.jbuilder +++ b/app/views/workflows/index.json.jbuilder @@ -1,6 +1,6 @@ json.array!(@workflows) do |workflow| json.extract! workflow, :id, :title, :description, :user_id, :workflow_content - json.url workflow_url(workflow, format: :json) + json.url workflow_url(workflow) json.partial! 'common/ontology_terms', type: 'scientific_topics', resource: workflow end