change text and spec

app/controllers/admin/task_requests_controller.rb

@@ -8,6 +8,10 @@ class Admin::TaskRequestsController < Admin::ApplicationController
   def edit
   end
 
+  def show
+    @files = @task_request.files.paginate(page: params[:page])
+  end
+
   def update
     if @task_request.update(task_request_params)
       redirect_to [:admin, :task_requests], notice: t(".notice")

app/controllers/task_requests_controller.rb

@@ -17,13 +17,15 @@ class TaskRequestsController < ApplicationController
 
     if @task_request.save
       log_create_analytics
-      redirect_to [@project, :task_requests], notice: t(".notice")
+      taskme_url = url_for([:admin, @task_request])
+      SubmitHubspotTaskRequestFormJob.perform_later(@task_request.user_email, taskme_url)
     else
       render :new
     end
   end
 
   def show
+    @files = @task_request.files.paginate(page: params[:page])
   end
   
   def edit

app/jobs/submit_hubspot_task_request_form_job.rb

@@ -0,0 +1,18 @@
+class SubmitHubspotTaskRequestFormJob < ApplicationJob
+  queue_as :default
+
+  def perform(user_email, taskme_url)
+    hubspot_task_request_form_guid = ENV["HUBSPOT_TASK_REQUEST_FORM_GUID"]
+    return unless hubspot_task_request_form_guid.present?
+
+    submission_params = {
+      email: user_email, 
+      taskme_url: taskme_url
+    }
+
+    form = Hubspot::Form.new("guid" => hubspot_task_request_form_guid)
+    is_form_sumitted = form.submit(submission_params)
+
+    raise StandardError.new "Failed to submit the task request hubspot form data: #{is_form_sumitted}" unless is_form_sumitted
+  end
+end

app/views/admin/task_requests/show.html.erb

@@ -1,21 +1,49 @@
-<dl>
-  <%= description_list_pair_for @task_request.project.account, :name, custom_label: "Account Name", append: ":" %>
-  <%= description_list_pair_for @task_request.project, :name, custom_label: "Project Name", append: ":" %>
-  <%= description_list_pair_for @task_request, :description, append: ":" %>
-  <%= description_list_pair_for @task_request, :created_at, append: ":" %>
-  <%= description_list_pair_for @task_request, :user_email, append: ":" %>
-  <%= description_list_pair_for @task_request, :deadline, append: ":" %>
-  <%= description_list_pair_for @task_request, :time_allowed, append: ":" %>
-  <%= description_list_pair_for @task_request, :additional_notes, append: ":" %>
-  <%= description_list_pair_for @task_request, :status, append: ":" %>
-  <dt>Files:</dt>
-  <dd>
-    <% if @task_request.files.present? %>
-      <% @task_request.files.each do |file| %>
-        <%= link_to file.filename, rails_blob_path(file, disposition: 'attachment'), class: "btn btn-link" %><br/>
-      <% end %>
-    <% else %>
-      No files attached
-    <% end %>
-  </dd>
-</dl>
+<div class="card shadow-sm">
+  <%= card_header text: "Task Details", close_action_path: [:admin, :task_requests] %>
+  <div class="card-body">
+    <div class="row">
+      <div class="col-md-6 col-sm-12">
+        <dl>
+          <%= description_list_pair_for @task_request.project.account, :name, custom_label: "Account Name", append: ":" %>
+          <%= description_list_pair_for @task_request.project, :name, custom_label: "Project Name", append: ":" %>
+          <%= description_list_pair_for @task_request, :created_at, append: ":" %>
+          <%= description_list_pair_for @task_request, :user_email, append: ":" %>
+          <%= description_list_pair_for @task_request, :status, append: ":" %>
+        </dl>
+      </div>
+      <div class="col-md-6 col-sm-12">
+        <dl>
+          <%= description_list_pair_for @task_request, :deadline, append: ":" %>
+          <%= description_list_pair_for @task_request, :time_allowed, append: ":" %>
+          <%= description_list_pair_for @task_request, :description, append: ":" %>
+          <%= description_list_pair_for @task_request, :additional_notes, append: ":" %>
+        </dl>
+      </div>
+      <div class="col-md-12">
+        <h2 class="h6 mt-3">Files:</h2>
+        <div class="pt-2 mx-n3">
+          <table class="table table-striped tr-px-4 align-all-middle">
+            <thead class="thead-light">
+              <tr>
+                <th>Filename</th>
+                <th></th>
+              </tr>
+            </thead>
+            <tbody id="task_requests">
+              <% if @files.any? %>
+                <%= render partial: "task_requests/file", collection: @files %>
+              <% else %>
+                <tr>
+                  <td colspan="12" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+          <div class="mt-4" id="task_requests_pagiantion">
+            <%= will_paginate @files %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

