From dd673a2f58a9ec820963cde82003c82e73edc8ce Mon Sep 17 00:00:00 2001 From: CocoByte Date: Wed, 29 Nov 2023 16:01:58 -0700 Subject: [PATCH 01/22] Fed agency and state are now dropdowns --- ...mainapplication_federal_agency_and_more.py | 771 ++++++++++++++++++ src/registrar/models/domain_application.py | 2 + src/registrar/models/domain_information.py | 2 + 3 files changed, 775 insertions(+) create mode 100644 src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py diff --git a/src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py b/src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py new file mode 100644 index 000000000..e00d67cb5 --- /dev/null +++ b/src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py @@ -0,0 +1,771 @@ +# Generated by Django 4.2.7 on 2023-11-29 22:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("registrar", "0047_transitiondomain_address_line_transitiondomain_city_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="domainapplication", + name="federal_agency", + field=models.TextField( + blank=True, + choices=[ + ( + "Administrative Conference of the United States", + "Administrative Conference of the United States", + ), + ("Advisory Council on Historic Preservation", "Advisory Council on Historic Preservation"), + ("American Battle Monuments Commission", "American Battle Monuments Commission"), + ("AMTRAK", "AMTRAK"), + ("Appalachian Regional Commission", "Appalachian Regional Commission"), + ( + "Appraisal Subcommittee of the Federal Financial Institutions Examination Council", + "Appraisal Subcommittee of the Federal Financial Institutions Examination Council", + ), + ("Appraisal Subcommittee", "Appraisal Subcommittee"), + ("Architect of the Capitol", "Architect of the Capitol"), + ("Armed Forces Retirement Home", "Armed Forces Retirement Home"), + ( + "Barry Goldwater Scholarship and Excellence in Education Foundation", + "Barry Goldwater Scholarship and Excellence in Education Foundation", + ), + ( + "Barry Goldwater Scholarship and Excellence in Education Program", + "Barry Goldwater Scholarship and Excellence in Education Program", + ), + ("Central Intelligence Agency", "Central Intelligence Agency"), + ("Chemical Safety Board", "Chemical Safety Board"), + ("Christopher Columbus Fellowship Foundation", "Christopher Columbus Fellowship Foundation"), + ("Civil Rights Cold Case Records Review Board", "Civil Rights Cold Case Records Review Board"), + ( + "Commission for the Preservation of America's Heritage Abroad", + "Commission for the Preservation of America's Heritage Abroad", + ), + ("Commission of Fine Arts", "Commission of Fine Arts"), + ( + "Committee for Purchase From People Who Are Blind or Severely Disabled", + "Committee for Purchase From People Who Are Blind or Severely Disabled", + ), + ("Commodity Futures Trading Commission", "Commodity Futures Trading Commission"), + ("Congressional Budget Office", "Congressional Budget Office"), + ("Consumer Financial Protection Bureau", "Consumer Financial Protection Bureau"), + ("Consumer Product Safety Commission", "Consumer Product Safety Commission"), + ("Corporation for National & Community Service", "Corporation for National & Community Service"), + ( + "Corporation for National and Community Service", + "Corporation for National and Community Service", + ), + ( + "Council of Inspectors General on Integrity and Efficiency", + "Council of Inspectors General on Integrity and Efficiency", + ), + ("Court Services and Offender Supervision", "Court Services and Offender Supervision"), + ("Cyberspace Solarium Commission", "Cyberspace Solarium Commission"), + ( + "DC Court Services and Offender Supervision Agency", + "DC Court Services and Offender Supervision Agency", + ), + ("DC Pre-trial Services", "DC Pre-trial Services"), + ("Defense Nuclear Facilities Safety Board", "Defense Nuclear Facilities Safety Board"), + ("Delta Regional Authority", "Delta Regional Authority"), + ("Denali Commission", "Denali Commission"), + ("Department of Agriculture", "Department of Agriculture"), + ("Department of Commerce", "Department of Commerce"), + ("Department of Defense", "Department of Defense"), + ("Department of Education", "Department of Education"), + ("Department of Energy", "Department of Energy"), + ("Department of Health and Human Services", "Department of Health and Human Services"), + ("Department of Homeland Security", "Department of Homeland Security"), + ("Department of Housing and Urban Development", "Department of Housing and Urban Development"), + ("Department of Justice", "Department of Justice"), + ("Department of Labor", "Department of Labor"), + ("Department of State", "Department of State"), + ("Department of the Interior", "Department of the Interior"), + ("Department of the Treasury", "Department of the Treasury"), + ("Department of Transportation", "Department of Transportation"), + ("Department of Veterans Affairs", "Department of Veterans Affairs"), + ("Director of National Intelligence", "Director of National Intelligence"), + ("Dwight D. Eisenhower Memorial Commission", "Dwight D. Eisenhower Memorial Commission"), + ("Election Assistance Commission", "Election Assistance Commission"), + ("Environmental Protection Agency", "Environmental Protection Agency"), + ("Equal Employment Opportunity Commission", "Equal Employment Opportunity Commission"), + ("Executive Office of the President", "Executive Office of the President"), + ("Export-Import Bank of the United States", "Export-Import Bank of the United States"), + ("Export/Import Bank of the U.S.", "Export/Import Bank of the U.S."), + ("Farm Credit Administration", "Farm Credit Administration"), + ("Farm Credit System Insurance Corporation", "Farm Credit System Insurance Corporation"), + ("Federal Communications Commission", "Federal Communications Commission"), + ("Federal Deposit Insurance Corporation", "Federal Deposit Insurance Corporation"), + ("Federal Election Commission", "Federal Election Commission"), + ("Federal Energy Regulatory Commission", "Federal Energy Regulatory Commission"), + ( + "Federal Financial Institutions Examination Council", + "Federal Financial Institutions Examination Council", + ), + ("Federal Housing Finance Agency", "Federal Housing Finance Agency"), + ("Federal Judiciary", "Federal Judiciary"), + ("Federal Labor Relations Authority", "Federal Labor Relations Authority"), + ("Federal Maritime Commission", "Federal Maritime Commission"), + ("Federal Mediation and Conciliation Service", "Federal Mediation and Conciliation Service"), + ( + "Federal Mine Safety and Health Review Commission", + "Federal Mine Safety and Health Review Commission", + ), + ( + "Federal Permitting Improvement Steering Council", + "Federal Permitting Improvement Steering Council", + ), + ("Federal Reserve Board of Governors", "Federal Reserve Board of Governors"), + ("Federal Reserve System", "Federal Reserve System"), + ("Federal Trade Commission", "Federal Trade Commission"), + ("General Services Administration", "General Services Administration"), + ("gov Administration", "gov Administration"), + ("Government Accountability Office", "Government Accountability Office"), + ("Government Publishing Office", "Government Publishing Office"), + ("Gulf Coast Ecosystem Restoration Council", "Gulf Coast Ecosystem Restoration Council"), + ("Harry S Truman Scholarship Foundation", "Harry S Truman Scholarship Foundation"), + ("Harry S. Truman Scholarship Foundation", "Harry S. Truman Scholarship Foundation"), + ("Institute of Museum and Library Services", "Institute of Museum and Library Services"), + ("Institute of Peace", "Institute of Peace"), + ("Inter-American Foundation", "Inter-American Foundation"), + ( + "International Boundary and Water Commission: United States and Mexico", + "International Boundary and Water Commission: United States and Mexico", + ), + ( + "International Boundary Commission: United States and Canada", + "International Boundary Commission: United States and Canada", + ), + ( + "International Joint Commission: United States and Canada", + "International Joint Commission: United States and Canada", + ), + ("James Madison Memorial Fellowship Foundation", "James Madison Memorial Fellowship Foundation"), + ("Japan-United States Friendship Commission", "Japan-United States Friendship Commission"), + ("Japan-US Friendship Commission", "Japan-US Friendship Commission"), + ("John F. Kennedy Center for Performing Arts", "John F. Kennedy Center for Performing Arts"), + ( + "John F. Kennedy Center for the Performing Arts", + "John F. Kennedy Center for the Performing Arts", + ), + ("Legal Services Corporation", "Legal Services Corporation"), + ("Legislative Branch", "Legislative Branch"), + ("Library of Congress", "Library of Congress"), + ("Marine Mammal Commission", "Marine Mammal Commission"), + ( + "Medicaid and CHIP Payment and Access Commission", + "Medicaid and CHIP Payment and Access Commission", + ), + ("Medical Payment Advisory Commission", "Medical Payment Advisory Commission"), + ("Medicare Payment Advisory Commission", "Medicare Payment Advisory Commission"), + ("Merit Systems Protection Board", "Merit Systems Protection Board"), + ("Millennium Challenge Corporation", "Millennium Challenge Corporation"), + ( + "Morris K. Udall and Stewart L. Udall Foundation", + "Morris K. Udall and Stewart L. Udall Foundation", + ), + ("National Aeronautics and Space Administration", "National Aeronautics and Space Administration"), + ("National Archives and Records Administration", "National Archives and Records Administration"), + ("National Capital Planning Commission", "National Capital Planning Commission"), + ("National Council on Disability", "National Council on Disability"), + ("National Credit Union Administration", "National Credit Union Administration"), + ("National Endowment for the Arts", "National Endowment for the Arts"), + ("National Endowment for the Humanities", "National Endowment for the Humanities"), + ( + "National Foundation on the Arts and the Humanities", + "National Foundation on the Arts and the Humanities", + ), + ("National Gallery of Art", "National Gallery of Art"), + ("National Indian Gaming Commission", "National Indian Gaming Commission"), + ("National Labor Relations Board", "National Labor Relations Board"), + ("National Mediation Board", "National Mediation Board"), + ("National Science Foundation", "National Science Foundation"), + ( + "National Security Commission on Artificial Intelligence", + "National Security Commission on Artificial Intelligence", + ), + ("National Transportation Safety Board", "National Transportation Safety Board"), + ( + "Networking Information Technology Research and Development", + "Networking Information Technology Research and Development", + ), + ("Non-Federal Agency", "Non-Federal Agency"), + ("Northern Border Regional Commission", "Northern Border Regional Commission"), + ("Nuclear Regulatory Commission", "Nuclear Regulatory Commission"), + ("Nuclear Safety Oversight Committee", "Nuclear Safety Oversight Committee"), + ("Nuclear Waste Technical Review Board", "Nuclear Waste Technical Review Board"), + ( + "Occupational Safety & Health Review Commission", + "Occupational Safety & Health Review Commission", + ), + ( + "Occupational Safety and Health Review Commission", + "Occupational Safety and Health Review Commission", + ), + ("Office of Compliance", "Office of Compliance"), + ("Office of Congressional Workplace Rights", "Office of Congressional Workplace Rights"), + ("Office of Government Ethics", "Office of Government Ethics"), + ("Office of Navajo and Hopi Indian Relocation", "Office of Navajo and Hopi Indian Relocation"), + ("Office of Personnel Management", "Office of Personnel Management"), + ("Open World Leadership Center", "Open World Leadership Center"), + ("Overseas Private Investment Corporation", "Overseas Private Investment Corporation"), + ("Peace Corps", "Peace Corps"), + ("Pension Benefit Guaranty Corporation", "Pension Benefit Guaranty Corporation"), + ("Postal Regulatory Commission", "Postal Regulatory Commission"), + ("Presidio Trust", "Presidio Trust"), + ("Privacy and Civil Liberties Oversight Board", "Privacy and Civil Liberties Oversight Board"), + ("Public Buildings Reform Board", "Public Buildings Reform Board"), + ( + "Public Defender Service for the District of Columbia", + "Public Defender Service for the District of Columbia", + ), + ("Railroad Retirement Board", "Railroad Retirement Board"), + ("Securities and Exchange Commission", "Securities and Exchange Commission"), + ("Selective Service System", "Selective Service System"), + ("Small Business Administration", "Small Business Administration"), + ("Smithsonian Institution", "Smithsonian Institution"), + ("Social Security Administration", "Social Security Administration"), + ("Social Security Advisory Board", "Social Security Advisory Board"), + ("Southeast Crescent Regional Commission", "Southeast Crescent Regional Commission"), + ("Southwest Border Regional Commission", "Southwest Border Regional Commission"), + ("State Justice Institute", "State Justice Institute"), + ("State, Local, and Tribal Government", "State, Local, and Tribal Government"), + ("Stennis Center for Public Service", "Stennis Center for Public Service"), + ("Surface Transportation Board", "Surface Transportation Board"), + ("Tennessee Valley Authority", "Tennessee Valley Authority"), + ("The Executive Office of the President", "The Executive Office of the President"), + ("The Intelligence Community", "The Intelligence Community"), + ("The Legislative Branch", "The Legislative Branch"), + ("The Supreme Court", "The Supreme Court"), + ( + "The United States World War One Centennial Commission", + "The United States World War One Centennial Commission", + ), + ("U.S. Access Board", "U.S. Access Board"), + ("U.S. Agency for Global Media", "U.S. Agency for Global Media"), + ("U.S. Agency for International Development", "U.S. Agency for International Development"), + ("U.S. Capitol Police", "U.S. Capitol Police"), + ("U.S. Chemical Safety Board", "U.S. Chemical Safety Board"), + ( + "U.S. China Economic and Security Review Commission", + "U.S. China Economic and Security Review Commission", + ), + ( + "U.S. Commission for the Preservation of Americas Heritage Abroad", + "U.S. Commission for the Preservation of Americas Heritage Abroad", + ), + ("U.S. Commission of Fine Arts", "U.S. Commission of Fine Arts"), + ("U.S. Commission on Civil Rights", "U.S. Commission on Civil Rights"), + ( + "U.S. Commission on International Religious Freedom", + "U.S. Commission on International Religious Freedom", + ), + ("U.S. Courts", "U.S. Courts"), + ("U.S. Department of Agriculture", "U.S. Department of Agriculture"), + ("U.S. Interagency Council on Homelessness", "U.S. Interagency Council on Homelessness"), + ("U.S. International Trade Commission", "U.S. International Trade Commission"), + ("U.S. Nuclear Waste Technical Review Board", "U.S. Nuclear Waste Technical Review Board"), + ("U.S. Office of Special Counsel", "U.S. Office of Special Counsel"), + ("U.S. Peace Corps", "U.S. Peace Corps"), + ("U.S. Postal Service", "U.S. Postal Service"), + ("U.S. Semiquincentennial Commission", "U.S. Semiquincentennial Commission"), + ("U.S. Trade and Development Agency", "U.S. Trade and Development Agency"), + ( + "U.S.-China Economic and Security Review Commission", + "U.S.-China Economic and Security Review Commission", + ), + ("Udall Foundation", "Udall Foundation"), + ("United States AbilityOne", "United States AbilityOne"), + ("United States Access Board", "United States Access Board"), + ("United States African Development Foundation", "United States African Development Foundation"), + ("United States Agency for Global Media", "United States Agency for Global Media"), + ("United States Arctic Research Commission", "United States Arctic Research Commission"), + ("United States Global Change Research Program", "United States Global Change Research Program"), + ("United States Holocaust Memorial Museum", "United States Holocaust Memorial Museum"), + ("United States Institute of Peace", "United States Institute of Peace"), + ( + "United States Interagency Council on Homelessness", + "United States Interagency Council on Homelessness", + ), + ( + "United States International Development Finance Corporation", + "United States International Development Finance Corporation", + ), + ("United States International Trade Commission", "United States International Trade Commission"), + ("United States Postal Service", "United States Postal Service"), + ("United States Senate", "United States Senate"), + ("United States Trade and Development Agency", "United States Trade and Development Agency"), + ( + "Utah Reclamation Mitigation and Conservation Commission", + "Utah Reclamation Mitigation and Conservation Commission", + ), + ("Vietnam Education Foundation", "Vietnam Education Foundation"), + ("Western Hemisphere Drug Policy Commission", "Western Hemisphere Drug Policy Commission"), + ( + "Woodrow Wilson International Center for Scholars", + "Woodrow Wilson International Center for Scholars", + ), + ("World War I Centennial Commission", "World War I Centennial Commission"), + ], + help_text="Federal agency", + null=True, + ), + ), + migrations.AlterField( + model_name="domainapplication", + name="state_territory", + field=models.CharField( + blank=True, + choices=[ + ("AL", "Alabama (AL)"), + ("AK", "Alaska (AK)"), + ("AS", "American Samoa (AS)"), + ("AZ", "Arizona (AZ)"), + ("AR", "Arkansas (AR)"), + ("CA", "California (CA)"), + ("CO", "Colorado (CO)"), + ("CT", "Connecticut (CT)"), + ("DE", "Delaware (DE)"), + ("DC", "District of Columbia (DC)"), + ("FL", "Florida (FL)"), + ("GA", "Georgia (GA)"), + ("GU", "Guam (GU)"), + ("HI", "Hawaii (HI)"), + ("ID", "Idaho (ID)"), + ("IL", "Illinois (IL)"), + ("IN", "Indiana (IN)"), + ("IA", "Iowa (IA)"), + ("KS", "Kansas (KS)"), + ("KY", "Kentucky (KY)"), + ("LA", "Louisiana (LA)"), + ("ME", "Maine (ME)"), + ("MD", "Maryland (MD)"), + ("MA", "Massachusetts (MA)"), + ("MI", "Michigan (MI)"), + ("MN", "Minnesota (MN)"), + ("MS", "Mississippi (MS)"), + ("MO", "Missouri (MO)"), + ("MT", "Montana (MT)"), + ("NE", "Nebraska (NE)"), + ("NV", "Nevada (NV)"), + ("NH", "New Hampshire (NH)"), + ("NJ", "New Jersey (NJ)"), + ("NM", "New Mexico (NM)"), + ("NY", "New York (NY)"), + ("NC", "North Carolina (NC)"), + ("ND", "North Dakota (ND)"), + ("MP", "Northern Mariana Islands (MP)"), + ("OH", "Ohio (OH)"), + ("OK", "Oklahoma (OK)"), + ("OR", "Oregon (OR)"), + ("PA", "Pennsylvania (PA)"), + ("PR", "Puerto Rico (PR)"), + ("RI", "Rhode Island (RI)"), + ("SC", "South Carolina (SC)"), + ("SD", "South Dakota (SD)"), + ("TN", "Tennessee (TN)"), + ("TX", "Texas (TX)"), + ("UM", "United States Minor Outlying Islands (UM)"), + ("UT", "Utah (UT)"), + ("VT", "Vermont (VT)"), + ("VI", "Virgin Islands (VI)"), + ("VA", "Virginia (VA)"), + ("WA", "Washington (WA)"), + ("WV", "West Virginia (WV)"), + ("WI", "Wisconsin (WI)"), + ("WY", "Wyoming (WY)"), + ("AA", "Armed Forces Americas (AA)"), + ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"), + ("AP", "Armed Forces Pacific (AP)"), + ], + help_text="State, territory, or military post", + max_length=2, + null=True, + ), + ), + migrations.AlterField( + model_name="domaininformation", + name="federal_agency", + field=models.TextField( + blank=True, + choices=[ + ( + "Administrative Conference of the United States", + "Administrative Conference of the United States", + ), + ("Advisory Council on Historic Preservation", "Advisory Council on Historic Preservation"), + ("American Battle Monuments Commission", "American Battle Monuments Commission"), + ("AMTRAK", "AMTRAK"), + ("Appalachian Regional Commission", "Appalachian Regional Commission"), + ( + "Appraisal Subcommittee of the Federal Financial Institutions Examination Council", + "Appraisal Subcommittee of the Federal Financial Institutions Examination Council", + ), + ("Appraisal Subcommittee", "Appraisal Subcommittee"), + ("Architect of the Capitol", "Architect of the Capitol"), + ("Armed Forces Retirement Home", "Armed Forces Retirement Home"), + ( + "Barry Goldwater Scholarship and Excellence in Education Foundation", + "Barry Goldwater Scholarship and Excellence in Education Foundation", + ), + ( + "Barry Goldwater Scholarship and Excellence in Education Program", + "Barry Goldwater Scholarship and Excellence in Education Program", + ), + ("Central Intelligence Agency", "Central Intelligence Agency"), + ("Chemical Safety Board", "Chemical Safety Board"), + ("Christopher Columbus Fellowship Foundation", "Christopher Columbus Fellowship Foundation"), + ("Civil Rights Cold Case Records Review Board", "Civil Rights Cold Case Records Review Board"), + ( + "Commission for the Preservation of America's Heritage Abroad", + "Commission for the Preservation of America's Heritage Abroad", + ), + ("Commission of Fine Arts", "Commission of Fine Arts"), + ( + "Committee for Purchase From People Who Are Blind or Severely Disabled", + "Committee for Purchase From People Who Are Blind or Severely Disabled", + ), + ("Commodity Futures Trading Commission", "Commodity Futures Trading Commission"), + ("Congressional Budget Office", "Congressional Budget Office"), + ("Consumer Financial Protection Bureau", "Consumer Financial Protection Bureau"), + ("Consumer Product Safety Commission", "Consumer Product Safety Commission"), + ("Corporation for National & Community Service", "Corporation for National & Community Service"), + ( + "Corporation for National and Community Service", + "Corporation for National and Community Service", + ), + ( + "Council of Inspectors General on Integrity and Efficiency", + "Council of Inspectors General on Integrity and Efficiency", + ), + ("Court Services and Offender Supervision", "Court Services and Offender Supervision"), + ("Cyberspace Solarium Commission", "Cyberspace Solarium Commission"), + ( + "DC Court Services and Offender Supervision Agency", + "DC Court Services and Offender Supervision Agency", + ), + ("DC Pre-trial Services", "DC Pre-trial Services"), + ("Defense Nuclear Facilities Safety Board", "Defense Nuclear Facilities Safety Board"), + ("Delta Regional Authority", "Delta Regional Authority"), + ("Denali Commission", "Denali Commission"), + ("Department of Agriculture", "Department of Agriculture"), + ("Department of Commerce", "Department of Commerce"), + ("Department of Defense", "Department of Defense"), + ("Department of Education", "Department of Education"), + ("Department of Energy", "Department of Energy"), + ("Department of Health and Human Services", "Department of Health and Human Services"), + ("Department of Homeland Security", "Department of Homeland Security"), + ("Department of Housing and Urban Development", "Department of Housing and Urban Development"), + ("Department of Justice", "Department of Justice"), + ("Department of Labor", "Department of Labor"), + ("Department of State", "Department of State"), + ("Department of the Interior", "Department of the Interior"), + ("Department of the Treasury", "Department of the Treasury"), + ("Department of Transportation", "Department of Transportation"), + ("Department of Veterans Affairs", "Department of Veterans Affairs"), + ("Director of National Intelligence", "Director of National Intelligence"), + ("Dwight D. Eisenhower Memorial Commission", "Dwight D. Eisenhower Memorial Commission"), + ("Election Assistance Commission", "Election Assistance Commission"), + ("Environmental Protection Agency", "Environmental Protection Agency"), + ("Equal Employment Opportunity Commission", "Equal Employment Opportunity Commission"), + ("Executive Office of the President", "Executive Office of the President"), + ("Export-Import Bank of the United States", "Export-Import Bank of the United States"), + ("Export/Import Bank of the U.S.", "Export/Import Bank of the U.S."), + ("Farm Credit Administration", "Farm Credit Administration"), + ("Farm Credit System Insurance Corporation", "Farm Credit System Insurance Corporation"), + ("Federal Communications Commission", "Federal Communications Commission"), + ("Federal Deposit Insurance Corporation", "Federal Deposit Insurance Corporation"), + ("Federal Election Commission", "Federal Election Commission"), + ("Federal Energy Regulatory Commission", "Federal Energy Regulatory Commission"), + ( + "Federal Financial Institutions Examination Council", + "Federal Financial Institutions Examination Council", + ), + ("Federal Housing Finance Agency", "Federal Housing Finance Agency"), + ("Federal Judiciary", "Federal Judiciary"), + ("Federal Labor Relations Authority", "Federal Labor Relations Authority"), + ("Federal Maritime Commission", "Federal Maritime Commission"), + ("Federal Mediation and Conciliation Service", "Federal Mediation and Conciliation Service"), + ( + "Federal Mine Safety and Health Review Commission", + "Federal Mine Safety and Health Review Commission", + ), + ( + "Federal Permitting Improvement Steering Council", + "Federal Permitting Improvement Steering Council", + ), + ("Federal Reserve Board of Governors", "Federal Reserve Board of Governors"), + ("Federal Reserve System", "Federal Reserve System"), + ("Federal Trade Commission", "Federal Trade Commission"), + ("General Services Administration", "General Services Administration"), + ("gov Administration", "gov Administration"), + ("Government Accountability Office", "Government Accountability Office"), + ("Government Publishing Office", "Government Publishing Office"), + ("Gulf Coast Ecosystem Restoration Council", "Gulf Coast Ecosystem Restoration Council"), + ("Harry S Truman Scholarship Foundation", "Harry S Truman Scholarship Foundation"), + ("Harry S. Truman Scholarship Foundation", "Harry S. Truman Scholarship Foundation"), + ("Institute of Museum and Library Services", "Institute of Museum and Library Services"), + ("Institute of Peace", "Institute of Peace"), + ("Inter-American Foundation", "Inter-American Foundation"), + ( + "International Boundary and Water Commission: United States and Mexico", + "International Boundary and Water Commission: United States and Mexico", + ), + ( + "International Boundary Commission: United States and Canada", + "International Boundary Commission: United States and Canada", + ), + ( + "International Joint Commission: United States and Canada", + "International Joint Commission: United States and Canada", + ), + ("James Madison Memorial Fellowship Foundation", "James Madison Memorial Fellowship Foundation"), + ("Japan-United States Friendship Commission", "Japan-United States Friendship Commission"), + ("Japan-US Friendship Commission", "Japan-US Friendship Commission"), + ("John F. Kennedy Center for Performing Arts", "John F. Kennedy Center for Performing Arts"), + ( + "John F. Kennedy Center for the Performing Arts", + "John F. Kennedy Center for the Performing Arts", + ), + ("Legal Services Corporation", "Legal Services Corporation"), + ("Legislative Branch", "Legislative Branch"), + ("Library of Congress", "Library of Congress"), + ("Marine Mammal Commission", "Marine Mammal Commission"), + ( + "Medicaid and CHIP Payment and Access Commission", + "Medicaid and CHIP Payment and Access Commission", + ), + ("Medical Payment Advisory Commission", "Medical Payment Advisory Commission"), + ("Medicare Payment Advisory Commission", "Medicare Payment Advisory Commission"), + ("Merit Systems Protection Board", "Merit Systems Protection Board"), + ("Millennium Challenge Corporation", "Millennium Challenge Corporation"), + ( + "Morris K. Udall and Stewart L. Udall Foundation", + "Morris K. Udall and Stewart L. Udall Foundation", + ), + ("National Aeronautics and Space Administration", "National Aeronautics and Space Administration"), + ("National Archives and Records Administration", "National Archives and Records Administration"), + ("National Capital Planning Commission", "National Capital Planning Commission"), + ("National Council on Disability", "National Council on Disability"), + ("National Credit Union Administration", "National Credit Union Administration"), + ("National Endowment for the Arts", "National Endowment for the Arts"), + ("National Endowment for the Humanities", "National Endowment for the Humanities"), + ( + "National Foundation on the Arts and the Humanities", + "National Foundation on the Arts and the Humanities", + ), + ("National Gallery of Art", "National Gallery of Art"), + ("National Indian Gaming Commission", "National Indian Gaming Commission"), + ("National Labor Relations Board", "National Labor Relations Board"), + ("National Mediation Board", "National Mediation Board"), + ("National Science Foundation", "National Science Foundation"), + ( + "National Security Commission on Artificial Intelligence", + "National Security Commission on Artificial Intelligence", + ), + ("National Transportation Safety Board", "National Transportation Safety Board"), + ( + "Networking Information Technology Research and Development", + "Networking Information Technology Research and Development", + ), + ("Non-Federal Agency", "Non-Federal Agency"), + ("Northern Border Regional Commission", "Northern Border Regional Commission"), + ("Nuclear Regulatory Commission", "Nuclear Regulatory Commission"), + ("Nuclear Safety Oversight Committee", "Nuclear Safety Oversight Committee"), + ("Nuclear Waste Technical Review Board", "Nuclear Waste Technical Review Board"), + ( + "Occupational Safety & Health Review Commission", + "Occupational Safety & Health Review Commission", + ), + ( + "Occupational Safety and Health Review Commission", + "Occupational Safety and Health Review Commission", + ), + ("Office of Compliance", "Office of Compliance"), + ("Office of Congressional Workplace Rights", "Office of Congressional Workplace Rights"), + ("Office of Government Ethics", "Office of Government Ethics"), + ("Office of Navajo and Hopi Indian Relocation", "Office of Navajo and Hopi Indian Relocation"), + ("Office of Personnel Management", "Office of Personnel Management"), + ("Open World Leadership Center", "Open World Leadership Center"), + ("Overseas Private Investment Corporation", "Overseas Private Investment Corporation"), + ("Peace Corps", "Peace Corps"), + ("Pension Benefit Guaranty Corporation", "Pension Benefit Guaranty Corporation"), + ("Postal Regulatory Commission", "Postal Regulatory Commission"), + ("Presidio Trust", "Presidio Trust"), + ("Privacy and Civil Liberties Oversight Board", "Privacy and Civil Liberties Oversight Board"), + ("Public Buildings Reform Board", "Public Buildings Reform Board"), + ( + "Public Defender Service for the District of Columbia", + "Public Defender Service for the District of Columbia", + ), + ("Railroad Retirement Board", "Railroad Retirement Board"), + ("Securities and Exchange Commission", "Securities and Exchange Commission"), + ("Selective Service System", "Selective Service System"), + ("Small Business Administration", "Small Business Administration"), + ("Smithsonian Institution", "Smithsonian Institution"), + ("Social Security Administration", "Social Security Administration"), + ("Social Security Advisory Board", "Social Security Advisory Board"), + ("Southeast Crescent Regional Commission", "Southeast Crescent Regional Commission"), + ("Southwest Border Regional Commission", "Southwest Border Regional Commission"), + ("State Justice Institute", "State Justice Institute"), + ("State, Local, and Tribal Government", "State, Local, and Tribal Government"), + ("Stennis Center for Public Service", "Stennis Center for Public Service"), + ("Surface Transportation Board", "Surface Transportation Board"), + ("Tennessee Valley Authority", "Tennessee Valley Authority"), + ("The Executive Office of the President", "The Executive Office of the President"), + ("The Intelligence Community", "The Intelligence Community"), + ("The Legislative Branch", "The Legislative Branch"), + ("The Supreme Court", "The Supreme Court"), + ( + "The United States World War One Centennial Commission", + "The United States World War One Centennial Commission", + ), + ("U.S. Access Board", "U.S. Access Board"), + ("U.S. Agency for Global Media", "U.S. Agency for Global Media"), + ("U.S. Agency for International Development", "U.S. Agency for International Development"), + ("U.S. Capitol Police", "U.S. Capitol Police"), + ("U.S. Chemical Safety Board", "U.S. Chemical Safety Board"), + ( + "U.S. China Economic and Security Review Commission", + "U.S. China Economic and Security Review Commission", + ), + ( + "U.S. Commission for the Preservation of Americas Heritage Abroad", + "U.S. Commission for the Preservation of Americas Heritage Abroad", + ), + ("U.S. Commission of Fine Arts", "U.S. Commission of Fine Arts"), + ("U.S. Commission on Civil Rights", "U.S. Commission on Civil Rights"), + ( + "U.S. Commission on International Religious Freedom", + "U.S. Commission on International Religious Freedom", + ), + ("U.S. Courts", "U.S. Courts"), + ("U.S. Department of Agriculture", "U.S. Department of Agriculture"), + ("U.S. Interagency Council on Homelessness", "U.S. Interagency Council on Homelessness"), + ("U.S. International Trade Commission", "U.S. International Trade Commission"), + ("U.S. Nuclear Waste Technical Review Board", "U.S. Nuclear Waste Technical Review Board"), + ("U.S. Office of Special Counsel", "U.S. Office of Special Counsel"), + ("U.S. Peace Corps", "U.S. Peace Corps"), + ("U.S. Postal Service", "U.S. Postal Service"), + ("U.S. Semiquincentennial Commission", "U.S. Semiquincentennial Commission"), + ("U.S. Trade and Development Agency", "U.S. Trade and Development Agency"), + ( + "U.S.-China Economic and Security Review Commission", + "U.S.-China Economic and Security Review Commission", + ), + ("Udall Foundation", "Udall Foundation"), + ("United States AbilityOne", "United States AbilityOne"), + ("United States Access Board", "United States Access Board"), + ("United States African Development Foundation", "United States African Development Foundation"), + ("United States Agency for Global Media", "United States Agency for Global Media"), + ("United States Arctic Research Commission", "United States Arctic Research Commission"), + ("United States Global Change Research Program", "United States Global Change Research Program"), + ("United States Holocaust Memorial Museum", "United States Holocaust Memorial Museum"), + ("United States Institute of Peace", "United States Institute of Peace"), + ( + "United States Interagency Council on Homelessness", + "United States Interagency Council on Homelessness", + ), + ( + "United States International Development Finance Corporation", + "United States International Development Finance Corporation", + ), + ("United States International Trade Commission", "United States International Trade Commission"), + ("United States Postal Service", "United States Postal Service"), + ("United States Senate", "United States Senate"), + ("United States Trade and Development Agency", "United States Trade and Development Agency"), + ( + "Utah Reclamation Mitigation and Conservation Commission", + "Utah Reclamation Mitigation and Conservation Commission", + ), + ("Vietnam Education Foundation", "Vietnam Education Foundation"), + ("Western Hemisphere Drug Policy Commission", "Western Hemisphere Drug Policy Commission"), + ( + "Woodrow Wilson International Center for Scholars", + "Woodrow Wilson International Center for Scholars", + ), + ("World War I Centennial Commission", "World War I Centennial Commission"), + ], + help_text="Federal agency", + null=True, + ), + ), + migrations.AlterField( + model_name="domaininformation", + name="state_territory", + field=models.CharField( + blank=True, + choices=[ + ("AL", "Alabama (AL)"), + ("AK", "Alaska (AK)"), + ("AS", "American Samoa (AS)"), + ("AZ", "Arizona (AZ)"), + ("AR", "Arkansas (AR)"), + ("CA", "California (CA)"), + ("CO", "Colorado (CO)"), + ("CT", "Connecticut (CT)"), + ("DE", "Delaware (DE)"), + ("DC", "District of Columbia (DC)"), + ("FL", "Florida (FL)"), + ("GA", "Georgia (GA)"), + ("GU", "Guam (GU)"), + ("HI", "Hawaii (HI)"), + ("ID", "Idaho (ID)"), + ("IL", "Illinois (IL)"), + ("IN", "Indiana (IN)"), + ("IA", "Iowa (IA)"), + ("KS", "Kansas (KS)"), + ("KY", "Kentucky (KY)"), + ("LA", "Louisiana (LA)"), + ("ME", "Maine (ME)"), + ("MD", "Maryland (MD)"), + ("MA", "Massachusetts (MA)"), + ("MI", "Michigan (MI)"), + ("MN", "Minnesota (MN)"), + ("MS", "Mississippi (MS)"), + ("MO", "Missouri (MO)"), + ("MT", "Montana (MT)"), + ("NE", "Nebraska (NE)"), + ("NV", "Nevada (NV)"), + ("NH", "New Hampshire (NH)"), + ("NJ", "New Jersey (NJ)"), + ("NM", "New Mexico (NM)"), + ("NY", "New York (NY)"), + ("NC", "North Carolina (NC)"), + ("ND", "North Dakota (ND)"), + ("MP", "Northern Mariana Islands (MP)"), + ("OH", "Ohio (OH)"), + ("OK", "Oklahoma (OK)"), + ("OR", "Oregon (OR)"), + ("PA", "Pennsylvania (PA)"), + ("PR", "Puerto Rico (PR)"), + ("RI", "Rhode Island (RI)"), + ("SC", "South Carolina (SC)"), + ("SD", "South Dakota (SD)"), + ("TN", "Tennessee (TN)"), + ("TX", "Texas (TX)"), + ("UM", "United States Minor Outlying Islands (UM)"), + ("UT", "Utah (UT)"), + ("VT", "Vermont (VT)"), + ("VI", "Virgin Islands (VI)"), + ("VA", "Virginia (VA)"), + ("WA", "Washington (WA)"), + ("WV", "West Virginia (WV)"), + ("WI", "Wisconsin (WI)"), + ("WY", "Wyoming (WY)"), + ("AA", "Armed Forces Americas (AA)"), + ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"), + ("AP", "Armed Forces Pacific (AP)"), + ], + help_text="State, territory, or military post", + max_length=2, + null=True, + verbose_name="State, territory, or military post", + ), + ), + ] diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index 86b8a0f7a..4a1945678 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -409,6 +409,7 @@ class DomainApplication(TimeStampedModel): ) federal_agency = models.TextField( + choices=AGENCY_CHOICES, null=True, blank=True, help_text="Federal agency", @@ -451,6 +452,7 @@ class DomainApplication(TimeStampedModel): ) state_territory = models.CharField( max_length=2, + choices=StateTerritoryChoices.choices, null=True, blank=True, help_text="State, territory, or military post", diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py index d2bc5c53d..6eef94cf8 100644 --- a/src/registrar/models/domain_information.py +++ b/src/registrar/models/domain_information.py @@ -72,6 +72,7 @@ class DomainInformation(TimeStampedModel): ) federal_agency = models.TextField( + choices=AGENCY_CHOICES, null=True, blank=True, help_text="Federal agency", @@ -116,6 +117,7 @@ class DomainInformation(TimeStampedModel): ) state_territory = models.CharField( max_length=2, + choices=StateTerritoryChoices.choices, null=True, blank=True, help_text="State, territory, or military post", From 73a82a0b1bf55667635a6995c51d1d340c98fed2 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Fri, 1 Dec 2023 08:12:54 -0700 Subject: [PATCH 02/22] Create migration-troubleshooting.md --- docs/developer/migration-troubleshooting.md | 112 ++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 docs/developer/migration-troubleshooting.md diff --git a/docs/developer/migration-troubleshooting.md b/docs/developer/migration-troubleshooting.md new file mode 100644 index 000000000..6b757fdb7 --- /dev/null +++ b/docs/developer/migration-troubleshooting.md @@ -0,0 +1,112 @@ +## Troubleshooting + +### Your toolkit +For a general overview, read [this documentation](https://www.algotech.solutions/blog/python/django-migrations-and-how-to-manage-conflicts/) + + +Some common commands: +- docker-compose exec app bash -- gets you into bash +- ./manage.py showmigrations -- shows the current migrations that are finished, all should have [x] +- ./manage.py makemigrations -- makes the migration +- ./manage.py showmigrations -- now you should see the new/updated migration with a [ ] +- ./manage.py migrate [folder name here, ie registrar] +- ./manage.py showmigrations -- the migration changes should now have a [x] by it + + +On occasion, you will need to run this set of commands to refresh your environment: +docker-compose down +docker-compose build +docker-compose up + + +## Scenarios + +### Scenario 1: Conflicting migrations on local + +If you get conflicting migrations on local, you probably have a new migration on your branch and you merged main which had new migrations as well. Do NOT merge migrations together. Assume your local migration is 40_local_migration and the migration from main is 40_some_migration_from_main: +Delete 40_local_migration +Run `docker-compose exec app ./manage.py makemigrations` +Compose down then up or run `docker-compose exec app ./manage.py migrate` +You should end up with 40_some_migration_from_main, 41_local_migration +Alternatively, assuming that the conflicting migrations are not dependent on each other, you can manually edit the migration file such that your new migration is incremented by one (file name, and definition inside the file) but this approach is not recommended. + +### Scenario 2: Conflicting migrations on sandbox + +You will diagnose when the migrations job on your PR fails and the logs show “conflicting migrations, multiple leaves found” (something like that). This happens when you swap branches on your sandbox that contain diverging leaves (eg: 40_migration_1 and 40_migration_2). The fix is to go into the sandbox, delete one of these leaves, fake run the preceding migration, hand run the remaining previously conflicting leaf, fake run the last migration: +`cf login -a api.fr.cloud.gov --sso` +`cf ssh getgov-` +`/tmp/lifecycle/shell` +Navigate to and delete the offending migration +`cf run-task getgov- --wait --command 'python manage.py migrate registrar 39_previous_miration --fake' --name migrate +`cf run-task getgov- --wait --command 'python manage.py migrate registrar 40_migration_2' --name migrate` +`cf run-task getgov- --wait --command 'python manage.py migrate registrar 45_last_migration --fake' --name migrate` + + +### Scenario 3: Migrations ran incorrectly, and migrate no longer works (sandbox) + +This has happened when updating user perms (so running a new data migration). Something is off with the update on the sandbox and you need to run that last data migration again: +`cf login -a api.fr.cloud.gov --sso` +`cf run-task getgov- --wait --command 'python manage.py migrate registrar 39_penultimate_miration --fake' --name migrate` +`cf run-task getgov- --wait --command 'python manage.py migrate' --name migrate` + + +### Scenario 4: All migrations refuse to load due to existing duplicates on sandboxes + +This typically happens with a DB conflict that prevents 001_initial from loading. For instance, let's say all migrations have ran successfully before, and a zero command is ran to reset everything. This can lead to a catastrophic issue with your postgres database. + +To diagnose this issue, you will have to manually delete tables using the psql shell environment. If you are in a production environment and cannot lose that data, then you will need some method of backing that up and reattaching it to the table. +`cf login -a api.fr.cloud.gov --sso` +Run `cf connect-to-service -no-client getgov-{environment_name} getgov-{environment_name}-database` to open a SSH tunnel +Run `psql -h localhost -p {port} -U {username} -d {broker_name}` +Open a new terminal window and run `cf ssh getgov{environment_name}` +Run `tmp/lifecycle/shell` +Run `./manage.py migrate` and observe which tables are duplicates +In the psql instance, run `DROP TABLE {table_name} CASCADE` **WARNING:** this will permanently erase data! Be careful when doing this and exercise common sense. +Run `./manage.py migrate` again and repeat step 7 for each table which returns this error. +After these errors are resolved, follow instructions in the other scenarios if applicable. + + +### Scenario 5: Permissions group exist, but my users cannot log onto the sandbox + +This is most likely due to fixtures not running or fixtures running before the data creating migration. Simple run fixtures again (WARNING: This applies to dev sandboxes only. We never want to rerun fixtures on a stable environment) +`cf login -a api.fr.cloud.gov --sso` +`cf run-task getgov- --command "./manage.py load" --name fixtures` + +### Scenario 6: The data is corrupted on the sandbox + +Example: there are extra columns created on a table by an old migration long since gone from the code. In that case, you may have to tunnel into your DB on the sandbox and hand-delete these columns. See scenario #4 if you are running into duplicate table definitions. Also see [this documentation](docs/developer/database-access.md) for a good reference here: +`cf login -a api.fr.cloud.gov --sso` +Open a new terminal window and run `cf ssh getgov{environment_name}` +Run `tmp/lifecycle/shell` +Run `./manage.py migrate` and observe which tables have invalid column definitions +Run the `\l` command to see all of the databases that are present +`\c cgawsbrokerprodlgi635s6c0afp8w` (assume cgawsbrokerprodlgi635s6c0afp8w is your DB) +‘\dt’ to see the tables +`SELECT * FROM {bad_table};` +`alter table registrar_domain drop {bad_column};` + + +### Scenario 7: Continual 500 error for the registrar + your requests (login, clicking around, etc) are not showing up in the logstream + +Example: You are able to log in and access the /admin page, but when you arrive at the registrar you keep getting 500 errors and your log-ins any API calls you make via the UI does not show up in the log stream. And you feel like you’re starting to lose your marbles. + +In the CLI, run the command `cf routes` +If you notice that your route of `getgov-.app.cloud.gov` is pointing two apps, then that is probably the major issue of the 500 error. (ie mine was pointing at `getgov-.app.cloud.gov` AND `cisa-dotgov` +In the CLI, run the command `cf apps` to check that it has an app running called `cisa-dotgov`. If so, there’s the error! +Essentially this shows that your requests were being handled by two completely separate applications and that’s why some requests aren’t being located. +To resolve this issue, remove the app named `cisa-dotgov` from this space. +Test out the sandbox from there and it should be working! + +Debug connectivity: + +dig getgov-rh.app.cloud.gov (domain information groper, gets DNS nameserver information) +curl -v https://getgov-.app.cloud.gov/ --resolve 'getgov-.app.cloud.gov:' (this gets you access to ping to it) +You should be able to play around with your sandbox and see from the curl command above that it’s being pinged. This command is basically log stream, but gives you full access to make sure you can ping the sandbox manually +https://cisa-corp.slack.com/archives/C05BGB4L5NF/p1697810600723069 + +### Scenario 8: Can’t log into sandbox, permissions do not exist + +Fake migrate the migration that’s before the last data creation migration +Run the last data creation migration (AND ONLY THAT ONE) +Fake migrate the last migration in the migration list +Rerun fixtures From e100a0edbd0e1617b0f0d9fd0c84ce218f690e75 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Fri, 1 Dec 2023 08:30:19 -0700 Subject: [PATCH 03/22] Some formatting --- docs/developer/migration-troubleshooting.md | 106 ++++++++++++-------- 1 file changed, 63 insertions(+), 43 deletions(-) diff --git a/docs/developer/migration-troubleshooting.md b/docs/developer/migration-troubleshooting.md index 6b757fdb7..ff451bfdd 100644 --- a/docs/developer/migration-troubleshooting.md +++ b/docs/developer/migration-troubleshooting.md @@ -14,40 +14,51 @@ Some common commands: On occasion, you will need to run this set of commands to refresh your environment: -docker-compose down -docker-compose build -docker-compose up +- docker-compose down +- docker-compose build +- docker-compose up ## Scenarios ### Scenario 1: Conflicting migrations on local -If you get conflicting migrations on local, you probably have a new migration on your branch and you merged main which had new migrations as well. Do NOT merge migrations together. Assume your local migration is 40_local_migration and the migration from main is 40_some_migration_from_main: -Delete 40_local_migration -Run `docker-compose exec app ./manage.py makemigrations` -Compose down then up or run `docker-compose exec app ./manage.py migrate` -You should end up with 40_some_migration_from_main, 41_local_migration +If you get conflicting migrations on local, you probably have a new migration on your branch and you merged main which had new migrations as well. Do NOT merge migrations together. + +Assuming your local migration is `40_local_migration` and the migration from main is `40_some_migration_from_main`: +- Delete `40_local_migration` +- Run `docker-compose exec app ./manage.py makemigrations` +- Run `docker-compose down` +- Run `docker-compose up` +- Run `docker-compose exec app ./manage.py migrate` + +You should end up with `40_some_migration_from_main`, `41_local_migration` + Alternatively, assuming that the conflicting migrations are not dependent on each other, you can manually edit the migration file such that your new migration is incremented by one (file name, and definition inside the file) but this approach is not recommended. ### Scenario 2: Conflicting migrations on sandbox -You will diagnose when the migrations job on your PR fails and the logs show “conflicting migrations, multiple leaves found” (something like that). This happens when you swap branches on your sandbox that contain diverging leaves (eg: 40_migration_1 and 40_migration_2). The fix is to go into the sandbox, delete one of these leaves, fake run the preceding migration, hand run the remaining previously conflicting leaf, fake run the last migration: -`cf login -a api.fr.cloud.gov --sso` -`cf ssh getgov-` -`/tmp/lifecycle/shell` -Navigate to and delete the offending migration -`cf run-task getgov- --wait --command 'python manage.py migrate registrar 39_previous_miration --fake' --name migrate -`cf run-task getgov- --wait --command 'python manage.py migrate registrar 40_migration_2' --name migrate` -`cf run-task getgov- --wait --command 'python manage.py migrate registrar 45_last_migration --fake' --name migrate` +This occurs when the logs return the following: +>Conflicting migrations detected; multiple leaf nodes in the migration graph: (0040_example, 0041_example in base). +To fix them run 'python manage.py makemigrations --merge' +This happens when you swap branches on your sandbox that contain diverging leaves (eg: 0040_example, 0041_example). The fix is to go into the sandbox, delete one of these leaves, fake run the preceding migration, hand run the remaining previously conflicting leaf, fake run the last migration: + +- `cf login -a api.fr.cloud.gov --sso` +- `cf ssh getgov-` +- `/tmp/lifecycle/shell` +- `cf run-task getgov- --wait --command 'python manage.py migrate registrar 39_previous_miration --fake' --name migrate` +- `cf run-task getgov- --wait --command 'python manage.py migrate registrar 41_example_migration' --name migrate` +- `cf run-task getgov- --wait --command 'python manage.py migrate registrar 45_last_migration --fake' --name migrate` + +Then, navigate to and delete the offending migration. In this case, it is 0041_example_migration. ### Scenario 3: Migrations ran incorrectly, and migrate no longer works (sandbox) This has happened when updating user perms (so running a new data migration). Something is off with the update on the sandbox and you need to run that last data migration again: -`cf login -a api.fr.cloud.gov --sso` -`cf run-task getgov- --wait --command 'python manage.py migrate registrar 39_penultimate_miration --fake' --name migrate` -`cf run-task getgov- --wait --command 'python manage.py migrate' --name migrate` +- `cf login -a api.fr.cloud.gov --sso` +- `cf run-task getgov- --wait --command 'python manage.py migrate registrar 39_penultimate_miration --fake' --name migrate` +- `cf run-task getgov- --wait --command 'python manage.py migrate' --name migrate` ### Scenario 4: All migrations refuse to load due to existing duplicates on sandboxes @@ -55,35 +66,44 @@ This has happened when updating user perms (so running a new data migration). So This typically happens with a DB conflict that prevents 001_initial from loading. For instance, let's say all migrations have ran successfully before, and a zero command is ran to reset everything. This can lead to a catastrophic issue with your postgres database. To diagnose this issue, you will have to manually delete tables using the psql shell environment. If you are in a production environment and cannot lose that data, then you will need some method of backing that up and reattaching it to the table. -`cf login -a api.fr.cloud.gov --sso` -Run `cf connect-to-service -no-client getgov-{environment_name} getgov-{environment_name}-database` to open a SSH tunnel -Run `psql -h localhost -p {port} -U {username} -d {broker_name}` -Open a new terminal window and run `cf ssh getgov{environment_name}` -Run `tmp/lifecycle/shell` -Run `./manage.py migrate` and observe which tables are duplicates -In the psql instance, run `DROP TABLE {table_name} CASCADE` **WARNING:** this will permanently erase data! Be careful when doing this and exercise common sense. -Run `./manage.py migrate` again and repeat step 7 for each table which returns this error. + +1. `cf login -a api.fr.cloud.gov --sso` +2. Run `cf connect-to-service -no-client getgov-{environment_name} getgov-{environment_name}-database` to open a SSH tunnel +3. Run `psql -h localhost -p {port} -U {username} -d {broker_name}` +4. Open a new terminal window and run `cf ssh getgov{environment_name}` +5. Within that window, run `tmp/lifecycle/shell` +6. Within that window, run `./manage.py migrate` and observe which tables are duplicates + +Afterwards, go back to your psql instance. Run the following for each problematic table: + +7. `DROP TABLE {table_name} CASCADE` + +**WARNING:** this will permanently erase data! Be careful when doing this and exercise common sense. + +Then, run `./manage.py migrate` again and repeat step 7 for each table which returns this error. After these errors are resolved, follow instructions in the other scenarios if applicable. ### Scenario 5: Permissions group exist, but my users cannot log onto the sandbox This is most likely due to fixtures not running or fixtures running before the data creating migration. Simple run fixtures again (WARNING: This applies to dev sandboxes only. We never want to rerun fixtures on a stable environment) -`cf login -a api.fr.cloud.gov --sso` -`cf run-task getgov- --command "./manage.py load" --name fixtures` -### Scenario 6: The data is corrupted on the sandbox +- `cf login -a api.fr.cloud.gov --sso` +- `cf run-task getgov- --command "./manage.py load" --name fixtures` + +### Scenario 6: Data is corrupted on the sandbox Example: there are extra columns created on a table by an old migration long since gone from the code. In that case, you may have to tunnel into your DB on the sandbox and hand-delete these columns. See scenario #4 if you are running into duplicate table definitions. Also see [this documentation](docs/developer/database-access.md) for a good reference here: -`cf login -a api.fr.cloud.gov --sso` -Open a new terminal window and run `cf ssh getgov{environment_name}` -Run `tmp/lifecycle/shell` -Run `./manage.py migrate` and observe which tables have invalid column definitions -Run the `\l` command to see all of the databases that are present -`\c cgawsbrokerprodlgi635s6c0afp8w` (assume cgawsbrokerprodlgi635s6c0afp8w is your DB) + +- `cf login -a api.fr.cloud.gov --sso` +- Open a new terminal window and run `cf ssh getgov{environment_name}` +- Run `tmp/lifecycle/shell` +- Run `./manage.py migrate` and observe which tables have invalid column definitions +- Run the `\l` command to see all of the databases that are present +- `\c cgawsbrokerprodlgi635s6c0afp8w` (assume cgawsbrokerprodlgi635s6c0afp8w is your DB) ‘\dt’ to see the tables -`SELECT * FROM {bad_table};` -`alter table registrar_domain drop {bad_column};` +- `SELECT * FROM {bad_table};` +- `alter table registrar_domain drop {bad_column};` ### Scenario 7: Continual 500 error for the registrar + your requests (login, clicking around, etc) are not showing up in the logstream @@ -97,7 +117,7 @@ Essentially this shows that your requests were being handled by two completely s To resolve this issue, remove the app named `cisa-dotgov` from this space. Test out the sandbox from there and it should be working! -Debug connectivity: +**Debug connectivity** dig getgov-rh.app.cloud.gov (domain information groper, gets DNS nameserver information) curl -v https://getgov-.app.cloud.gov/ --resolve 'getgov-.app.cloud.gov:' (this gets you access to ping to it) @@ -106,7 +126,7 @@ https://cisa-corp.slack.com/archives/C05BGB4L5NF/p1697810600723069 ### Scenario 8: Can’t log into sandbox, permissions do not exist -Fake migrate the migration that’s before the last data creation migration -Run the last data creation migration (AND ONLY THAT ONE) -Fake migrate the last migration in the migration list -Rerun fixtures +- Fake migrate the migration that’s before the last data creation migration +- Run the last data creation migration (AND ONLY THAT ONE) +- Fake migrate the last migration in the migration list +- Rerun fixtures From f5edd64c92d89801b87cb6afd84d090deaa3709c Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Mon, 4 Dec 2023 11:35:31 -0800 Subject: [PATCH 04/22] Move manage your domain --- src/registrar/templates/base.html | 12 +++++++++++- src/registrar/templates/domain_base.html | 10 ---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index caecee9f3..6179798b8 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -148,8 +148,18 @@ + + + + Manage your domains + + + + + + {% endblock %} diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html index b5f70d341..530f97e66 100644 --- a/src/registrar/templates/domain_base.html +++ b/src/registrar/templates/domain_base.html @@ -42,16 +42,6 @@

