<%= display_header_subtitle(@tool, 'tool') %>
+<% end %> + +<% if @errors && !@errors.empty? %> +| Description | +Revision Date | +Action by | +Actions | +
|---|---|---|---|
| + <% title = "View revision #{revision_id}" %> + <%= revision_id %> - + <% if revision['meta']['deleted'] == true %> + Deleted + <% elsif index == 0 %> + Published + <%= link_to 'View', tool_path(revision_id: revision_id), title: title %> + <% else %> + Revision + <%= link_to 'View', tool_path(revision_id: revision_id), title: title %> + <% end %> + | ++ <%= revision['meta']['revision-date'] %> + | ++ <%= revision['meta']['user-id'] %> + | ++ <% if @revisions.first['meta']['deleted'] == true %> + <% phrase = 'Reinstate' %> + <% confirm_phrase = 'Are you sure you want to reinstate this record?' %> + <% action = 'reinstate-tool' %> + <% else %> + <% phrase = 'Revert to this Revision' %> + <% confirm_phrase = 'Are you sure you want to revert to this revision?' %> + <% action = 'revert-tool' %> + <% end %> + + <% unless index == 0 || revision['meta']['deleted'] == true %> + <% if current_provider?(@provider_id) %> + <%= link_to phrase, "#revert-revisions-modal-#{revision_id}", class: 'display-modal' %> + <% elsif available_provider?(@provider_id) %> + <%= link_to phrase, "#not-current-provider-modal-#{revision_id}", class: 'display-modal not-current-provider', data: { 'provider': @provider_id, record_action: action } %> + <% end %> + + <%= render partial: "shared/not_current_provider_modal", locals: { + modal_index: revision_id, + options: { + revisions: true, + tool: @tool, + concept_id: @concept_id, + revision_id: revision_id + } + } %> + <% end %> + | +
- <%= link_to 'Revisions', '#', class: 'eui-btn--link disabled' %> - <%#= link_to "Revisions (#{@revisions.size})", tool_revisions_path, class: 'eui-btn--link disabled' %> + <%= link_to "Revisions (#{@revisions.size})", tool_revisions_path, class: 'eui-btn--link' %>
diff --git a/config/environments/production.rb b/config/environments/production.rb index dc5511069..662e251d8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -135,7 +135,7 @@ config.subscriptions_enabled = true # Feature toggle for UMM-T - config.umm_t_enabled = false + config.umm_t_enabled = true config.cmr_env = 'ops' config.echo_env = 'ops' diff --git a/config/environments/uat.rb b/config/environments/uat.rb index 009094283..43a54ba41 100644 --- a/config/environments/uat.rb +++ b/config/environments/uat.rb @@ -115,7 +115,7 @@ config.csplog_enabled = false # Feature toggle for UMM-T - config.umm_t_enabled = false + config.umm_t_enabled = true config.cmr_env = 'uat' config.echo_env = 'uat' diff --git a/config/locales/en.yml b/config/locales/en.yml index bf9d5b6cb..3201d3cf6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -198,6 +198,17 @@ en: flash: success: 'Tool Draft Published Successfully!' error: 'Tool Draft was not published successfully' + destroy: + flash: + success: 'Tool Deleted Successfully!' + error: 'Tool was not deleted successfully' + clone: + flash: + notice: 'Records must have a unique Name and Long Name within a provider. Click here to enter a new Name and Long Name.' + revert: + flash: + success: 'Tool Revision Created Successfully!' + error: 'Tool revision was not created successfully' collection_associations: destroy: flash: diff --git a/config/routes.rb b/config/routes.rb index 4b61880ee..2ae58ed56 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -103,7 +103,11 @@ get '/services/:id/clone' => 'services#clone', as: 'clone_service' get '/services/:id/download_json(/:revision_id)' => 'services#download_json', as: 'download_json_service' - resources :tools, only: [:show, :create, :edit] + resources :tools, only: [:show, :create, :edit, :destroy] + get '/tools/:id/clone' => 'tools#clone', as: 'clone_tool' + get '/tools/:id/revisions' => 'tools#revisions', as: 'tool_revisions' + get '/tools/:id/download_json(/:revision_id)' => 'tools#download_json', as: 'download_json_tool' + get '/tools/:id/revert/:revision_id' => 'tools#revert', as: 'revert_tool' resources :variable_drafts, controller: 'variable_drafts', draft_type: 'VariableDraft' do member do diff --git a/lib/tasks/compare_xml_collections.rake b/lib/tasks/compare_xml_collections.rake new file mode 100644 index 000000000..6e9e99898 --- /dev/null +++ b/lib/tasks/compare_xml_collections.rake @@ -0,0 +1,155 @@ +require 'libxml_to_hash' + +namespace :collection do + desc 'Translate a collection from native format to UMM JSON and back to native format' + task :loss, [:file, :format, :disp, :version] => :environment do |_task, args| + args.with_defaults(:version => '1.15.3') + args.with_defaults(:disp => 'show') + + abort 'FORMAT INVALID' unless args.format == 'echo10' || args.format == 'dif10' || args.format == 'iso19115' + + filename = args.file.split('/')[-1] + puts "\nTranslating #{filename} to UMM JSON..." + + native_original_xml = File.read(args.file) + native_original_hash = Hash.from_xml(native_original_xml) + + #translate to UMM + umm_response = cmr_client.translate_collection(native_original_xml, "application/#{args.format}+xml", "application/vnd.nasa.cmr.umm+json;version=#{args.version}", skip_validation=true ) + umm_response.success? ? puts("\nsuccessful translation to UMM") : abort("\nUMM translation failure") + umm_json = umm_response.body.to_json + + # translate back to native + back_to_native = cmr_client.translate_collection(umm_json, "application/vnd.nasa.cmr.umm+json;version=#{args.version}", "application/#{args.format}+xml", skip_validation=true ) + back_to_native.success? ? puts("successful translation to native format \n\n") : abort("Native format translation failure \n\n") + native_converted_hash = Hash.from_xml(back_to_native.body) + native_converted_xml = back_to_native.body + + if args.format == 'dif10' + nokogiri_original = Nokogiri::XML(native_original_xml) { |config| config.strict.noblanks } .remove_namespaces! + nokogiri_converted = Nokogiri::XML(native_converted_xml) { |config| config.strict.noblanks } .remove_namespaces! + else + nokogiri_original = Nokogiri::XML(native_original_xml) { |config| config.strict.noblanks } + nokogiri_converted = Nokogiri::XML(native_converted_xml) { |config| config.strict.noblanks } + end + + ignored_paths = Array.new + + nokogiri_original.diff(nokogiri_converted, {:added => true, :removed => true}) do |change,node| + split_path = node.parent.path.split('[') + if node.parent.path.include?('[') && !ignored_paths.include?(split_path[0]) + ignored_paths << split_path[0] + array_comparison(split_path[0], native_original_hash, native_converted_hash).each do |item| + puts("#{item[0]}: #{item[1]}".ljust(60) + item[2]) if args.disp == 'show' + puts("#{item[0]}: " + item[2]) if args.disp == 'hide' + end + elsif !ignored_paths.include?(split_path[0]) && !path_leads_to_list?(node.parent.path, native_original_hash, native_converted_hash) + if is_xml?(node) + element = Hash.from_xml(node.to_xml) + hash_map(element).each do |item| + puts("#{change}: #{item['value']}".ljust(60) + node.parent.path+'/'+item['path']) if args.disp == 'show' + puts("#{change}: " + node.parent.path+'/'+item['path']) if args.disp == 'hide' + end + else + puts("#{change}: #{node.to_xml}".ljust(60) + node.parent.path) if args.disp == 'show' + puts("#{change}: " + node.parent.path) if args.disp == 'hide' + end + end + end + end + + def path_leads_to_list?(path, org_hash, conv_hash) + # this method takes a path string (and the full original and converted hashes) and outputs true if the path string contains a list; else false + org_hash = hash_navigation(path, org_hash) + conv_hash = hash_navigation(path, conv_hash) + + if path.include?("[") && path.include?("]") + bool = true + elsif org_hash.is_a?(Hash) && conv_hash.is_a?(Hash) + # the number of keys must be 1 because all arrays in echo10, dif10, and iso19115 are tagged similar to: + #