app/views/task_requests/_file.html.erb

@@ -0,0 +1,6 @@
+<tr>
+  <td><%= file.filename %></td>
+  <td class="text-right">
+    <%= link_to fa_icon("download"), file, target: "_blank" %>
+  </td>
+</tr>

app/views/task_requests/_form.html.erb

@@ -1,6 +1,11 @@
 <%= errors_summary_for task_request %>
 
-<%= bootstrap_form_with model: model, local: true do |form| %>
+<%= bootstrap_form_with model: model, url: [@project, @task_request, show_chat: true], local: true do |form| %>
+  <div class="alert alert-notice text-center pl-0 text-md-left mt-4">
+    <%= fa_icon "info-circle" %>
+    <strong><%= t '.info_message' %></strong>
+  </div>
+
   <%= form.text_area :description, label: t('.labels.description') %>
   <%= form.text_field :deadline, class: "datepicker-control", label: t('.labels.deadline') %>
   <%= form.text_field :time_allowed, label: t('.labels.time_allowed')  %>
@@ -24,11 +29,6 @@
       data-placeholder="<%= dropzone_placeholder_message_for(task_request) %>"
       data-submit-button="#submit_folder"></div>
   <% end %>
-  
-  <div class="alert alert-info text-center text-md-left mt-4">
-    <%= fa_icon "info-circle" %>
-    <strong>After you submit this information you will immediately be connected with a BIG representative who will be able to collect any additional information needed, answer your questions, etc.</strong>
-  </div>
 
   <div class="row align-items-center text-center mt-4">
     <%= link_to t("shared.cancel"), [project, :task_requests], class: "col-3 text-reset" %>

app/views/task_requests/create.html.erb

@@ -0,0 +1,4 @@
+<% if params[:show_chat] %>
+  <%= javascript_include_tag "https://js.hs-scripts.com/7344617.js", defer: "defer", async: true, id: "hs-script-loader" %>
+<% end %>
+<p class="alert alert-success p-3 lead text-center"><%= t '.success_message' %></p>

app/views/task_requests/show.html.erb

@@ -1,18 +1,46 @@
-<dl>
-  <%= description_list_pair_for @task_request, :description, append: ":" %>
-  <%= description_list_pair_for @task_request, :created_at, append: ":" %>
-  <%= description_list_pair_for @task_request, :deadline, append: ":" %>
-  <%= description_list_pair_for @task_request, :time_allowed, append: ":" %>
-  <%= description_list_pair_for @task_request, :additional_notes, append: ":" %>
-  <%= description_list_pair_for @task_request, :status, append: ":" %>
-  <dt>Files:</dt>
-  <dd>
-    <% if @task_request.files.present? %>
-      <% @task_request.files.each do |file| %>
-        <%= file.filename %><br>
-      <% end %>
-    <% else %>
-      "No files attached."
-    <% end %>
-  </dd>
-</dl>
+<div class="card shadow-sm">
+  <%= card_header text: "Task Details", close_action_path: [@project, :task_requests] %>
+  <div class="card-body">
+    <div class="row">
+      <div class="col-md-6 col-sm-12">
+        <dl>
+          <%= description_list_pair_for @task_request, :description, append: ":" %>
+          <%= description_list_pair_for @task_request, :created_at, append: ":" %>
+          <%= description_list_pair_for @task_request, :status, append: ":" %>
+        </dl>
+      </div>
+      <div class="col-md-6 col-sm-12">
+        <dl>
+          <%= description_list_pair_for @task_request, :deadline, append: ":" %>
+          <%= description_list_pair_for @task_request, :time_allowed, append: ":" %>
+          <%= description_list_pair_for @task_request, :additional_notes, append: ":" %>
+        </dl>
+      </div>
+      <div class="col-md-12">
+        <h2 class="h6 mt-3">Files:</h2>
+        <div class="pt-2 mx-n3">
+          <table class="table table-striped tr-px-4 align-all-middle">
+            <thead class="thead-light">
+              <tr>
+                <th>Filename</th>
+                <th></th>
+              </tr>
+            </thead>
+            <tbody id="task_requests">
+              <% if @files.any? %>
+                <%= render partial: "file", collection: @files %>
+              <% else %>
+                <tr>
+                  <td colspan="12" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+          <div class="mt-4" id="task_requests_pagiantion">
+            <%= will_paginate @files %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

config/locales/en.yml

@@ -96,6 +96,8 @@ en:
     task_requests:
       index:
         empty: Task requests will appear here
+      show:
+        empty: Attached files will appear here.
       update:
         notice: The task request has been updated successfully
     users:
@@ -941,10 +943,12 @@ en:
       notice: Task has been cancelled successfully.
     create:
       notice: Task request created succussfully.
