This member does not manage any domains. Click the Edit domain assignments buttons to assign domains.
-
+
diff --git a/src/registrar/templates/includes/members_table.html b/src/registrar/templates/includes/members_table.html
index cc308619a..5ed91fea8 100644
--- a/src/registrar/templates/includes/members_table.html
+++ b/src/registrar/templates/includes/members_table.html
@@ -75,7 +75,7 @@
You don't have any members.
-
+
From a5b293de497c809ce3180f310ad556e3fd52c76b Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 17 Jan 2025 15:23:54 -0700
Subject: [PATCH 17/54] fix js compilation error
---
src/registrar/assets/src/js/getgov/table-members.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/registrar/assets/src/js/getgov/table-members.js b/src/registrar/assets/src/js/getgov/table-members.js
index 0688fdcdc..3cca37646 100644
--- a/src/registrar/assets/src/js/getgov/table-members.js
+++ b/src/registrar/assets/src/js/getgov/table-members.js
@@ -68,12 +68,11 @@ export class MembersTable extends BaseTable {
loadRows(dataObjects, tbody, customTableOptions) {
dataObjects.forEach((dataObject, index) => {
- const isLastRow = index === dataObjects.length - 1;
- this.addRow(index, dataObject, tbody, customTableOptions, isLastRow);
+ this.addRow(index, dataObject, tbody, customTableOptions);
});
}
- addRow(index, dataObject, tbody, customTableOptions, isLastRow = false) {
+ addRow(index, dataObject, tbody, customTableOptions) {
const member = dataObject;
// member is based on either a UserPortfolioPermission or a PortfolioInvitation
// and also includes information from related domains; the 'id' of the org_member
From 134a97e72c48501cb191ebb11245c995ca34090c Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 21 Jan 2025 09:11:04 -0700
Subject: [PATCH 18/54] Add VO changes
Resovles: https://cisa-corp.slack.com/archives/C087NN9UW5C/p1737136440608239
---
src/registrar/assets/src/js/getgov/table-base.js | 14 ++++++++++++++
.../src/js/getgov/table-edit-member-domains.js | 1 +
.../assets/src/js/getgov/table-member-domains.js | 1 +
.../templates/includes/domain_requests_table.html | 4 ++--
.../templates/includes/domains_table.html | 4 ++--
.../includes/member_domains_edit_table.html | 4 ++--
.../templates/includes/member_domains_table.html | 4 ++--
.../templates/includes/members_table.html | 4 ++--
8 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/registrar/assets/src/js/getgov/table-base.js b/src/registrar/assets/src/js/getgov/table-base.js
index 5ed0e8b03..b71d962be 100644
--- a/src/registrar/assets/src/js/getgov/table-base.js
+++ b/src/registrar/assets/src/js/getgov/table-base.js
@@ -448,6 +448,7 @@ export class BaseTable {
const baseUrlValue = this.getBaseUrl()?.innerHTML ?? null;
if (!baseUrlValue) return;
+ this.tableAnnouncementRegion.innerHTML = '
Loading table.
';
let url = `${baseUrlValue}?${searchParams.toString()}`
fetch(url)
.then(response => response.json())
@@ -480,6 +481,18 @@ export class BaseTable {
// Do not scroll on first page load
if (scroll)
scrollToElement('class', this.sectionSelector);
+ // Note: this code is similar to that in updateDisplay.
+ // This is slightly different in that we control this via scroll, hence we have this here.
+ const { unfiltered_total, total } = data;
+ if (unfiltered_total) {
+ if (total) {
+ this.tableWrapper.focus();
+ }else {
+ this.noSearchResultsWrapper.focus();
+ }
+ }else {
+ this.noDataWrapper.focus();
+ }
this.scrollToTable = true;
// update pagination
@@ -493,6 +506,7 @@ export class BaseTable {
this.currentSortBy = sortBy;
this.currentOrder = order;
this.currentSearchTerm = searchTerm;
+ this.tableAnnouncmentRegion.innerHTML = '';
})
.catch(error => console.error('Error fetching objects:', error));
}
diff --git a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js
index 6481094a0..6168e07f8 100644
--- a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js
+++ b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js
@@ -90,6 +90,7 @@ export class EditMemberDomainsTable extends BaseTable {
addRow(dataObject, tbody, customTableOptions) {
const domain = dataObject;
const row = document.createElement('tr');
+ row.setAttribute("tabindex", "-1");
let checked = false;
let disabled = false;
if (
diff --git a/src/registrar/assets/src/js/getgov/table-member-domains.js b/src/registrar/assets/src/js/getgov/table-member-domains.js
index f9b789e1f..63c455e9e 100644
--- a/src/registrar/assets/src/js/getgov/table-member-domains.js
+++ b/src/registrar/assets/src/js/getgov/table-member-domains.js
@@ -18,6 +18,7 @@ export class MemberDomainsTable extends BaseTable {
addRow(dataObject, tbody, customTableOptions) {
const domain = dataObject;
const row = document.createElement('tr');
+ row.setAttribute("tabindex", "-1");
row.innerHTML = `
${domain.name}
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index b026a7a6b..bea2fce4c 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -196,11 +196,11 @@ Status
-
+
You haven't requested any domains.
-
+
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index f7e36d330..4f9b938c0 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -227,7 +227,7 @@ Status
aria-live="polite"
>
+
You don't have any registered domains.
@@ -238,7 +238,7 @@ Status
-
+
diff --git a/src/registrar/templates/includes/member_domains_edit_table.html b/src/registrar/templates/includes/member_domains_edit_table.html
index edfa93243..e33b977ed 100644
--- a/src/registrar/templates/includes/member_domains_edit_table.html
+++ b/src/registrar/templates/includes/member_domains_edit_table.html
@@ -99,10 +99,10 @@
aria-live="polite"
>
+
This member does not manage any domains. Click the Edit domain assignments buttons to assign domains.
-
+
diff --git a/src/registrar/templates/includes/member_domains_table.html b/src/registrar/templates/includes/member_domains_table.html
index b3cee9a4b..3e17c65a5 100644
--- a/src/registrar/templates/includes/member_domains_table.html
+++ b/src/registrar/templates/includes/member_domains_table.html
@@ -94,10 +94,10 @@
aria-live="polite"
>
+
This member does not manage any domains. Click the Edit domain assignments buttons to assign domains.
-
+
diff --git a/src/registrar/templates/includes/members_table.html b/src/registrar/templates/includes/members_table.html
index 5ed91fea8..2a4739709 100644
--- a/src/registrar/templates/includes/members_table.html
+++ b/src/registrar/templates/includes/members_table.html
@@ -72,10 +72,10 @@
aria-live="polite"
>
+
You don't have any members.
-
+
From 4b0b2948c18ddd0cf93164be852306d5b7ec7a86 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 21 Jan 2025 09:48:43 -0700
Subject: [PATCH 19/54] Follow-on bug fixes
---
src/registrar/assets/src/js/getgov/table-base.js | 3 ++-
.../assets/src/js/getgov/table-edit-member-domains.js | 1 -
src/registrar/assets/src/js/getgov/table-member-domains.js | 2 +-
.../templates/includes/member_domains_edit_table.html | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/registrar/assets/src/js/getgov/table-base.js b/src/registrar/assets/src/js/getgov/table-base.js
index b71d962be..7f632a865 100644
--- a/src/registrar/assets/src/js/getgov/table-base.js
+++ b/src/registrar/assets/src/js/getgov/table-base.js
@@ -470,6 +470,7 @@ export class BaseTable {
let dataObjects = this.getDataObjects(data);
let customTableOptions = this.customizeTable(data);
+ console.log(`dataobjects: ${dataObjects}`)
this.loadRows(dataObjects, tbody, customTableOptions)
this.initShowMoreButtons();
@@ -506,7 +507,7 @@ export class BaseTable {
this.currentSortBy = sortBy;
this.currentOrder = order;
this.currentSearchTerm = searchTerm;
- this.tableAnnouncmentRegion.innerHTML = '';
+ this.tableAnnouncementRegion.innerHTML = '';
})
.catch(error => console.error('Error fetching objects:', error));
}
diff --git a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js
index 6168e07f8..6481094a0 100644
--- a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js
+++ b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js
@@ -90,7 +90,6 @@ export class EditMemberDomainsTable extends BaseTable {
addRow(dataObject, tbody, customTableOptions) {
const domain = dataObject;
const row = document.createElement('tr');
- row.setAttribute("tabindex", "-1");
let checked = false;
let disabled = false;
if (
diff --git a/src/registrar/assets/src/js/getgov/table-member-domains.js b/src/registrar/assets/src/js/getgov/table-member-domains.js
index 63c455e9e..6b4647793 100644
--- a/src/registrar/assets/src/js/getgov/table-member-domains.js
+++ b/src/registrar/assets/src/js/getgov/table-member-domains.js
@@ -18,7 +18,7 @@ export class MemberDomainsTable extends BaseTable {
addRow(dataObject, tbody, customTableOptions) {
const domain = dataObject;
const row = document.createElement('tr');
- row.setAttribute("tabindex", "-1");
+ row.setAttribute("tabindex", "0");
row.innerHTML = `
${domain.name}
diff --git a/src/registrar/templates/includes/member_domains_edit_table.html b/src/registrar/templates/includes/member_domains_edit_table.html
index e33b977ed..0b41b55c6 100644
--- a/src/registrar/templates/includes/member_domains_edit_table.html
+++ b/src/registrar/templates/includes/member_domains_edit_table.html
@@ -95,7 +95,7 @@
From bfec91e81eba3bc8ebd11964d7852ada2f37afc0 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 21 Jan 2025 10:04:10 -0700
Subject: [PATCH 20/54] Update member_domains_edit_table.html
---
src/registrar/templates/includes/member_domains_edit_table.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/registrar/templates/includes/member_domains_edit_table.html b/src/registrar/templates/includes/member_domains_edit_table.html
index 0b41b55c6..e33b977ed 100644
--- a/src/registrar/templates/includes/member_domains_edit_table.html
+++ b/src/registrar/templates/includes/member_domains_edit_table.html
@@ -95,7 +95,7 @@
From 395e0ff10e73e07289e89ff9dcb827dd0abe41dc Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 21 Jan 2025 10:19:31 -0700
Subject: [PATCH 21/54] Update table-members.js
---
src/registrar/assets/src/js/getgov/table-members.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/registrar/assets/src/js/getgov/table-members.js b/src/registrar/assets/src/js/getgov/table-members.js
index 3cca37646..0fb1a448d 100644
--- a/src/registrar/assets/src/js/getgov/table-members.js
+++ b/src/registrar/assets/src/js/getgov/table-members.js
@@ -68,11 +68,12 @@ export class MembersTable extends BaseTable {
loadRows(dataObjects, tbody, customTableOptions) {
dataObjects.forEach((dataObject, index) => {
- this.addRow(index, dataObject, tbody, customTableOptions);
+ const isLastRow = index === dataObjects.length - 1;
+ this.addRow(dataObject, tbody, customTableOptions, isLastRow);
});
}
- addRow(index, dataObject, tbody, customTableOptions) {
+ addRow(dataObject, tbody, customTableOptions, isLastRow) {
const member = dataObject;
// member is based on either a UserPortfolioPermission or a PortfolioInvitation
// and also includes information from related domains; the 'id' of the org_member
@@ -87,7 +88,6 @@ export class MembersTable extends BaseTable {
const kebabHTML = customTableOptions.hasAdditionalActions ? generateKebabHTML('remove-member', unique_id, cancelInvitationButton, `Expand for more options for ${member.name}`): '';
const row = document.createElement('tr');
- const isLastRow = index === dataObjects.length - 1;
if (isLastRow) {
row.classList.add("hide-td-borders");
}
From 7df035a3a79449a340e970d6834a0e94534b750a Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 21 Jan 2025 11:25:50 -0700
Subject: [PATCH 22/54] Simplify tab logic
---
src/registrar/assets/src/js/getgov/table-base.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/registrar/assets/src/js/getgov/table-base.js b/src/registrar/assets/src/js/getgov/table-base.js
index 7f632a865..2aa6929d8 100644
--- a/src/registrar/assets/src/js/getgov/table-base.js
+++ b/src/registrar/assets/src/js/getgov/table-base.js
@@ -486,9 +486,7 @@ export class BaseTable {
// This is slightly different in that we control this via scroll, hence we have this here.
const { unfiltered_total, total } = data;
if (unfiltered_total) {
- if (total) {
- this.tableWrapper.focus();
- }else {
+ if (!total) {
this.noSearchResultsWrapper.focus();
}
}else {
From 66d38441c165dd7fa9232690ae41d9b5d6e509af Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 21 Jan 2025 11:37:02 -0700
Subject: [PATCH 23/54] Swap to using tableAnnouncementRegion exclusively
---
src/registrar/assets/src/js/getgov/table-base.js | 15 +++------------
.../templates/includes/domain_requests_table.html | 4 ++--
.../templates/includes/domains_table.html | 4 ++--
.../includes/member_domains_edit_table.html | 4 ++--
.../templates/includes/member_domains_table.html | 4 ++--
.../templates/includes/members_table.html | 4 ++--
6 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/registrar/assets/src/js/getgov/table-base.js b/src/registrar/assets/src/js/getgov/table-base.js
index 2aa6929d8..5947452fa 100644
--- a/src/registrar/assets/src/js/getgov/table-base.js
+++ b/src/registrar/assets/src/js/getgov/table-base.js
@@ -284,15 +284,18 @@ export class BaseTable {
showElement(dataWrapper);
hideElement(noSearchResultsWrapper);
hideElement(noDataWrapper);
+ this.tableAnnouncementRegion.innerHTML = '';
} else {
hideElement(dataWrapper);
showElement(noSearchResultsWrapper);
hideElement(noDataWrapper);
+ this.tableAnnouncementRegion.innerHTML = this.noSearchResultsWrapper.innerHTML;
}
} else {
hideElement(dataWrapper);
hideElement(noSearchResultsWrapper);
showElement(noDataWrapper);
+ this.tableAnnouncementRegion.innerHTML = this.noDataWrapper.innerHTML;
}
};
@@ -470,7 +473,6 @@ export class BaseTable {
let dataObjects = this.getDataObjects(data);
let customTableOptions = this.customizeTable(data);
- console.log(`dataobjects: ${dataObjects}`)
this.loadRows(dataObjects, tbody, customTableOptions)
this.initShowMoreButtons();
@@ -482,16 +484,6 @@ export class BaseTable {
// Do not scroll on first page load
if (scroll)
scrollToElement('class', this.sectionSelector);
- // Note: this code is similar to that in updateDisplay.
- // This is slightly different in that we control this via scroll, hence we have this here.
- const { unfiltered_total, total } = data;
- if (unfiltered_total) {
- if (!total) {
- this.noSearchResultsWrapper.focus();
- }
- }else {
- this.noDataWrapper.focus();
- }
this.scrollToTable = true;
// update pagination
@@ -505,7 +497,6 @@ export class BaseTable {
this.currentSortBy = sortBy;
this.currentOrder = order;
this.currentSearchTerm = searchTerm;
- this.tableAnnouncementRegion.innerHTML = '';
})
.catch(error => console.error('Error fetching objects:', error));
}
diff --git a/src/registrar/templates/includes/domain_requests_table.html b/src/registrar/templates/includes/domain_requests_table.html
index bea2fce4c..b026a7a6b 100644
--- a/src/registrar/templates/includes/domain_requests_table.html
+++ b/src/registrar/templates/includes/domain_requests_table.html
@@ -196,11 +196,11 @@ Status
-
+
You haven't requested any domains.
-
+
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 4f9b938c0..f7e36d330 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -227,7 +227,7 @@ Status
aria-live="polite"
>
+
You don't have any registered domains.
@@ -238,7 +238,7 @@ Status
-
+
diff --git a/src/registrar/templates/includes/member_domains_edit_table.html b/src/registrar/templates/includes/member_domains_edit_table.html
index e33b977ed..dec0b2623 100644
--- a/src/registrar/templates/includes/member_domains_edit_table.html
+++ b/src/registrar/templates/includes/member_domains_edit_table.html
@@ -99,10 +99,10 @@
aria-live="polite"
>
+
This member does not manage any domains. Click the Edit domain assignments buttons to assign domains.
-
+
diff --git a/src/registrar/templates/includes/member_domains_table.html b/src/registrar/templates/includes/member_domains_table.html
index 3e17c65a5..c85773b9a 100644
--- a/src/registrar/templates/includes/member_domains_table.html
+++ b/src/registrar/templates/includes/member_domains_table.html
@@ -94,10 +94,10 @@
aria-live="polite"
>
+
This member does not manage any domains. Click the Edit domain assignments buttons to assign domains.
-
+
diff --git a/src/registrar/templates/includes/members_table.html b/src/registrar/templates/includes/members_table.html
index 2a4739709..cc308619a 100644
--- a/src/registrar/templates/includes/members_table.html
+++ b/src/registrar/templates/includes/members_table.html
@@ -72,10 +72,10 @@
aria-live="polite"
>
+
You don't have any members.
-
+
From f83628972b088b69a9fbb865c0bbbc0f70e3e0a3 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 21 Jan 2025 11:46:49 -0700
Subject: [PATCH 24/54] Update table-edit-member-domains.js
---
.../assets/src/js/getgov/table-edit-member-domains.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js
index 6481094a0..cb7344670 100644
--- a/src/registrar/assets/src/js/getgov/table-edit-member-domains.js
+++ b/src/registrar/assets/src/js/getgov/table-edit-member-domains.js
@@ -104,7 +104,7 @@ export class EditMemberDomainsTable extends BaseTable {
}
row.innerHTML = `
-
+ |
| | |