diff --git a/docs/developer/README.md b/docs/developer/README.md index 31a94e6e7..860140a96 100644 --- a/docs/developer/README.md +++ b/docs/developer/README.md @@ -291,13 +291,13 @@ We use the [CSS Block Element Modifier (BEM)](https://getbem.com/naming/) naming ### Upgrading USWDS and other JavaScript packages -Version numbers can be manually controlled in `package.json`. Edit that, if desired. - -Now run `docker-compose run node npm update`. - -Then run `docker-compose up` to recompile and recopy the assets. - -Examine the results in the running application (remember to empty your cache!) and commit `package.json` and `package-lock.json` if all is well. +1. Version numbers can be manually controlled in `package.json`. Edit that, if desired. +2. Now run `docker-compose run node npm update`. +3. Then run `docker-compose up` to recompile and recopy the assets, or run `docker-compose updateUswds` if your docker is already up. +4. Make note of the dotgov changes in uswds-edited.js. +5. Copy over the newly compiled code from uswds.js into uswds-edited.js. +6. Put back the dotgov changes you made note of into uswds-edited.js. +7. Examine the results in the running application (remember to empty your cache!) and commit `package.json` and `package-lock.json` if all is well. ## Finite State Machines diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index e233bcd59..7177c3c69 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -952,6 +952,7 @@ document.addEventListener('DOMContentLoaded', function() { data.domains.forEach(domain => { const expirationDate = domain.expiration_date ? new Date(domain.expiration_date) : null; const expirationDateSortValue = expirationDate ? expirationDate.getTime() : ''; + const actionUrl = domain.action_url; const row = document.createElement('tr'); row.innerHTML = ` @@ -975,7 +976,7 @@ document.addEventListener('DOMContentLoaded', function() { - + @@ -1132,8 +1133,8 @@ document.addEventListener('DOMContentLoaded', function() { data.domain_requests.forEach(request => { const domainName = request.requested_domain ? request.requested_domain : `New domain request (${new Date(request.created_at).toLocaleString()} UTC)`; const submissionDate = request.submission_date ? new Date(request.submission_date).toLocaleDateString() : `Not submitted`; - const actionUrl = (request.status === 'Started' || request.status === 'Withdrawn') ? `/domain-request/${request.id}/edit` : `/domain-request/${request.id}`; - const actionLabel = (request.status === 'Started' || request.status === 'Withdrawn') ? 'Edit' : 'Manage'; + const actionUrl = request.action_url; + const actionLabel = request.action_label; const deleteButton = request.is_deletable ? `