+      success_message: Your task request was successfully submitted. Thank you. A chat window will pop up on the lower right in a few seconds.
     edit:
       heading:
         Edit Task Request
     form:
+      info_message: After submitting this task request, you'll be connected via chat with a ME Suite representative.
       labels:
         additional_notes: Please add any additional notes we should be aware of regarding this task.
         deadline: What is the deadline for this task?
@@ -963,6 +967,8 @@ en:
         task_request_time_allowed: Time Allowed
     new:
       heading: New Task Request
+    show:
+      empty: Attached files will appear here.
     task_request:
       actions:
         manage: Manage

config/locales/es.yml

@@ -183,7 +183,11 @@ es:
         guardian_photo:
           heading: Guardian Photo (ES)
   task_requests:
+    form:
+      info_message: After submitting this task request, you'll be connected via chat with a ME Suite representative. (ES)
     task_request:
       actions:
         manage: Manage (ES)
         open_deliverable: Open Deliverable (ES)
+    create:
+      success_message: Your task request was successfully submitted. Thank you. A chat window will pop up on the lower right in a few seconds. (ES)

db/structure.sql

@@ -43,14 +43,14 @@ COMMENT ON EXTENSION pg_trgm IS 'text similarity measurement and index searching
 
 CREATE FUNCTION public.pg_search_dmetaphone(text) RETURNS text
     LANGUAGE sql IMMUTABLE STRICT
-    AS $_$ 
-    SELECT array_to_string(ARRAY(SELECT dmetaphone(unnest(regexp_split_to_array($1, E'\\s+')))), ' ')	
+    AS $_$
+  SELECT array_to_string(ARRAY(SELECT dmetaphone(unnest(regexp_split_to_array($1, E'\\s+')))), ' ')
 $_$;
 
 
 SET default_tablespace = '';
 
-SET default_table_access_method = heap;
+SET default_with_oids = false;
 
 --
 -- Name: account_auths; Type: TABLE; Schema: public; Owner: -
@@ -615,15 +615,6 @@ CREATE SEQUENCE public.contract_templates_id_seq
 ALTER SEQUENCE public.contract_templates_id_seq OWNED BY public.contract_templates.id;
 
 
---
--- Name: data_migrations; Type: TABLE; Schema: public; Owner: -
---
-
-CREATE TABLE public.data_migrations (
-    version character varying NOT NULL
-);
-
-
 --
 -- Name: directories; Type: TABLE; Schema: public; Owner: -
 --