- {% else %} - - - -

- Back to manage your domains -

- {% endif %} {# messages block is under the back breadcrumb link #} {% if messages %} From b0d95be7a27269afdb103cc13219cf8e605ee453 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Mon, 4 Dec 2023 15:28:31 -0500 Subject: [PATCH 05/22] layout and CSS for the back to manage domains button --- src/registrar/assets/sass/_theme/_base.scss | 4 --- .../assets/sass/_theme/_buttons.scss | 11 ++++++++ .../assets/sass/_theme/_nav-primary.scss | 9 +++++++ src/registrar/assets/sass/_theme/styles.scss | 1 + src/registrar/templates/base.html | 27 ++++++++----------- 5 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 src/registrar/assets/sass/_theme/_nav-primary.scss diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss index 668a6ace6..b5efc63bd 100644 --- a/src/registrar/assets/sass/_theme/_base.scss +++ b/src/registrar/assets/sass/_theme/_base.scss @@ -37,10 +37,6 @@ body { @include typeset('sans', 'xl', 2); color: color('primary-darker'); } - -.usa-nav__primary { - margin-top: units(1); -} .section--outlined { background-color: color('white'); diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss index 02089ec6d..8e6aeef56 100644 --- a/src/registrar/assets/sass/_theme/_buttons.scss +++ b/src/registrar/assets/sass/_theme/_buttons.scss @@ -7,6 +7,17 @@ a[href$="todo"]::after { content: " [link TBD]"; font-style: italic; } + +a.manage_domain_back { + // Slight vertical and horizontal alignment fixes + position: relative; + top: -2px; + left: -5px; + font-weight: bold; + &:visited { + color: color('primary'); + } +} a.breadcrumb__back { display:flex; diff --git a/src/registrar/assets/sass/_theme/_nav-primary.scss b/src/registrar/assets/sass/_theme/_nav-primary.scss new file mode 100644 index 000000000..754abfa2e --- /dev/null +++ b/src/registrar/assets/sass/_theme/_nav-primary.scss @@ -0,0 +1,9 @@ +@use "uswds-core" as *; + +.usa-nav__primary { + margin-top: units(1); +} + +.usa-logo-group { + flex: 1 1 0%; +} diff --git a/src/registrar/assets/sass/_theme/styles.scss b/src/registrar/assets/sass/_theme/styles.scss index 8a2e1d2d3..32681f379 100644 --- a/src/registrar/assets/sass/_theme/styles.scss +++ b/src/registrar/assets/sass/_theme/styles.scss @@ -9,6 +9,7 @@ /*-------------------------------------------------- --- Custom Styles ---------------------------------*/ @forward "base"; +@forward "nav-primary"; @forward "typography"; @forward "buttons"; @forward "forms"; diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index 6179798b8..03eec88ac 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -144,23 +144,18 @@
- {% block logo %} - - - - +
+ {% block logo %} + + {% endblock %} + Manage your domains - - - - - - - {% endblock %} + +
{% block usa_nav %} From 61e05a438b6a793651ea8a6f9f4bfdaf19d5a940 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Mon, 4 Dec 2023 15:33:46 -0500 Subject: [PATCH 06/22] Move manage button CSS from buttons to nav partial --- src/registrar/assets/sass/_theme/_buttons.scss | 11 ----------- src/registrar/assets/sass/_theme/_nav-primary.scss | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/registrar/assets/sass/_theme/_buttons.scss b/src/registrar/assets/sass/_theme/_buttons.scss index 8e6aeef56..02089ec6d 100644 --- a/src/registrar/assets/sass/_theme/_buttons.scss +++ b/src/registrar/assets/sass/_theme/_buttons.scss @@ -7,17 +7,6 @@ a[href$="todo"]::after { content: " [link TBD]"; font-style: italic; } - -a.manage_domain_back { - // Slight vertical and horizontal alignment fixes - position: relative; - top: -2px; - left: -5px; - font-weight: bold; - &:visited { - color: color('primary'); - } -} a.breadcrumb__back { display:flex; diff --git a/src/registrar/assets/sass/_theme/_nav-primary.scss b/src/registrar/assets/sass/_theme/_nav-primary.scss index 754abfa2e..72cf35b42 100644 --- a/src/registrar/assets/sass/_theme/_nav-primary.scss +++ b/src/registrar/assets/sass/_theme/_nav-primary.scss @@ -7,3 +7,14 @@ .usa-logo-group { flex: 1 1 0%; } + +a.manage_domain_back { + // Slight vertical and horizontal alignment fixes + position: relative; + top: -2px; + left: -5px; + font-weight: bold; + &:visited { + color: color('primary'); + } +} From 7bc77ac4f91221db9d757427cad5f3a6580d95d5 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:28:34 -0700 Subject: [PATCH 07/22] Update migration-troubleshooting.md --- docs/developer/migration-troubleshooting.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/docs/developer/migration-troubleshooting.md b/docs/developer/migration-troubleshooting.md index ff451bfdd..64d94c520 100644 --- a/docs/developer/migration-troubleshooting.md +++ b/docs/developer/migration-troubleshooting.md @@ -13,12 +13,6 @@ Some common commands: - ./manage.py showmigrations -- the migration changes should now have a [x] by it -On occasion, you will need to run this set of commands to refresh your environment: -- docker-compose down -- docker-compose build -- docker-compose up - - ## Scenarios ### Scenario 1: Conflicting migrations on local @@ -60,7 +54,6 @@ This has happened when updating user perms (so running a new data migration). So - `cf run-task getgov- --wait --command 'python manage.py migrate registrar 39_penultimate_miration --fake' --name migrate` - `cf run-task getgov- --wait --command 'python manage.py migrate' --name migrate` - ### Scenario 4: All migrations refuse to load due to existing duplicates on sandboxes This typically happens with a DB conflict that prevents 001_initial from loading. For instance, let's say all migrations have ran successfully before, and a zero command is ran to reset everything. This can lead to a catastrophic issue with your postgres database. @@ -83,7 +76,6 @@ Afterwards, go back to your psql instance. Run the following for each problemati Then, run `./manage.py migrate` again and repeat step 7 for each table which returns this error. After these errors are resolved, follow instructions in the other scenarios if applicable. - ### Scenario 5: Permissions group exist, but my users cannot log onto the sandbox This is most likely due to fixtures not running or fixtures running before the data creating migration. Simple run fixtures again (WARNING: This applies to dev sandboxes only. We never want to rerun fixtures on a stable environment) @@ -105,7 +97,6 @@ Example: there are extra columns created on a table by an old migration long sin - `SELECT * FROM {bad_table};` - `alter table registrar_domain drop {bad_column};` - ### Scenario 7: Continual 500 error for the registrar + your requests (login, clicking around, etc) are not showing up in the logstream Example: You are able to log in and access the /admin page, but when you arrive at the registrar you keep getting 500 errors and your log-ins any API calls you make via the UI does not show up in the log stream. And you feel like you’re starting to lose your marbles. From bf3f9e67fc97d371ccdc819ebcd5f6936aa8fdcc Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Mon, 4 Dec 2023 14:43:06 -0800 Subject: [PATCH 08/22] Only have Manage Your Domains show up on Domain Overview page --- src/registrar/templates/base.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index 03eec88ac..aad526f37 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -1,5 +1,7 @@ {# keep this on the first line #} {% load i18n static %} +{% load static url_helpers %} + @@ -148,13 +150,16 @@ {% block logo %} {% endblock %} - + {% url 'domain' pk=domain.id as url %} + {% if request.path == url %} + Manage your domains - + + {% endif %}
From 5811448450bc1a3f67e7e3d30f3b765951865e67 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Tue, 5 Dec 2023 11:09:09 -0500 Subject: [PATCH 09/22] changed endpoint for check availability to pass domain as parameter; wrote unit test for extra dot validation in form --- src/api/views.py | 1 + src/registrar/assets/js/get-gov.js | 3 ++- src/registrar/config/urls.py | 2 +- src/registrar/tests/test_forms.py | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/api/views.py b/src/api/views.py index 85ae021c9..b3094ce5e 100644 --- a/src/api/views.py +++ b/src/api/views.py @@ -82,6 +82,7 @@ def available(request, domain=""): Response is a JSON dictionary with the key "available" and value true or false. """ + domain = request.GET.get('domain', '') DraftDomain = apps.get_model("registrar.DraftDomain") # validate that the given domain could be a domain name and fail early if # not. diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index d069e8dc4..75dd06f28 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -73,6 +73,7 @@ function debounce(handler, cooldown=600) { /** Asyncronously fetches JSON. No error handling. */ function fetchJSON(endpoint, callback, url="/api/v1/") { + console.log("fetchJSON called for endpoint " + endpoint); const xhr = new XMLHttpRequest(); xhr.open('GET', url + endpoint); xhr.send(); @@ -142,7 +143,7 @@ function _checkDomainAvailability(el) { inlineToast(el.parentElement, el.id, ERROR, response.message); } } - fetchJSON(`available/${el.value}`, callback); + fetchJSON(`available/?domain=${el.value}`, callback); } /** Call the API to see if the domain is good. */ diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py index c00d1c589..7eb9c4b10 100644 --- a/src/registrar/config/urls.py +++ b/src/registrar/config/urls.py @@ -72,7 +72,7 @@ urlpatterns = [ path("health/", views.health), path("openid/", include("djangooidc.urls")), path("register/", include((application_urls, APPLICATION_NAMESPACE))), - path("api/v1/available/", available, name="available"), + path("api/v1/available/", available, name="available"), path( "todo", lambda r: always_404(r, "We forgot to include this link, sorry."), diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py index 9548d0b74..2b3923e9a 100644 --- a/src/registrar/tests/test_forms.py +++ b/src/registrar/tests/test_forms.py @@ -74,6 +74,24 @@ class TestFormValidation(MockEppLib): ["Enter the .gov domain you want without any periods."], ) + def test_requested_domain_two_dots_invalid(self): + """don't accept domains that are subdomains""" + form = DotGovDomainForm(data={"requested_domain": "sub.top-level-agency.gov"}) + self.assertEqual( + form.errors["requested_domain"], + ["Enter the .gov domain you want without any periods."], + ) + form = DotGovDomainForm(data={"requested_domain": ".top-level-agency.gov"}) + self.assertEqual( + form.errors["requested_domain"], + ["Enter the .gov domain you want without any periods."], + ) + form = DotGovDomainForm(data={"requested_domain": "..gov"}) + self.assertEqual( + form.errors["requested_domain"], + ["Enter the .gov domain you want without any periods."], + ) + def test_requested_domain_invalid_characters(self): """must be a valid .gov domain name.""" form = DotGovDomainForm(data={"requested_domain": "underscores_forever"}) From 96714c4eb21c65885aa403dd575078688556c864 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Tue, 5 Dec 2023 11:31:34 -0500 Subject: [PATCH 10/22] formatted for linting --- src/api/views.py | 2 +- src/registrar/assets/js/get-gov.js | 1 - src/registrar/tests/test_forms.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/api/views.py b/src/api/views.py index b3094ce5e..8b512e2ab 100644 --- a/src/api/views.py +++ b/src/api/views.py @@ -82,7 +82,7 @@ def available(request, domain=""): Response is a JSON dictionary with the key "available" and value true or false. """ - domain = request.GET.get('domain', '') + domain = request.GET.get("domain", "") DraftDomain = apps.get_model("registrar.DraftDomain") # validate that the given domain could be a domain name and fail early if # not. diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index 75dd06f28..a2a99e104 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -73,7 +73,6 @@ function debounce(handler, cooldown=600) { /** Asyncronously fetches JSON. No error handling. */ function fetchJSON(endpoint, callback, url="/api/v1/") { - console.log("fetchJSON called for endpoint " + endpoint); const xhr = new XMLHttpRequest(); xhr.open('GET', url + endpoint); xhr.send(); diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py index 2b3923e9a..035e1c8c5 100644 --- a/src/registrar/tests/test_forms.py +++ b/src/registrar/tests/test_forms.py @@ -91,7 +91,7 @@ class TestFormValidation(MockEppLib): form.errors["requested_domain"], ["Enter the .gov domain you want without any periods."], ) - + def test_requested_domain_invalid_characters(self): """must be a valid .gov domain name.""" form = DotGovDomainForm(data={"requested_domain": "underscores_forever"}) From 46d3969047e9686f37c8a5705bd1615a7e185857 Mon Sep 17 00:00:00 2001 From: David Kennedy Date: Tue, 5 Dec 2023 15:19:02 -0500 Subject: [PATCH 11/22] fixed tests --- src/api/tests/test_available.py | 2 +- src/registrar/tests/test_url_auth.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/tests/test_available.py b/src/api/tests/test_available.py index 9de152b06..66f7de13f 100644 --- a/src/api/tests/test_available.py +++ b/src/api/tests/test_available.py @@ -15,7 +15,7 @@ from epplibwrapper import ( commands, ) -API_BASE_PATH = "/api/v1/available/" +API_BASE_PATH = "/api/v1/available/?domain=" class AvailableViewTest(MockEppLib): diff --git a/src/registrar/tests/test_url_auth.py b/src/registrar/tests/test_url_auth.py index fe3116147..4678da487 100644 --- a/src/registrar/tests/test_url_auth.py +++ b/src/registrar/tests/test_url_auth.py @@ -110,7 +110,7 @@ class TestURLAuth(TestCase): "/openid/callback", "/openid/callback/login/", "/openid/callback/logout/", - "/api/v1/available/whitehouse.gov", + "/api/v1/available/", ] def assertURLIsProtectedByAuth(self, url): From 39b930baa7507d9d1a632c2b633bec886bdffbb8 Mon Sep 17 00:00:00 2001 From: Neil Martinsen-Burrell Date: Tue, 5 Dec 2023 14:45:14 -0600 Subject: [PATCH 12/22] Switch to allowing non-identity-verified logins --- src/registrar/config/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py index 7f20c8129..192f90f79 100644 --- a/src/registrar/config/settings.py +++ b/src/registrar/config/settings.py @@ -518,7 +518,7 @@ OIDC_PROVIDERS = { "response_type": "code", "scope": ["email", "profile:name", "phone"], "user_info_request": ["email", "first_name", "last_name", "phone"], - "acr_value": "http://idmanagement.gov/ns/assurance/ial/2", + "acr_value": "http://idmanagement.gov/ns/assurance/ial/1", }, "client_registration": { "client_id": "cisa_dotgov_registrar", @@ -535,7 +535,7 @@ OIDC_PROVIDERS = { "response_type": "code", "scope": ["email", "profile:name", "phone"], "user_info_request": ["email", "first_name", "last_name", "phone"], - "acr_value": "http://idmanagement.gov/ns/assurance/ial/2", + "acr_value": "http://idmanagement.gov/ns/assurance/ial/1", }, "client_registration": { "client_id": ("urn:gov:cisa:openidconnect.profiles:sp:sso:cisa:dotgov_registrar"), From 4386218f462630e97290cd422908f6c1bc5d6270 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 14:48:53 -0800 Subject: [PATCH 13/22] Changes per designers request of updating naming to .gov registrar, moving the breadcrumb to the footer and fixing column grid alignment --- src/registrar/templates/base.html | 9 ++------- src/registrar/templates/domain_base.html | 18 +++++++++--------- src/registrar/templates/includes/footer.html | 4 ++++ 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index aad526f37..df22da7ba 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -150,16 +150,11 @@ {% block logo %} {% endblock %} - {% url 'domain' pk=domain.id as url %} - {% if request.path == url %} - - Manage your domains - - {% endif %} + diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html index 530f97e66..9d23e4abd 100644 --- a/src/registrar/templates/domain_base.html +++ b/src/registrar/templates/domain_base.html @@ -5,17 +5,17 @@ {% block content %}
-
- {% if not is_analyst_or_superuser or not analyst_action or analyst_action_location != domain.pk %} -

- Domain name: {{ domain.name }} -

- {% endif %} -
+
+ {% if not is_analyst_or_superuser or not analyst_action or analyst_action_location != domain.pk %} +

+ Domain name: {{ domain.name }} +

+ {% endif %} + {% if domain.domain_info %} {% include 'domain_sidebar.html' %} {% endif %} diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 47d4836f1..74d61c7cb 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -26,6 +26,10 @@ >
+
+ Manage your domains +
+ |
Help
From 71c3baf13fee7db3e0e8e9e539d33def695cf06b Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 15:40:02 -0800 Subject: [PATCH 14/22] Fix tests to the right index --- src/registrar/tests/test_views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py index 6599a2436..840ea278e 100644 --- a/src/registrar/tests/test_views.py +++ b/src/registrar/tests/test_views.py @@ -1071,7 +1071,7 @@ class DomainApplicationTests(TestWithUser, WebTest): home_page = self.app.get("/") self.assertContains(home_page, "city.gov") # click the "Edit" link - detail_page = home_page.click("Manage") + detail_page = home_page.click("Manage", index=0) self.assertContains(detail_page, "Federal: an agency of the U.S. government") @@ -2111,7 +2111,7 @@ class TestApplicationStatus(TestWithUser, WebTest): home_page = self.app.get("/") self.assertContains(home_page, "city.gov") # click the "Manage" link - detail_page = home_page.click("Manage") + detail_page = home_page.click("Manage", index=0) self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city1.gov") self.assertContains(detail_page, "Chief Tester") @@ -2131,7 +2131,7 @@ class TestApplicationStatus(TestWithUser, WebTest): home_page = self.app.get("/") self.assertContains(home_page, "city.gov") # click the "Manage" link - detail_page = home_page.click("Manage") + detail_page = home_page.click("Manage", index=0) self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "Chief Tester") self.assertContains(detail_page, "testy@town.com") @@ -2146,7 +2146,7 @@ class TestApplicationStatus(TestWithUser, WebTest): home_page = self.app.get("/") self.assertContains(home_page, "city.gov") # click the "Manage" link - detail_page = home_page.click("Manage") + detail_page = home_page.click("Manage", index=0) self.assertContains(detail_page, "city.gov") self.assertContains(detail_page, "city1.gov") self.assertContains(detail_page, "Chief Tester") From 2247585f6aa7c9ada2625e8067351fd52d451907 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 15:45:30 -0800 Subject: [PATCH 15/22] Remove prev scss changes --- src/registrar/assets/sass/_theme/_base.scss | 4 ++++ .../assets/sass/_theme/_nav-primary.scss | 20 ------------------- src/registrar/assets/sass/_theme/styles.scss | 1 - 3 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 src/registrar/assets/sass/_theme/_nav-primary.scss diff --git a/src/registrar/assets/sass/_theme/_base.scss b/src/registrar/assets/sass/_theme/_base.scss index b5efc63bd..1d936a255 100644 --- a/src/registrar/assets/sass/_theme/_base.scss +++ b/src/registrar/assets/sass/_theme/_base.scss @@ -38,6 +38,10 @@ body { color: color('primary-darker'); } +.usa-nav__primary { + margin-top:units(1); +} + .section--outlined { background-color: color('white'); border: 1px solid color('base-lighter'); diff --git a/src/registrar/assets/sass/_theme/_nav-primary.scss b/src/registrar/assets/sass/_theme/_nav-primary.scss deleted file mode 100644 index 72cf35b42..000000000 --- a/src/registrar/assets/sass/_theme/_nav-primary.scss +++ /dev/null @@ -1,20 +0,0 @@ -@use "uswds-core" as *; - -.usa-nav__primary { - margin-top: units(1); -} - -.usa-logo-group { - flex: 1 1 0%; -} - -a.manage_domain_back { - // Slight vertical and horizontal alignment fixes - position: relative; - top: -2px; - left: -5px; - font-weight: bold; - &:visited { - color: color('primary'); - } -} diff --git a/src/registrar/assets/sass/_theme/styles.scss b/src/registrar/assets/sass/_theme/styles.scss index 32681f379..8a2e1d2d3 100644 --- a/src/registrar/assets/sass/_theme/styles.scss +++ b/src/registrar/assets/sass/_theme/styles.scss @@ -9,7 +9,6 @@ /*-------------------------------------------------- --- Custom Styles ---------------------------------*/ @forward "base"; -@forward "nav-primary"; @forward "typography"; @forward "buttons"; @forward "forms"; From eea806e64aec4e529dee595bec46f2efd2f08e02 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 16:36:51 -0800 Subject: [PATCH 16/22] Manage your domains will not open in a new tab --- src/registrar/templates/includes/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/templates/includes/footer.html b/src/registrar/templates/includes/footer.html index 74d61c7cb..303c0ef74 100644 --- a/src/registrar/templates/includes/footer.html +++ b/src/registrar/templates/includes/footer.html @@ -27,7 +27,7 @@
- Manage your domains + Manage your domains
|
From e4c4dc76144c340b09e44ed07735de4145038164 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Tue, 5 Dec 2023 17:37:16 -0800 Subject: [PATCH 17/22] Remove extraneous if statement and logo group css --- src/registrar/templates/base.html | 3 --- src/registrar/templates/domain_base.html | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html index df22da7ba..b4aeba704 100644 --- a/src/registrar/templates/base.html +++ b/src/registrar/templates/base.html @@ -146,7 +146,6 @@
-
{% block logo %} {% endblock %} - -
{% block usa_nav %} diff --git a/src/registrar/templates/domain_base.html b/src/registrar/templates/domain_base.html index 9d23e4abd..90c730028 100644 --- a/src/registrar/templates/domain_base.html +++ b/src/registrar/templates/domain_base.html @@ -8,14 +8,12 @@
- {% if not is_analyst_or_superuser or not analyst_action or analyst_action_location != domain.pk %}

Domain name: {{ domain.name }}

- {% endif %} - + {% if domain.domain_info %} {% include 'domain_sidebar.html' %} {% endif %} From b2e2bc364a3abd23f410662d594b808bd44fde42 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Wed, 6 Dec 2023 09:54:12 -0800 Subject: [PATCH 18/22] Address comments --- docs/developer/migration-troubleshooting.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developer/migration-troubleshooting.md b/docs/developer/migration-troubleshooting.md index 64d94c520..25187ef13 100644 --- a/docs/developer/migration-troubleshooting.md +++ b/docs/developer/migration-troubleshooting.md @@ -9,7 +9,7 @@ Some common commands: - ./manage.py showmigrations -- shows the current migrations that are finished, all should have [x] - ./manage.py makemigrations -- makes the migration - ./manage.py showmigrations -- now you should see the new/updated migration with a [ ] -- ./manage.py migrate [folder name here, ie registrar] +- ./manage.py migrate [folder name here, ie registrar] -- applies those changes to db for specific folder - ./manage.py showmigrations -- the migration changes should now have a [x] by it @@ -110,7 +110,7 @@ Test out the sandbox from there and it should be working! **Debug connectivity** -dig getgov-rh.app.cloud.gov (domain information groper, gets DNS nameserver information) +dig https://getgov-.app.cloud.gov (domain information groper, gets DNS nameserver information) curl -v https://getgov-.app.cloud.gov/ --resolve 'getgov-.app.cloud.gov:' (this gets you access to ping to it) You should be able to play around with your sandbox and see from the curl command above that it’s being pinged. This command is basically log stream, but gives you full access to make sure you can ping the sandbox manually https://cisa-corp.slack.com/archives/C05BGB4L5NF/p1697810600723069 From 2caeb512a0ec2bde7cc2bcfb6e78b1476d7bcba7 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:42:00 -0700 Subject: [PATCH 19/22] Fix migration conflict --- ... => 0054_alter_domainapplication_federal_agency_and_more.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/registrar/migrations/{0048_alter_domainapplication_federal_agency_and_more.py => 0054_alter_domainapplication_federal_agency_and_more.py} (99%) diff --git a/src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py b/src/registrar/migrations/0054_alter_domainapplication_federal_agency_and_more.py similarity index 99% rename from src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py rename to src/registrar/migrations/0054_alter_domainapplication_federal_agency_and_more.py index e00d67cb5..d16c9befd 100644 --- a/src/registrar/migrations/0048_alter_domainapplication_federal_agency_and_more.py +++ b/src/registrar/migrations/0054_alter_domainapplication_federal_agency_and_more.py @@ -5,7 +5,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ("registrar", "0047_transitiondomain_address_line_transitiondomain_city_and_more"), + ("registrar", "0053_create_groups_v05"), ] operations = [ From 128c601145f28fe74959b0346b2e3f6a5bed5154 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 6 Dec 2023 15:11:40 -0700 Subject: [PATCH 20/22] Add domaininformation to audit log --- src/registrar/models/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/registrar/models/__init__.py b/src/registrar/models/__init__.py index 1d28c9e89..1203c7878 100644 --- a/src/registrar/models/__init__.py +++ b/src/registrar/models/__init__.py @@ -38,6 +38,7 @@ auditlog.register(DomainApplication) auditlog.register(Domain) auditlog.register(DraftDomain) auditlog.register(DomainInvitation) +auditlog.register(DomainInformation) auditlog.register(HostIP) auditlog.register(Host) auditlog.register(Nameserver) From bc559fe18e78a90a787de6a65267ea89976eb6b1 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 7 Dec 2023 08:36:02 -0700 Subject: [PATCH 21/22] Add docs --- docs/developer/generating-emails-guide.md | 86 +++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 docs/developer/generating-emails-guide.md diff --git a/docs/developer/generating-emails-guide.md b/docs/developer/generating-emails-guide.md new file mode 100644 index 000000000..4f638c42b --- /dev/null +++ b/docs/developer/generating-emails-guide.md @@ -0,0 +1,86 @@ +**Below is a step by step guide for generating emails (of each type) in our application. These instructions are UI facing, with the assumption that the user has analyst (or above) permissions.** + +## Domain Invitation +- Starting Location: Home page +- Workflow: (Domains Table) Manage domain +- Workflow Step: Click "Manage" => Click "Domain managers" => Click "Add a domain manager" => (enter email) => Click "Add user" +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_invitation.txt) + +### Domain Invitation Subject +- Notes: Subject line of the "Domain Invitation" email +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_invitation_subject.txt) + +## Domain Request Withdrawn +- Starting Location: Home page +- Workflow: (Domain requests Table) Manage domain +- Workflow Step: Click "Manage" => Click "Withdraw request" => (confirmation prompt) => Click "Withdraw request" (inside prompt) +- Notes: You can also do this through Django Admin by switching a domain of status "submitted" to "withdrawn", but you need to be the submitter (email listed on Your Contact Information). +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_request_withdrawn.txt) + +### Domain Request Withdrawn Subject +- Notes: Subject line of the "Domain Request Withdrawn" email +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_request_withdrawn_subject.txt) + +## Status Change Action Needed +- Starting Location: Django Admin +- Workflow: Analyst Admin +- Workflow Step: Click "Domain applications" -> Click an application with a status of "in review" or "rejected" -> Click status dropdown -> (select "action needed") -> click "Save" +- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create an application, set the status to either "in review" or "rejected" (and click save), then set the status to "action needed". This will send you an email. +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_action_needed.txt) + +### Status Change Action Needed Subject +- Notes: Subject line of the "Status Change Action Needed" email +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_action_needed_subject.txt) + +## Status Change in Review +- Starting Location: Django Admin +- Workflow: Analyst Admin +- Workflow Step: Click "Domain applications" -> Click an application with a status of "submitted" -> Click status dropdown -> (select "In review") -> click "Save" +- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create an application, then set the status to "In review". This will send you an email. +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_approved.txt) + +### Status Change in Review Subject +- Notes: This is the subject line of the "Status Change In Review" email +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_in_review_subject.txt) + +## Status Change Approved +- Starting Location: Django Admin +- Workflow: Analyst Admin +- Workflow Step: Click "Domain applications" -> Click an application in a status of "submitted", "In review", "rejected", or "ineligible" -> Click status dropdown -> (select "approved") -> click "Save" +- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create an application, then set the status to "approved". This will send you an email. +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_approved.txt) + +### Status Change Approved Subject +- Notes: This is the subject line of the "Status Change Approved" email +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_approved_subject.txt) + +## Status Change Rejected +- Starting Location: Django Admin +- Workflow: Analyst Admin +- Workflow Step: Click "Domain applications" -> Click an application in a status of "In review", or "approved" -> Click status dropdown -> (select "rejected") -> click "Save" +- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create an application, then set the status to "in review" (and click save). Then, go back to the same application and set the status to "rejected". This will send you an email. +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_rejected.txt) + +### Status Change Rejected Subject +- Notes: Subject line of the "Status Change Rejected" email +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_rejected_subject.txt) + +## Submission Confirmation +- Starting Location: Home Page +- Workflow: Start domain request +- Workflow Step: Click "Start a new domain request" -> (fill out the form) -> On the last step ("Review and submit yourdomain request "), click "Submit your domain request" +- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information) +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/submission_confirmation.txt) + +### Submission Confirmation Subject +- Notes: This is the subject line of the "Submission Confirmation Subject" email +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/submission_confirmation_subject.txt) + +## Transition Domain Invitation +- Notes: This email is generated during the migration process, meaning that there is no using-facing method to receive this email. This email will be sent out when the following conditions are true: a) The domain exists in the data that Verisign sent us, b) the transition domain script ran successfully, and c) invitations are sent out +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/transition_domain_invitation.txt) + +### Transition Domain Invitation Subject +- Notes: This is the subject line of the "Transition Domain Invitation" email +- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/transition_domain_invitation_subject.txt) + From d7ff26fe0d1718771b060ddb8fb267a383aaca4e Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Thu, 7 Dec 2023 08:39:49 -0700 Subject: [PATCH 22/22] Update generating-emails-guide.md --- docs/developer/generating-emails-guide.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/developer/generating-emails-guide.md b/docs/developer/generating-emails-guide.md index 4f638c42b..383fc31ac 100644 --- a/docs/developer/generating-emails-guide.md +++ b/docs/developer/generating-emails-guide.md @@ -3,7 +3,7 @@ ## Domain Invitation - Starting Location: Home page - Workflow: (Domains Table) Manage domain -- Workflow Step: Click "Manage" => Click "Domain managers" => Click "Add a domain manager" => (enter email) => Click "Add user" +- Workflow Step: Click "Manage" -> Click "Domain managers" -> Click "Add a domain manager" -> (enter email) -> Click "Add user" - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_invitation.txt) ### Domain Invitation Subject @@ -13,7 +13,7 @@ ## Domain Request Withdrawn - Starting Location: Home page - Workflow: (Domain requests Table) Manage domain -- Workflow Step: Click "Manage" => Click "Withdraw request" => (confirmation prompt) => Click "Withdraw request" (inside prompt) +- Workflow Step: Click "Manage" -> Click "Withdraw request" -> (confirmation prompt) -> Click "Withdraw request" (inside prompt) - Notes: You can also do this through Django Admin by switching a domain of status "submitted" to "withdrawn", but you need to be the submitter (email listed on Your Contact Information). - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_request_withdrawn.txt) @@ -68,7 +68,7 @@ ## Submission Confirmation - Starting Location: Home Page - Workflow: Start domain request -- Workflow Step: Click "Start a new domain request" -> (fill out the form) -> On the last step ("Review and submit yourdomain request "), click "Submit your domain request" +- Workflow Step: Click "Start a new domain request" -> (fill out the form) -> On the last step ("Review and submit your domain request "), click "Submit your domain request" - Notes: Note that this will send an email to the submitter (email listed on Your Contact Information) - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/submission_confirmation.txt)