review fixes

app/views/shared/_native_navbar.html.erb

@@ -27,5 +27,12 @@
     <native-action data-placement="create" data-icon="pencil_plus">
       <%= link_to t('create'), new_template_path(folder_name: folder_name), data: { turbo_frame: :modal, native_modal: :medium } %>
     </native-action>
+    <% unless controller_name.in?(%w[templates_archived submissions_archived]) %>
+      <native-action data-placement="menu" data-menu="<%= t('new') %>" data-menu-icon="pencil_plus" data-icon="upload" data-native="upload" data-label="<%= t('upload') %>" data-url="<%= templates_upload_path(folder_name: folder_name) %>" data-accept="image/*, application/pdf, application/zip, application/json<%= ", #{Templates::CreateAttachments::DOCUMENT_EXTENSIONS.join(', ')}" if Docuseal.advanced_formats? %>"></native-action>
+      <native-action data-placement="menu" data-menu="<%= t('new') %>" data-menu-icon="pencil_plus" data-icon="scan" data-native="scan" data-label="<%= t('scan') %>" data-url="<%= templates_upload_path(folder_name: folder_name) %>"></native-action>
+      <native-action data-placement="menu" data-menu="<%= t('new') %>" data-menu-icon="pencil_plus" data-icon="pencil_plus">
+        <%= link_to t('create'), new_template_path(folder_name: folder_name), data: { turbo_frame: :modal, native_modal: :medium } %>
+      </native-action>
+    <% end %>
   <% end %>
 <% end %>

app/views/shared/_settings_nav.html.erb

@@ -1,5 +1,6 @@
 <% expanded = local_assigns[:expanded] %>
-<div class="<%= expanded ? 'block -mx-3 md:mx-0' : 'w-full md:w-52 flex-none' %>">
+<% nav_link_data = turbo_native_app? && !expanded ? { turbo_action: 'replace' } : {} %>
+<div class="<%= expanded ? 'block -mx-3 md:mx-0' : 'w-full md:w-52 flex-none' %> <%= 'md:sticky md:top-0 md:self-start' if turbo_native_app? && !expanded %>">
   <% unless expanded || turbo_native_app? %>
     <div class="md:hidden w-full">
       <a href="<%= local_assigns[:back_path] || settings_path %>" class="flex items-center space-x-0.5 font-medium">
@@ -26,60 +27,60 @@
           <li></li>
         <% end %>
         <li>
-          <%= link_to t('profile'), settings_profile_index_path, class: 'text-base hover:bg-base-300' %>
+          <%= link_to t('profile'), settings_profile_index_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
         </li>
         <li>
-          <%= link_to t('account'), settings_account_path, class: 'text-base hover:bg-base-300' %>
+          <%= link_to t('account'), settings_account_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
         </li>
         <% if (!Docuseal.multitenant? || EncryptedConfig.exists?(key: EncryptedConfig::EMAIL_SMTP_KEY, account: current_account)) && can?(:read, EncryptedConfig.new(key: EncryptedConfig::EMAIL_SMTP_KEY, account: current_account)) && ENV['SMTP_ADDRESS'].blank? && true_user == current_user %>
           <li>
-            <%= link_to t('email'), settings_email_index_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to t('email'), settings_email_index_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
           </li>
         <% end %>
         <% unless Docuseal.multitenant? %>
           <% if can?(:read, EncryptedConfig.new(key: EncryptedConfig::FILES_STORAGE_KEY, account: current_account)) && true_user == current_user && ENV['S3_ATTACHMENTS_BUCKET'].blank? && ENV['GCS_BUCKET'].blank? && ENV['AZURE_CONTAINER'].blank? %>
             <li>
-              <%= link_to t('storage'), settings_storage_index_path, class: 'text-base hover:bg-base-300' %>
+              <%= link_to t('storage'), settings_storage_index_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
             </li>
           <% end %>
           <% if can?(:read, EncryptedConfig.new(key: 'submitter_invitation_sms', account: current_account)) && true_user == current_user && (!turbo_native_ios? || can?(:manage, :sms_verification)) %>
             <li>
-              <%= link_to 'SMS', settings_sms_path, class: 'text-base hover:bg-base-300' %>
+              <%= link_to 'SMS', settings_sms_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
             </li>
           <% end %>
         <% end %>
         <% if can?(:read, AccountConfig) %>
           <li>