@@ -1181,6 +1172,7 @@ CREATE TABLE public.settings (
 --
 
 CREATE SEQUENCE public.settings_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -1216,6 +1208,7 @@ CREATE TABLE public.taggings (
 --
 
 CREATE SEQUENCE public.taggings_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -1246,6 +1239,7 @@ CREATE TABLE public.tags (
 --
 
 CREATE SEQUENCE public.tags_id_seq
+    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -1597,9 +1591,9 @@ CREATE TABLE public.zoom_meetings (
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL,
     broadcast_id bigint,
-    status integer DEFAULT 0,
     zoom_user_id bigint,
-    project_id bigint
+    project_id bigint,
+    status integer DEFAULT 0
 );
 
 
@@ -2053,14 +2047,6 @@ ALTER TABLE ONLY public.contract_templates
     ADD CONSTRAINT contract_templates_pkey PRIMARY KEY (id);
 
 
---
--- Name: data_migrations data_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY public.data_migrations
-    ADD CONSTRAINT data_migrations_pkey PRIMARY KEY (version);
-
-
 --
 -- Name: directories directories_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --

spec/controllers/task_requests_controller_spec.rb

@@ -49,13 +49,6 @@ RSpec.describe TaskRequestsController, type: :controller do
   end
 
   describe "#create" do
-    it "responds with a redirect" do
-      post :create, params: { project_id: project.id, task_request: task_request_params }
-
-      expect(response).to be_redirect
-      expect(flash.notice).not_to be_nil
-    end
-
     it "does create a new record" do
       expect {
         post :create, params: { project_id: project.id, task_request: task_request_params }
@@ -67,6 +60,12 @@ RSpec.describe TaskRequestsController, type: :controller do
         post :create, params: { project_id: project.id, task_request: task_request_params }
       }.to have_enqueued_job(TrackAnalyticsJob).with(user,  account, :track_create_task_request, user_agent: "Rails Testing", user_ip: "0.0.0.0")
     end
+
+    it "submits data to hubspot form" do
+      expect {
+        post :create, params: { project_id: project.id, task_request: task_request_params }
+      }.to have_enqueued_job(SubmitHubspotTaskRequestFormJob)
+    end
   end
 
   describe "#update" do

spec/features/admin_managing_task_requests_spec.rb

@@ -53,7 +53,7 @@ feature "Admin managing task requests" do
 
     expect(page).to have_content 'Files'
     task_request.files.each do |file|
-      expect(page).to have_link file.blob.filename
+      expect(page).to have_content file.blob.filename
     end
   end
 
@@ -65,7 +65,7 @@ feature "Admin managing task requests" do
     click_link 'View'
     switch_to_window(windows.last)
 
-    expect(page).to have_content 'No files attached'
+    expect(page).to have_content 'Attached files will appear here.'
   end
 
   scenario "task requests table is visible" do

spec/features/user_creates_task_request_spec.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.feature 'User creates task request', type: :feature do
+  let(:current_user) { create(:user, :manager) }
+  let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
+
+  before do
+    sign_in(current_user)
+  end
+
+  scenario 'creating a new task request' do
+    visit new_project_task_request_path(project)
+
+    fill_in description_field, with: 'Description of the task'
+    fill_in deadline_field, with: '2020-06-24'
+    fill_in time_allowed_field, with: '30'
+    fill_in additional_notes_field, with: 'Additional note about the task'
+
+    click_on 'Create Task request'
+
+    expect(page).to have_content task_created_message
+  end
+
+  scenario 'user can view task request details' do
+    create(:task_request, project: project, description: 'Description of the task', deadline: '2020-07-23', time_allowed: '10', additional_notes: 'Additional note about the task')
+    
+    visit project_task_request_path(project, TaskRequest.first)
+
+    expect(page).to have_content('Description of the task')
+    expect(page).to have_content('2020-07-23')
+    expect(page).to have_content('10')
+    expect(page).to have_content('Additional note about the task')
+  end
+
+  scenario 'user can update existing task request' do
+    create(:task_request, project: project, description: 'Description of the task', deadline: '2020-08-23', time_allowed: '10', additional_notes: 'Additional note about the task')
+
+    visit edit_project_task_request_path(project, TaskRequest.first)
+
+    fill_in deadline_field, with: '2020-07-01'
+    fill_in time_allowed_field, with: '13'
+
+    click_on 'Update Task request'
+    expect(page).to have_content('13')
+    expect(page).to have_content('07/01/20')
+  end
+
+  scenario 'user can cancel a task request' do
+    create(:task_request, project: project, description: 'Description of the task', deadline: '2020-08-23', time_allowed: '10', additional_notes: 'Additional note about the task')
+
+    visit project_task_requests_path(project)
+
+    click_on 'Manage'
+    click_link 'Cancel'
+
+    expect(page).to have_content('Cancelled')
+  end
+
+  scenario 'user can view completed tasks' do
+    create_list(:task_request, 5, project: project, status: 'completed')
+    create_list(:task_request, 5, project: project, status: 'pending')
+
+    visit project_tasks_path(project)
+
+    expect(page).to have_content('Completed')
+    expect(page).not_to have_content('Pending')
+  end
+
+  private
+
+  def description_field
+    t "task_requests.form.labels.description"
+  end
+
+  def deadline_field
+    t "task_requests.form.labels.deadline"
+  end
+
+  def time_allowed_field
+    t "task_requests.form.labels.time_allowed"
+  end
+
+  def additional_notes_field
+    t "task_requests.form.labels.additional_notes"
+  end
+
+  def task_created_message
+    t 'task_requests.create.success_message'
+  end
+end

spec/jobs/submit_hubspot_task_request_form_job_spec.rb

@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+RSpec.describe SubmitHubspotTaskRequestFormJob, type: :job do
+  describe '#perform_now' do
+    before do
+      ENV["HUBSPOT_TASK_REQUEST_FORM_GUID"] = "hubspot_task_request_form_guid"
+    end
+
+    it 'submits to the Hubspot API with the right params' do
+      form = double(:form)
+      allow(Hubspot::Form).to receive(:new).and_return(form)
+      allow(form).to receive(:submit).and_return(true)
+
+      SubmitHubspotTaskRequestFormJob.perform_now("email@test.com", "https://example.com/admin/task_requests/1")
+
+      expect(Hubspot::Form).to have_received(:new).with("guid" => "hubspot_task_request_form_guid")
+      expect(form).to have_received(:submit).with(
+        email: "email@test.com",
+        taskme_url: "https://example.com/admin/task_requests/1"
+      )
+    end
+
+    context 'when HUBSPOT_TASK_REQUEST_FORM_GUID is not available' do
+      it 'does not submit to the API' do
+        ENV["HUBSPOT_TASK_REQUEST_FORM_GUID"] = nil
+        form = double(:form)
+        allow(Hubspot::Form).to receive(:new).and_return(form)
+        allow(form).to receive(:submit)
+
+        SubmitHubspotTaskRequestFormJob.perform_now("email@test.com", "https://example.com/admin/task_requests/1")
+
+        expect(form).not_to have_received(:submit)
+      end
+    end
+  end
+end