Merge pull request #5331 from scinote-eln/develop

Merge develop

VERSION

@@ -1 +1 @@
-1.27.0
+1.27.1

app/assets/javascripts/protocols/protocolsio.js

@@ -136,7 +136,7 @@ function applySearchCallback() {
       }
       PerfectSb().update_all();
       // Reset page id after every request
-      $('form.protocols-search-bar #page-id').val(1);
+      $('form.protocols-search-bar #page-id').val(0);
 
       // Apply all callbacks on new elements
       applyClickCallbackOnProtocolCards();

app/javascript/vue/navigation/top_menu.vue

@@ -12,6 +12,7 @@
         :options="teams"
         :disableSearch="true"
         :selectorId="`sciNavigationTeamSelector`"
+        :labelHTML="true"
         @dropdown:changed="switchTeam"
       />
     </div>

app/javascript/vue/protocol/attachments.vue

@@ -36,7 +36,7 @@
                 :data-sketch-container="`.attachments[data-step-id=${step.id}]`"
               >
                 <span class="new-marvinjs-upload-icon">
-                  <img v-bind:src="marvinjsIcon">
+                  <img :src="step.attributes.marvinjs_context.icon">
                 </span>
                   {{ i18n.t('protocols.steps.attachments.menu.chemical_drawing') }}
               </a>
@@ -98,7 +98,6 @@
   import thumbnailAttachment from './step_attachments/thumbnail.vue'
   import uploadingAttachment from './step_attachments/uploading.vue'
   import emptyAttachment from './step_attachments/empty.vue'
-  import marvinjsIcon from '../images/marvinjs.svg'
   import bioEddieIcon from '../images/bio_eddie.png'
 
   import WopiFileModal from './step_attachments/mixins/wopi_file_modal.js'
@@ -121,7 +120,6 @@
     },
     data() {
       return {
-        marvinjsIcon,
         bioEddieIcon,
         viewModeOptions: ['inline', 'thumbnail', 'list'],
         orderOptions: ['new', 'old', 'atoz', 'ztoa']

app/utilities/protocol_importers/protocols_io/v3/api_client.rb

@@ -37,7 +37,7 @@ module ProtocolImporters
         #     Default 10.
         #   page_id (optional): int (1..n)
         #     id of page.
-        #     Default is 1.
+        #     Default is 1. (the first page_id: 0)
         def protocol_list(query_params = {})
           local_sorting = false
           response = with_handle_network_errors do

app/views/protocols/index/_protocolsio_modal_body.html.erb

@@ -13,7 +13,7 @@
           class: 'protocols-search-bar',
           remote: true do %>
           <%= hidden_field_tag 'protocol_source', 'protocolsio/v3' %>
-          <%= hidden_field_tag 'page_id', 1, id: 'page-id' %>
+          <%= hidden_field_tag 'page_id', 0, id: 'page-id' %>
           <div class='header'>
             <div class='protocols-search-bar-panel'>
               <div class='sci-input-container left-icon'>

config/initializers/constants.rb

@@ -272,7 +272,7 @@ class Constants
           order_field: :activity,
           order_dir: :desc,
           page_size: 50,
-          page_id: 1,
+          page_id: 0,
           fields: 'id,title,authors,created_on,uri,stats,published_on'
         }
       },