From 6a961143acbbcd513b6d44cfa4f76fad63d954f0 Mon Sep 17 00:00:00 2001 From: Jaymee Hyppolite <54775395+JaymeeH@users.noreply.github.com> Date: Thu, 19 Dec 2024 11:31:17 -0500 Subject: [PATCH] restricting project tabs to pending projects and eligible system administrators (#1149) * restricting approve and script tabs to pending projects and eligible system administrators * removing depracated approve button * updating tests --- app/javascript/entrypoints/projectTabs.js | 27 ++++++++++++++++------- app/views/projects/details.html.erb | 11 +++++---- app/views/projects/show.html.erb | 10 ++++++--- spec/system/project_details_spec.rb | 6 ++--- 4 files changed, 36 insertions(+), 18 deletions(-) diff --git a/app/javascript/entrypoints/projectTabs.js b/app/javascript/entrypoints/projectTabs.js index 8541d024d..fe6a51452 100644 --- a/app/javascript/entrypoints/projectTabs.js +++ b/app/javascript/entrypoints/projectTabs.js @@ -126,16 +126,16 @@ export function projectStyle(railsSession) { } }); -// $('#project-approval').on('click', (el) => { -// const element = el; -// element.preventDefault(); -// approval.style.borderBottom = 'solid'; -// approval.style.borderColor = '#E77500'; -// approval.classList.add('active'); -// }); + $('#project-approval').on('click', (el) => { + const element = el; + element.preventDefault(); + approval.style.borderBottom = 'solid'; + approval.style.borderColor = '#E77500'; + approval.classList.add('active'); + }); } -export function projectTab(contentUrl, detailsUrl) { +export function projectTab(contentUrl, detailsUrl, approveUrl) { $('#project-content').on('click', (element) => { element.preventDefault(); $.ajax({ @@ -157,4 +157,15 @@ export function projectTab(contentUrl, detailsUrl) { }, }); }); + + $('#project-approval').on('click', (element) => { + element.preventDefault(); + $.ajax({ + type: 'GET', + url: approveUrl, + success() { + window.location.href = approveUrl; // update the browser's URL + }, + }); + }); } diff --git a/app/views/projects/details.html.erb b/app/views/projects/details.html.erb index 48dca3fce..98f4c033d 100644 --- a/app/views/projects/details.html.erb +++ b/app/views/projects/details.html.erb @@ -10,8 +10,12 @@