Merge pull request #2162 from okriuchykhin/ok_SCI_3990

Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993]
2025-09-18 02:54:39 +08:00 · 2019-10-17 17:03:11 +02:00 · 2019-10-17 17:03:11 +02:00 · 34f9e6265c
commit 34f9e6265c
parent 62cf439734 2637aed853
18 changed files with 63 additions and 41 deletions
--- a/6
+++ b/6
@ -1,13 +1,14 @@
 FROM ruby:2.6.4-buster
 MAINTAINER BioSistemika <info@biosistemika.com>

+ARG WKHTMLTOPDF_PACKAGE_URL=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb
+
 RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - && \
    echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list && \
    wget -O /usr/bin/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/77.0.3865.40/chromedriver_linux64.zip && \
    unzip /usr/bin/chromedriver_linux64.zip -d /usr/bin/

 # additional dependecies
-# libSSL-1.0 is required by wkhtmltopdf binary
 # libreoffice for file preview generation
 RUN apt-get update -qq && \
  apt-get install -y \
@ -24,6 +25,9 @@ RUN apt-get update -qq && \
  libreoffice \
  libfile-mimeinfo-perl \
  google-chrome-stable=77.* && \
+  wget -q -O /tmp/wkhtmltox_amd64.deb $WKHTMLTOPDF_PACKAGE_URL && \
+  apt-get install -y /tmp/wkhtmltox_amd64.deb && \
+  rm /tmp/wkhtmltox_amd64.deb && \
  npm install -g yarn && \
  ln -s /usr/lib/x86_64-linux-gnu/libvips.so.42 /usr/lib/x86_64-linux-gnu/libvips.so && \
  rm -rf /var/lib/apt/lists/*
--- a/Dockerfile.production
+++ b/Dockerfile.production
@ -1,8 +1,9 @@
 FROM ruby:2.6.4-buster
 MAINTAINER BioSistemika <info@biosistemika.com>

+ARG WKHTMLTOPDF_PACKAGE_URL=https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb
+
 # additional dependecies
-# libSSL-1.0 is required by wkhtmltopdf binary
 # libreoffice for file preview generation
 RUN apt-get update -qq && \
  apt-get install -y \
@ -21,6 +22,9 @@ RUN apt-get update -qq && \
  sudo graphviz --no-install-recommends \
  libreoffice \
  libfile-mimeinfo-perl && \
+  wget -q -O /tmp/wkhtmltox_amd64.deb $WKHTMLTOPDF_PACKAGE_URL && \
+  apt-get install -y /tmp/wkhtmltox_amd64.deb && \
+  rm /tmp/wkhtmltox_amd64.deb && \
  npm install -g yarn && \
  ln -s /usr/lib/x86_64-linux-gnu/libvips.so.42 /usr/lib/x86_64-linux-gnu/libvips.so && \
  rm -rf /var/lib/apt/lists/*
--- a/4
+++ b/4
@ -80,8 +80,8 @@ gem 'silencer' # Silence certain Rails logs
 gem 'sneaky-save', git: 'https://github.com/einzige/sneaky-save'
 gem 'turbolinks', '~> 5.1.1'
 gem 'underscore-rails'
-gem 'wicked_pdf', '~> 1.1.0'
-gem 'wkhtmltopdf-heroku', '2.12.4'
+gem 'wicked_pdf', '~> 1.4.0'
+gem 'wkhtmltopdf-heroku', '2.12.5'

 gem 'aws-sdk-rails'
 gem 'aws-sdk-s3'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -579,8 +579,9 @@ GEM
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.4)
    whacamole (1.2.0)
-    wicked_pdf (1.1.0)
-    wkhtmltopdf-heroku (2.12.4.0)
+    wicked_pdf (1.4.0)
+      activesupport
+    wkhtmltopdf-heroku (2.12.5.0)
    xpath (3.2.0)
      nokogiri (~> 1.8)
    yomu (0.1.5)
@ -694,8 +695,8 @@ DEPENDENCIES
  webmock
  webpacker (~> 4.0.0)
  whacamole
-  wicked_pdf (~> 1.1.0)
-  wkhtmltopdf-heroku (= 2.12.4)
+  wicked_pdf (~> 1.4.0)
+  wkhtmltopdf-heroku (= 2.12.5)
  yomu

 RUBY VERSION
--- a/app/controllers/concerns/report_actions.rb
+++ b/app/controllers/concerns/report_actions.rb
@ -42,7 +42,7 @@ module ReportActions
          'reports/elements/experiment_element.html.erb',
          experiment: experiment
        )
-        selected_modules = experiment.my_modules.where(id: module_ids)
+        selected_modules = experiment.my_modules.includes(:tags).where(id: module_ids)
        el[:children] = generate_experiment_contents_json(selected_modules)
        res << el
      end
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@ -98,8 +98,10 @@ module ReportsHelper
  end

  # "Hack" to omit file preview URL because of WKHTML issues
-  def report_image_asset_url(asset, _type = :asset, klass = nil)
-    image_tag(asset.generate_base64(:medium), class: klass)
+  def report_image_asset_url(asset)
+    image_tag(asset.medium_preview
+                   .processed
+                   .service_url(expires_in: Constants::URL_LONG_EXPIRE_TIME))
  end

  # "Hack" to load Glyphicons css directly from the CDN
--- a/app/models/concerns/tiny_mce_images.rb
+++ b/app/models/concerns/tiny_mce_images.rb
@ -20,7 +20,7 @@ module TinyMceImages
      tiny_mce_assets.each do |tm_asset|
        next unless tm_asset&.image&.attached?

-        new_tm_asset_src = tm_asset.convert_variant_to_base64(tm_asset.preview)
+        new_tm_asset_src = tm_asset.preview.processed.service_url(expires_in: Constants::URL_LONG_EXPIRE_TIME)
        html_description = Nokogiri::HTML(description)
        tm_asset_to_update = html_description.css(
          "img[data-mce-token=\"#{Base62.encode(tm_asset.id)}\"]"
--- a/app/models/my_module.rb
+++ b/app/models/my_module.rb
@ -370,6 +370,7 @@ class MyModule < ApplicationRecord
  def repository_json_hot(repository_id, order)
    data = []
    repository_rows
+      .includes(:created_by)
      .where(repository_id: repository_id)
      .order(created_at: order).find_each do |row|
      row_json = []
--- a/app/views/reports/elements/_my_module_activity_element.html.erb
+++ b/app/views/reports/elements/_my_module_activity_element.html.erb
@ -19,7 +19,7 @@
  <div class="report-element-body">
    <div class="row">
      <div class="col-xs-12 activity-container">
-        <% if activities.count > 0 %>
+        <% if activities.any? %>
          <!-- TODO: This might become potentially very big! -->
          <ul class="no-style activity-list">
            <% activities.each do |activity| %>
--- a/app/views/reports/elements/_my_module_element.html.erb
+++ b/app/views/reports/elements/_my_module_element.html.erb
@ -48,7 +48,7 @@
      <div class="pull-left">
        <%=t "projects.reports.elements.module.tags_header" %>
      </div>
-      <% if my_module.tags.count > 0 %>
+      <% if my_module.tags.any? %>
        <% my_module.tags.each do |tag| %>
          <div class="pull-left module-tag" style="background-color: <%= tag.color %>;">
            <%= tag.name %>
--- a/app/views/reports/elements/_my_module_result_asset_element.html.erb
+++ b/app/views/reports/elements/_my_module_result_asset_element.html.erb
@ -4,7 +4,14 @@
 <% comments = result.result_comments %>
 <% timestamp = asset.created_at %>
 <% icon_class = 'fas ' + (is_image ? 'fa-image' : 'fa-file') %>
-<div class="report-element report-result-element report-result-asset-element" data-ts="<%= timestamp.to_i %>" data-type="result_asset" data-id='{ "result_id": <%= result.id %> }' data-scroll-id="<%= result.id %>" data-modal-title="<%=t "projects.reports.elements.modals.result_contents.head_title", result: result.name %>" data-name="<%= result.name %>" data-icon-class="<%= icon_class %>">
+<div class="report-element report-result-element report-result-asset-element"
+     data-ts="<%= timestamp.to_i %>"
+     data-type="result_asset"
+     data-id='{ "result_id": <%= result.id %> }'
+     data-scroll-id="<%= result.id %>"
+     data-modal-title="<%= t("projects.reports.elements.modals.result_contents.head_title", result: result.name) %>"
+     data-name="<%= result.name %>"
+     data-icon-class="<%= icon_class %>">
  <div class="report-element-header">
    <div class="row">
      <div class="pull-left result-icon">
@ -13,23 +20,21 @@
      <div class="pull-left result-name">
        <%= result.name %>
        <% if result.archived? %>
-          <span class="label label-warning"><%=t 'search.index.archived' %></span>
+          <span class="label label-warning"><%= t('search.index.archived') %></span>
        <% end %>
      </div>
      <div class="pull-left file-name">
        <% if defined? export_all and export_all %>
          <a href="<%= path %>">
-            <em><%=t "projects.reports.elements.result_asset.file_name",
-                     file: filename %></em>
+            <em><%= t("projects.reports.elements.result_asset.file_name", file: filename) %></em>
          </a>
        <% else %>
-          <em><%=t "projects.reports.elements.result_asset.file_name",
-                   file: truncate(asset.file_name,
-                                  length: Constants::FILENAME_TRUNCATION_LENGTH) %></em>
+          <em><%= t("projects.reports.elements.result_asset.file_name",
+                    file: truncate(asset.file_name, length: Constants::FILENAME_TRUNCATION_LENGTH)) %></em>
        <% end %>
      </div>
      <div class="pull-left user-time">
-        <%=t "projects.reports.elements.result_asset.user_time", user: result.user.full_name, timestamp: l(timestamp, format: :full) %>
+        <%= t("projects.reports.elements.result_asset.user_time", user: result.user.full_name, timestamp: l(timestamp, format: :full)) %>
      </div>
      <div class="pull-right controls">
        <%= render partial: "reports/elements/element_controls.html.erb" %>
--- a/app/views/reports/elements/_result_comments_element.html.erb
+++ b/app/views/reports/elements/_result_comments_element.html.erb
@ -19,14 +19,14 @@
  <div class="report-element-body">
    <div class="row">
      <div class="col-xs-12  comments-container simple">
-        <% if comments.count == 0 %>
-          <em><%=t "projects.reports.elements.result_comments.no_comments" %></em>
-        <% else %>
+        <% if comments.any? %>
          <ul class="no-style content-comments">
            <% comments.each do |comment| %>
              <%= render partial: 'shared/comments/item.html.erb', locals: { comment: comment, readonly: true, report: true } %>
            <% end %>
          </ul>
+        <% else %>
+          <em><%=t "projects.reports.elements.result_comments.no_comments" %></em>
        <% end %>
      </div>
    </div>
--- a/app/views/reports/elements/_step_comments_element.html.erb
+++ b/app/views/reports/elements/_step_comments_element.html.erb
@ -19,14 +19,14 @@
  <div class="report-element-body">
    <div class="row">
      <div class="col-xs-12 comments-container simple">
-        <% if comments.count == 0 %>
-          <em><%=t "projects.reports.elements.step_comments.no_comments" %></em>
-        <% else %>
+        <% if comments.any? %>
          <ul class="no-style content-comments">
            <% comments.each do |comment| %>
              <%= render partial: 'shared/comments/item.html.erb', locals: { comment: comment, readonly: true, report: true } %>
            <% end %>
          </ul>
+        <% else %>
+          <em><%=t "projects.reports.elements.step_comments.no_comments" %></em>
        <% end %>
      </div>
    </div>
--- a/app/views/reports/new/modal/_project_contents_inner.html.erb
+++ b/app/views/reports/new/modal/_project_contents_inner.html.erb
@ -11,7 +11,7 @@
        <%= form.check_box :project, label: project.name %>
        <ul>

-          <% project.experiments.is_archived(false).each do |experiment| %>
+          <% project.experiments.includes(:my_module_groups).is_archived(false).each do |experiment| %>
            <% next unless experiment.my_modules.is_archived(false).exists? %>
            <li>
              <%= form.check_box "experiment_#{experiment.id}", label: experiment.name %>
--- a/config/initializers/extends/report_extends.rb
+++ b/config/initializers/extends/report_extends.rb
@ -78,21 +78,21 @@ module ReportExtends
                      true,
                      [:result],
                      proc do |my_module|
-                        my_module.results.select { |r| r.is_asset && r.active? }
+                        my_module.results.joins(:result_asset).select(&:active?)
                      end),
    ModuleElement.new([:result_tables],
                      :result_tables,
                      true,
                      [:result],
                      proc do |my_module|
-                        my_module.results.select { |r| r.is_table && r.active? }
+                        my_module.results.joins(:result_table).select(&:active?)
                      end),
    ModuleElement.new([:result_texts],
                      :result_texts,
                      true,
                      [:result],
                      proc do |my_module|
-                        my_module.results.select { |r| r.is_text && r.active? }
+                        my_module.results.joins(:result_text).select(&:active?)
                      end),
    ModuleElement.new([:activity],
                      :activity,
--- a/config/initializers/wicked_pdf.rb
+++ b/config/initializers/wicked_pdf.rb
@ -1,21 +1,25 @@
+# frozen_string_literal: true
+
 WickedPdf.config ||= {}

+ENV['PATH'].split(':').each do |path|
+  exe_path = File.join(path, 'wkhtmltopdf')
+  WickedPdf.config[:exe_path] = File.join(path, 'wkhtmltopdf') if File.file?(exe_path)
+end

 # WickedPdfHelper patch that fixes issue with including application.css
 # in environments like Heroku where assets.compile option is disabled and
 # it is not acceptable to enable it.
-if Rails.env.production? and Rails.configuration.assets.compile == false
-
+if Rails.env.production? && Rails.configuration.assets.compile == false
  WickedPdf::WickedPdfHelper::Assets.module_eval do
-
    def read_asset(source)
-       manifest = Rails.application.assets_manifest
-       path = File.join(manifest.dir, manifest.assets[source])
-       File.read(path)
+      manifest = Rails.application.assets_manifest
+      path = File.join(manifest.dir, manifest.assets[source])
+      File.read(path)
    end

    def asset_exists?(source)
-       Rails.application.assets_manifest.assets.key?(source)
+      Rails.application.assets_manifest.assets.key?(source)
    end
  end
 end
--- a/db/structure.sql
+++ b/db/structure.sql
@ -6520,6 +6520,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190812072649'),
 ('20190830141257'),
 ('20190910125740'),
-('20191001133557');
+('20191001133557'),
+('20191009146101');


--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -6,7 +6,7 @@ services:
    volumes:
      - scinote_development_postgres:/var/lib/postgresql/data
    ports:
-      - "6543:5432"
+      - "5432:5432"

  web:
    build: