wrap up js

This commit is contained in:
zandercymatics 2024-12-11 13:51:18 -07:00
parent 4f3663efa0
commit 9fe87fbba1
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 47 additions and 38 deletions

View file

@ -3,6 +3,7 @@ import { getCsrfToken } from './helpers.js';
import { generateKebabHTML } from './table-base.js'; import { generateKebabHTML } from './table-base.js';
import { MembersTable } from './table-members.js'; import { MembersTable } from './table-members.js';
import { hookupRadioTogglerListener } from './radios.js'; import { hookupRadioTogglerListener } from './radios.js';
import { hideElement, showElement } from './helpers.js';
// This is specifically for the Member Profile (Manage Member) Page member/invitation removal // This is specifically for the Member Profile (Manage Member) Page member/invitation removal
export function initPortfolioNewMemberPageToggle() { export function initPortfolioNewMemberPageToggle() {
@ -182,48 +183,50 @@ export function initAddNewMemberPageListeners() {
} }
// Export for the rest of the portfolio pages (not add) // Export for the rest of the portfolio pages (not add)
// Not using the
export function initPortfolioMemberPage() { export function initPortfolioMemberPage() {
document.addEventListener("DOMContentLoaded", () => { document.addEventListener("DOMContentLoaded", () => {
console.log("test") let memberForm = document.getElementById("member_form");
hookupRadioTogglerListener( if (!memberForm) {
'role', return;
{ }
'organization_admin': 'new-member-admin-permissions',
'organization_member': 'new-member-basic-permissions' // console.log("test")
// hookupRadioTogglerListener(
// 'role',
// {
// 'organization_admin': 'new-member-admin-permissions',
// 'organization_member': 'new-member-basic-permissions'
// }
// )
let memberAdminContainer = document.getElementById("member-admin-permissions");
let memberBasicContainer = document.getElementById("member-basic-permissions");
let roleRadios = document.querySelectorAll('input[name="role"]');
function toggleContainers() {
let selectedRole = document.querySelector('input[name="role"]:checked');
if (!selectedRole) {
hideElement(memberAdminContainer);
hideElement(memberBasicContainer);
return;
} }
);
// let memberForm = document.getElementById("member_form");
// if (!memberForm) {
// return;
// }
// let memberAdminContainer = document.getElementById("member-admin-permissions"); if (selectedRole.value === "organization_admin") {
// let memberBasicContainer = document.getElementById("member-basic-permissions"); showElement(memberAdminContainer);
// let roleRadios = document.querySelectorAll('input[name="role"]'); hideElement(memberBasicContainer);
} else if (selectedRole.value === "organization_member") {
hideElement(memberAdminContainer);
showElement(memberBasicContainer);
}
}
// function toggleContainers() { // Initial state
// let selectedRole = document.querySelector('input[name="role"]:checked'); toggleContainers();
// if (!selectedRole) {
// hideElement(memberAdminContainer);
// hideElement(memberBasicContainer);
// return;
// }
// if (selectedRole.value === "organization_admin") { // Add change listener to all radio buttons
// showElement(memberAdminContainer); roleRadios.forEach(radio => {
// hideElement(memberBasicContainer); radio.addEventListener("change", toggleContainers);
// } else if (selectedRole.value === "organization_member") { });
// hideElement(memberAdminContainer);
// showElement(memberBasicContainer);
// }
// }
// // Initial state
// toggleContainers();
// // Add change listener to all radio buttons
// roleRadios.forEach(radio => {
// radio.addEventListener("change", toggleContainers);
// });
}); });
} }

View file

@ -4,7 +4,9 @@ from django.apps import apps
from django.forms import ValidationError from django.forms import ValidationError
from registrar.utility.waffle import flag_is_active_for_user from registrar.utility.waffle import flag_is_active_for_user
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
import logging
logger = logging.getLogger(__name__)
class UserPortfolioRoleChoices(models.TextChoices): class UserPortfolioRoleChoices(models.TextChoices):
""" """
@ -16,7 +18,11 @@ class UserPortfolioRoleChoices(models.TextChoices):
@classmethod @classmethod
def get_user_portfolio_role_label(cls, user_portfolio_role): def get_user_portfolio_role_label(cls, user_portfolio_role):
return cls(user_portfolio_role).label if user_portfolio_role else None try:
return cls(user_portfolio_role).label if user_portfolio_role else None
except ValueError:
logger.warning(f"Invalid portfolio role: {user_portfolio_role}")
return f"Unknown ({user_portfolio_role})"
@classmethod @classmethod
def get_role_description(cls, user_portfolio_role): def get_role_description(cls, user_portfolio_role):