diff --git a/app/controllers/hiring_staff/vacancies/documents_controller.rb b/app/controllers/hiring_staff/vacancies/documents_controller.rb
index d4ab40f2d3..8d6321ccb0 100644
--- a/app/controllers/hiring_staff/vacancies/documents_controller.rb
+++ b/app/controllers/hiring_staff/vacancies/documents_controller.rb
@@ -1,3 +1,5 @@
+require 'google/apis/drive_v3'
+
class HiringStaff::Vacancies::DocumentsController < HiringStaff::Vacancies::ApplicationController
before_action :school, :redirect_unless_vacancy_session_id, only: %i[index create]
before_action :redirect_if_no_supporting_documents, only: %i[index create]
@@ -5,10 +7,15 @@ class HiringStaff::Vacancies::DocumentsController < HiringStaff::Vacancies::Appl
def index
@documents_form = DocumentsForm.new
+ @vacancy = Vacancy.find(session[:vacancy_attributes]['id'])
end
def create
- @documents_form = DocumentsForm.new(documents_form_params)
+ @documents_form = DocumentsForm.new
+ @vacancy ||= school.vacancies.find(session_vacancy_id)
+ process_documents(documents_form_params).each do |document|
+ @vacancy.documents.create(document)
+ end
render :index
end
@@ -26,4 +33,60 @@ def redirect_if_no_supporting_documents
def redirect_to_next_step_if_save_and_continue
redirect_to application_details_school_job_path if params[:commit] == 'Save and continue'
end
+
+ def process_documents(params)
+ @file_size_limit = 10 # MB
+ documents_array = []
+ if params[:documents]&.any?
+ params[:documents].each do |document_params|
+ @errors = false
+ document_hash = upload_document(document_params)
+ unless @errors
+ documents_array << document_hash
+ end
+ end
+ end
+ documents_array
+ end
+
+ def upload_document(document_params)
+ document_upload = DocumentUpload.new(
+ upload_path: document_params.tempfile.path,
+ name: document_params.original_filename
+ )
+ if document_params.size / 1024.0 / 1024.0 > @file_size_limit
+ file_size_error(document_params.original_filename)
+ end
+ unless @errors
+ document_upload.upload
+ unless document_upload.safe_download
+ virus_error(document_params.original_filename)
+ end
+ create_document_hash(document_params, document_upload)
+ end
+ end
+
+ def file_size_error(filename)
+ @errors = true
+ @documents_form.errors.add(
+ :base, t('jobs.file_size_error_message', filename: filename, size_limit: @file_size_limit)
+ )
+ @documents_form.errors.add(:documents, t('jobs.file_input_error_message'))
+ end
+
+ def virus_error(filename)
+ @errors = true
+ @documents_form.errors.add(:base, t('jobs.file_virus_error_message', filename: filename))
+ @documents_form.errors.add(:documents, t('jobs.file_input_error_message'))
+ end
+
+ def create_document_hash(params, upload)
+ {
+ name: params.original_filename,
+ size: Integer(params.size),
+ content_type: params.content_type,
+ download_url: upload.uploaded.web_content_link,
+ google_drive_id: upload.uploaded.id
+ }
+ end
end
diff --git a/app/form_models/vacancy_form.rb b/app/form_models/vacancy_form.rb
index d788359761..3ca46eca7f 100644
--- a/app/form_models/vacancy_form.rb
+++ b/app/form_models/vacancy_form.rb
@@ -7,7 +7,9 @@ class VacancyForm
delegate :save, to: :vacancy
def initialize(params = {})
- @vacancy = Vacancy.new(params.except(:expiry_time_hh, :expiry_time_mm, :expiry_time_meridiem))
+ @vacancy = Vacancy.new(
+ params.except(:documents_attributes, :expiry_time_hh, :expiry_time_mm, :expiry_time_meridiem)
+ )
end
def school
diff --git a/app/frontend/packs/application.js b/app/frontend/packs/application.js
index 65ce305bce..257811bed8 100644
--- a/app/frontend/packs/application.js
+++ b/app/frontend/packs/application.js
@@ -16,8 +16,8 @@ import 'src/removeCommaFromNumber';
import 'src/shareUrl';
import 'src/sortJobList';
import 'src/submitFeedback';
-import 'src/vacancyShow';
import 'src/uploadDocuments';
+import 'src/vacancyShow';
import { initAll } from 'govuk-frontend';
diff --git a/app/frontend/src/uploadDocuments.js b/app/frontend/src/uploadDocuments.js
index 6c35d7c334..61761c432b 100644
--- a/app/frontend/src/uploadDocuments.js
+++ b/app/frontend/src/uploadDocuments.js
@@ -2,18 +2,68 @@ document.addEventListener('DOMContentLoaded', function() {
const inputFileUpload = document.getElementsByClassName('govuk-file-upload')[0];
const selectFileButton = document.getElementsByClassName('govuk-button--secondary')[0];
const uploadFileButton = document.getElementsByClassName('govuk-button--secondary')[1];
+ const saveContinueButton = document.getElementsByName('commit')[1];
- selectFileButton.addEventListener('click', function(e) {
- e.preventDefault();
-
- inputFileUpload.click();
- });
+ if (inputFileUpload && selectFileButton && uploadFileButton && saveContinueButton) {
+ selectFileButton.addEventListener('click', function(e) {
+ e.preventDefault();
+ inputFileUpload.click();
+ });
+
+ inputFileUpload.addEventListener('change', function(e) {
+ saveContinueButton.disabled = true;
+ injectDocumentsTable(inputFileUpload);
+ inputFileUpload.form.submit();
+ });
+
+ inputFileUpload.classList.add('display-none');
+ uploadFileButton.classList.add('display-none');
+ selectFileButton.classList.remove('display-none');
+ }
+});
- inputFileUpload.addEventListener('change', function(e) {
- inputFileUpload.form.submit();
- });
+injectDocumentsTable = function(documentsInput) {
+ const tableHTML = " \
+ \
+ \
+ \
+
\
+ \
+ \
+ \
+
\
+ "
+ const noFilesElement = document.getElementById('no-files');
+ const filesList = documentsInput.files;
- inputFileUpload.classList.add('display-none');
- uploadFileButton.classList.add('display-none');
- selectFileButton.classList.remove('display-none');
-});
+ if (filesList && filesList.length) {
+ if (noFilesElement) {
+ noFilesElement.insertAdjacentHTML("beforebegin", tableHTML);
+ noFilesElement.remove();
+ }
+ for (let i = 0; i < filesList.length; i++) {
+ const rowHTML = " \
+ \
+ | " +
+ filesList[i].name +
+ " | \
+ " +
+ "Uploading " + "" +
+ " | \
+ " +
+ (filesList[i].size / 1024.0 / 1024.0).toFixed(2) + " MB" +
+ " | \
+ " +
+ "Cancel" +
+ " | \
+
\
+ "
+ const tableBody = document.getElementById('table-body');
+ tableBody.insertAdjacentHTML("beforeend", rowHTML);
+ }
+ }
+}
diff --git a/app/frontend/styles/components/upload-documents.scss b/app/frontend/styles/components/upload-documents.scss
index c69c688b18..651245ab61 100644
--- a/app/frontend/styles/components/upload-documents.scss
+++ b/app/frontend/styles/components/upload-documents.scss
@@ -1,7 +1,43 @@
-.upload-group .govuk-button {
+#file-upload {
margin-bottom: 0;
}
.hidden-input {
display: none;
}
+
+.upload-progress {
+ display: inline-block;
+ position: relative;
+ width: 18px;
+ height: 18px;
+}
+.upload-progress div {
+ box-sizing: border-box;
+ display: block;
+ position: absolute;
+ width: 18px;
+ height: 18px;
+ margin: 0px;
+ border: 3px solid green;
+ border-radius: 50%;
+ animation: spin 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
+ border-color: green transparent transparent transparent;
+}
+.upload-progress div:nth-child(1) {
+ animation-delay: -0.45s;
+}
+.upload-progress div:nth-child(2) {
+ animation-delay: -0.3s;
+}
+.upload-progress div:nth-child(3) {
+ animation-delay: -0.15s;
+}
+@keyframes spin {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(360deg);
+ }
+}
diff --git a/app/models/document.rb b/app/models/document.rb
new file mode 100644
index 0000000000..2e26f47956
--- /dev/null
+++ b/app/models/document.rb
@@ -0,0 +1,4 @@
+class Document < ApplicationRecord
+ belongs_to :vacancy
+ validates :name, :size, :content_type, :download_url, :google_drive_id, presence: true
+end
diff --git a/app/models/vacancy.rb b/app/models/vacancy.rb
index cdc0530268..9ba2d58f58 100644
--- a/app/models/vacancy.rb
+++ b/app/models/vacancy.rb
@@ -88,8 +88,6 @@ class Vacancy < ApplicationRecord
extend FriendlyId
extend ArrayEnum
- attr_accessor :documents
-
friendly_id :slug_candidates, use: %w[slugged history]
enum status: { published: 0, draft: 1, trashed: 2 }
@@ -122,6 +120,8 @@ class Vacancy < ApplicationRecord
has_one :publish_feedback, class_name: 'VacancyPublishFeedback'
+ has_many :documents
+
delegate :name, to: :school, prefix: true, allow_nil: false
delegate :geolocation, to: :school, prefix: true, allow_nil: true
diff --git a/app/services/document_upload.rb b/app/services/document_upload.rb
new file mode 100644
index 0000000000..d35129e601
--- /dev/null
+++ b/app/services/document_upload.rb
@@ -0,0 +1,52 @@
+require 'google/apis/drive_v3'
+
+class DocumentUpload
+ class MissingUploadPath < StandardError; end
+ attr_accessor :drive_service, :upload_path, :name, :uploaded, :safe_download
+
+ def initialize(opts = {})
+ raise MissingUploadPath if opts[:upload_path].nil?
+ self.upload_path = opts[:upload_path]
+ self.name = opts[:name]
+ self.drive_service = Google::Apis::DriveV3::DriveService.new
+ end
+
+ def upload
+ upload_hiring_staff_document
+ set_public_permission_on_document
+ google_drive_virus_check
+ end
+
+ def upload_hiring_staff_document
+ self.uploaded = drive_service.create_file(
+ { alt: 'media', name: name },
+ fields: 'id, web_view_link, web_content_link, mime_type',
+ upload_source: upload_path
+ )
+ end
+
+ def set_public_permission_on_document
+ drive_service.create_permission(
+ uploaded.id,
+ Google::Apis::DriveV3::Permission.new(type: 'anyone', role: 'reader')
+ )
+ end
+
+ def google_drive_virus_check
+ download_path = "#{uploaded.id}"
+ begin
+ drive_service.get_file(
+ uploaded.id,
+ acknowledge_abuse: false,
+ download_dest: download_path
+ )
+ rescue Google::Apis::ClientError
+ drive_service.delete_file(uploaded.id)
+ self.safe_download = false
+ else
+ self.safe_download = true
+ ensure
+ File.delete(download_path) if File.exist?(download_path)
+ end
+ end
+end
diff --git a/app/views/hiring_staff/documents/edit.html.erb b/app/views/hiring_staff/documents/edit.html.erb
deleted file mode 100644
index 2bb438fcaf..0000000000
--- a/app/views/hiring_staff/documents/edit.html.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
Create a job listing for Bexley Heath Academy
- Step 2 of 3
-
-
-
-
-
-
-
-
-
Create a job listing for Bexley Heath Academy
- Step 2 of 3
-
-
-
-
-
-
-
-
-
Create a job listing for Bexley Heath Academy
- Step 2 of 3
-
-
-
-
-
-
-
-
-
Supporting documents
-
-
-
-
-
-
-
-
-
-
-
-
-
-