-            <%= link_to t('notifications'), settings_notifications_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to t('notifications'), settings_notifications_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
           </li>
         <% end %>
         <% if can?(:read, EncryptedConfig.new(key: EncryptedConfig::ESIGN_CERTS_KEY, account: current_account)) %>
           <li>
-            <%= link_to t('e_signature'), settings_esign_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to t('e_signature'), settings_esign_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
           </li>
         <% end %>
         <% if can?(:read, AccountConfig) %>
           <li>
-            <%= link_to t('personalization'), settings_personalization_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to t('personalization'), settings_personalization_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
           </li>
         <% end %>
         <% if can?(:read, User) %>
           <li>
-            <%= link_to t('users'), settings_users_path, class: 'text-base hover:bg-base-300' %>
+            <%= link_to t('users'), settings_users_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
           </li>
         <% end %>
-        <%= render 'shared/settings_nav_extra' %>
+        <%= render 'shared/settings_nav_extra', nav_link_data: %>
         <% if Docuseal.demo? || !Docuseal.multitenant? %>
           <% if can?(:read, AccessToken) %>
             <li>
-              <%= link_to 'API', settings_api_index_path, class: 'text-base hover:bg-base-300' %>
+              <%= link_to 'API', settings_api_index_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
             </li>
           <% end %>
         <% end %>
         <% if Docuseal.demo? || !Docuseal.multitenant? || (current_user != true_user && !current_account.testing?) %>
           <% if can?(:read, WebhookUrl) %>
             <li>
-              <%= link_to 'Webhooks', settings_webhooks_path, class: 'text-base hover:bg-base-300' %>
+              <%= link_to 'Webhooks', settings_webhooks_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
             </li>
           <% end %>
         <% end %>
@@ -108,15 +109,15 @@
           <% end %>
           <% if (!Docuseal.multitenant? || can?(:manage, :saml_sso)) && can?(:read, EncryptedConfig.new(key: 'saml_configs', account: current_account)) && true_user == current_user && (!turbo_native_ios? || can?(:manage, :saml_sso)) %>
             <li>
-              <%= link_to 'SSO', settings_sso_index_path, class: 'text-base hover:bg-base-300' %>
+              <%= link_to 'SSO', settings_sso_index_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
             </li>
           <% end %>
           <% if !Docuseal.multitenant? && can?(:read, McpToken) && can?(:manage, :mcp) %>
             <li>
-              <%= link_to 'MCP', settings_mcp_index_path, class: 'text-base hover:bg-base-300' %>
+              <%= link_to 'MCP', settings_mcp_index_path, class: 'text-base hover:bg-base-300', data: nav_link_data %>
             </li>
           <% end %>
-          <%= render 'shared/settings_nav_extra2' %>
+          <%= render 'shared/settings_nav_extra2', nav_link_data: %>
           <% if (can?(:manage, EncryptedConfig) && current_user == true_user) || (current_user != true_user && current_account.testing?) %>
             <%= form_for '', url: testing_account_path, method: current_account.testing? ? :delete : :post, html: { class: 'w-full' } do |f| %>
               <li>

app/views/shared/_turbo_drawer.html.erb

@@ -1,5 +1,5 @@
 <% if turbo_native_app? && !turbo_frame_request? %>
-  <% content_for(:html_title, local_assigns[:title]) if local_assigns[:title] %>
+  <% content_for(:native_title, local_assigns[:title]) if local_assigns[:title] %>
   <turbo-frame id="drawer">
     <native-modal class="block w-full" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>">
       <%= yield %>

app/views/shared/_turbo_modal.html.erb

@@ -1,6 +1,6 @@
 <% if turbo_native_ios? || (turbo_native_app? && !turbo_frame_request?) %>
   <% content_for(:native_modal, 'true') %>
-  <% content_for(:html_title, local_assigns[:title]) if local_assigns[:title] %>
+  <% content_for(:native_title, local_assigns[:title]) if local_assigns[:title] %>
   <turbo-frame id="modal">
     <native-modal class="block max-w-lg mx-auto pb-6" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>">
       <%= yield %>

app/views/shared/_turbo_modal_large.html.erb

@@ -18,7 +18,7 @@
     </turbo-modal>
   </turbo-frame>
 <% elsif turbo_native_app? %>
-  <% content_for(:html_title, local_assigns[:title]) if local_assigns[:title] %>
+  <% content_for(:native_title, local_assigns[:title]) if local_assigns[:title] %>
   <native-modal class="block w-full [&>.px-5]:px-4" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>">
     <%= yield %>
   </native-modal>