diff --git a/.circleci/config.yml b/.circleci/config.yml index 34bbeee72d..c081a9583f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -420,10 +420,10 @@ parameters: type: string dev_git_branch: # change to feature branch to test deployment description: "Name of github branch that will deploy to dev" - default: "mb/TTAHUB-2857/update-goal-status-logic" + default: "mb/TTAHUB-2660/activity-report-updates-for-reduced-objectives" type: string sandbox_git_branch: # change to feature branch to test deployment - default: "mb/TTAHUB-2609/move-components" + default: "mb/TTAHUB-2530/update-RTR-objective-form" type: string prod_new_relic_app_id: default: "877570491" diff --git a/.gitignore b/.gitignore index 95ebf66dde..82fa02f30c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,8 @@ playwright tests/**/report/*.html tests/api/report tests/e2e/report +tests/e2e/test-results +tests/api/test-results # Ignore /doc => /docs symbolic link created for adr-tools /doc diff --git a/docs/logical_data_model.encoded b/docs/logical_data_model.encoded index f6ff55bdef..16e5d5af0c 100644 --- a/docs/logical_data_model.encoded +++ b/docs/logical_data_model.encoded @@ -1 +1 @@ -xLrjR-GsalwkNo5uFoGxw5biaii1P-mTrkFnP0Stup5iJnQR831eYUvcHY9xISeJ9vV_VY2f5vAY959IUrx2JtPJL5NfOP4iLf75lpCEAA_A8adJBr9mJr2UxYcvBM39qlU8xrA0jmNCquoIzoozWv0dQShU8Rm759HfWJ3a3tkO4iftn7YK5O2nzBSaJTFq6Q4vfAUa83JzqpVV_EV9V_rLAx_UeUmTXeobNoTf-hiKvLIy3LcIrdHECexk4N-uX1dQ8uWv-or9dwGeJuzJX3dSGfeUft_RGWmfu33_doJTKe3vIxF2vTcBiykpyzEpg_JeE_6S7Vq5vKbA-0xICymHVnXvuqrR2y7wnISfQ2NR4ph6xyIesBwVKIW4Fk7fSSfH2Ha7vLvXBtwcln8Cq-CKa_TV_bdKh_QvV_tVayJ6Jp0_sUyfkOTq6iJbtrSnI4VUUiiWVHmiqXmMSAfsacB2nJiS_iAJb770AvOUfn1NvH2QfwGem2sXW9C_5g83UBn01NmC7EvG0KVUacA4uE3x_KFV_Hq1nGi4Y_mIiZt1R0O8WeGt4A9o-u5R0efhMEuBmA4KueAISZyw_hdVE0naAQqngRlMZp-DeNW96QbezgW0qfhdoDkjM8U1I16NJT4CEGecyP_yUJC2rOtn-cz9Ya6fS9VbYUHqHqLXJTAVsj_-x-dJiMOQRidf5YGKRH46nKJB6MsrTEJO1l1QjuspWZ1uLR4znFafmQ8hj9ED_kmI0aPmC_6a4EVFWPoN19CaHKn-6ImUpdB4eVYKMq8A2CGhTw1Wiiubvs0FMY928RgPJRPS-woTwEu1pNQ0Vldrjz_-MTEPvhs1JllczcSe1Jeb5PqpyBK4l1kpVQDhASbxX40jt8US6rkfvqsIQy3qiKsRhOJpH_qrOFa4n_y-Shr9G1_-UI7-S711oJtAOJum3qnHTKm6_LScclgQx57sOTgP2zOZxolHFaW7y9yiVO3eV_hIQPFCudhOHHsWRuGFmP3dgzdpxC0qoAgz0E9QU3gQgh8_jJIrRZKnLSuVvS8Rx1CSquQ7ihFJL_zxsZv-os2Uf23F4KS4W-ASSE4kobHRYsKyThtGZeVkiSz_o9iOwQPRjm2ClrKOFdlmMyw7BFmft2A2HnjUL7YaNlea5Tuc97jQ9yxNYQRXjL-lxcDc_xEQkUrrGFcn9erkK6ILMERcLuO_fz6MRcGG811wIOgkd-UmGFUGFho6V4VodcXvHG5N7vR339MW-FARpLT_Tgbhj_Jjs_EbK1fPvMT6yArG3xojmDR6GhnSm2t8bCgOiZXrNkEAg_8MqZTt5u1obA6zy7zs3PAaUx250Y5OYo5AZ9gs97jAjXIKeirSZsapkFOV_Bk2Z4ibi4PQuOyse67LROcOq1shyUG3pg6990Tq2_a5sOi65mhkO2zD0ES33Xpw9vxS8yehK3olbS6bfUruh_i3XIg5Z_Gw1UzHtt13jiC06JNsfNY7jNLqiQIYJA9HWZsx9YEhE8jW8_yzA53-OXInx-igSqUzUWbjwkmJqG_sO0iuV8DVGoexRRSSvxI21t9MQo2NPOLH9bN-5TdwhYupwxtHnRDPzIDQJ_P4y_XosamuerDa4smwbEjTrCi11zsu7_xjVWwNoKwro3LYk9QUf7insJFEtk2t-u80ftlgi1tYx1vYhiR52rGGJryaWtAY6MdXArL3eznY1k_7jSaMQPOtCYIeUQZkPd_8EL2ssId475BP1pmw8BIep44E6vn7A9WYFaeapPJjt3rnX5hHGc0NgS6syPi4T6j3imY5uUFzuQTlBo_Fpgzlhb--FhkwFdbzuHhRo7ji8kvUgWH0us3RDwRt9BC_h4NCUwhqx4jYEhn2lqBpQzx11qVpD-uS8SE0XfWHwE2-AWQFqFXqPXbOeqR1W2qMCgPzQZi42eJVFGFPkrQ_3BI38y11m_y7Y_8IVD8ijY-xwRn-OfKiZWY7ne1383oaJymDacxpc625MaDU_hIbKU6fEB0pyYiAhr292a0HV_YEachlPtA5wx_5Pk9Lg_Q1t9pmbwoeSfY_l3id_2Gl4NOqykyZO4q3THSQ99-tmbaN5pMu_mEmbrYkpi50hBhd7RJ0afFWwGxWxUhZmK5jGFZ-oXrHUD8vnvf5qrgsOFr8kdOSdYpRvqcAt2sZqGAkASIp8PfNFIUfy46Nvg9hcFRMNegeeMk6QxotQu2gTkwgz-x4vnjXe1t26fRxnkNOk5nhhQzBfLFLYMiN6MrWE32wn6Re4zERtKRXHcl3AjGCc8l79n4gSm8pDSNhy_h4o-tytgldQfhf9Zb44AgjXmXkOpBDucW7s4xlzBMavwPxIYz-JN9qXrPhH1dLgwCk4oqzEjvwR6-VhUpA5NW1ACJykm_kUpgypLnByZq2Ub3FOw7NttNtWfBogWIKins4_9g3Ym9WVV4plkcESlTkXQMRyIJovpAwzmhXT-kUZV1locqdHl1C6-RULVBrFbDQCzy5V5le07Kuczem6ni8bxaB0SOLA5vKE4Tu-vfWlkkHp7BawbbrOxWUTNrYk2sb7a2tHqi-kzh33842CNvM0bHCLN8IGbZ6JEKyC2cHNjdQybF7iAT4wbLp2gM7hqV6Vn5ZFoMvy_rHIrmi5J-8EszgfMsihJyZXvvqPBW76uVz6JIgXc5w84lRp_VWpzuA1FgD_OXTLBS5olI9bEq0XVa_aHoqpDDNBwL__pdWmDTtho82ByO3rI_RIi6W6qxwz3ZzukNpi_FhbozUdZt_ulZuI9hVbjGtwfqZVvHad1tVaIwiOLYx56Q4vgUaKbjrwYeisy4Iz1LR-rWFpvD_W5yXFOboU92SlCSYadp2XV6kRrjAZzE_rYl-338sNC6_aUOs4D-_66qZ2_qr-rqExn16kfz1njiW1hS578Y_t_7z5UGSuQtnZjM5XGRbrGpVYL2Rru2zQr_S0zw7uZL01QJcferR4HNZxarIsinjxvgQ6xbivnOePdwvIS9scZr9VoQtZXrtJyGkDE4SMMoiKSYgWhSRxrYL2MtMHaGTCSmX1ZY3Fh1nYhPRIDjTfcqjlLTQDDlU2JZS4lgWGJvZLujSSki-C_zvuKh1S5SLJYG8HfnGXBVokFXLLPQ08kWzLHjB5TTShIsfZlvofBrpf1O3zmY-Vvcx2NJ2NSfw3PNchQEW2KOk44-3Qh_rzT1x7bm3Z552oZTq2p3wrTxq-ktcFxpjBLWIjJVYIkshxv4n9ZQ46QTLDlu6bID0iprpsWAN23qFMdDs3Ve2oIMLjrruf-fFQqfDk56LzhsZLcKXdARodQfegAruxwYR1KScw9uqAZhGK6lUFmhR4o4frOxpPXgnd7KVWuuJ1gUNjncX54fzV0v1_WfXkDopKIkm1_VMLwIVuroeoVz0JFpsiWMNgtAu2Yhv7aOqyH77uZj3ffRbnw72VigMGmvfYJ0mWbj6VyI0YeCDzvscEU9iAogVthWhsiLzNJkKItBykxoCaaDqZ9aBzqz5arVHmBMLpXua7qtbhZZ0EQ3vunabhERefRIDU9gYrYz_OiRm8-hcPpSi7dGyZ0FXehPvr74ZBaFYCiInObrnbBDNp8SVuzJoeluSRp_KuaNz9-RDKlMkKGa_-4p_x25ODvfwa_8_ni2jjSQA7SVIXSVgDv-FhQD_pzgcJW-hQEa4jupV2U750-AghIhsRTVR2vec-znMJFQ6EyiZfQahgNX6z9rrAgyjvo3RbIPCWQ41rO26ZHYWSVq45WuTDDR1wuvqlSNuuSUw4AV3gku2n4Lms_pK9Rtauri886vwQFrwqRP2kOZapj9V_Mn8szZpJdX_RAUpmxT7MO8jJR8my9s7t5lLVGhyXLznk0yvJu7hTyQQhgxoQPsZw87HFqD1kEiCnSIByln4huxT18-H-SrRf_Hiv-hdzPoj6Xafzs9uSSvyMdROnz-wEYzfuUUpXNL6QjxGHBeVOLx8_kVxxXKDsUruk0z_b9CnVP12PeTv7__P7x-VaPItcLsyCkyEvzhj7TCygCf_XET6U_ncgVEY3_iap9zXdC9LrUT4wN3bmPRpJX2zJhDz34cXPnm1_rZErrvRX-kDyWzmmjQ1QR0-1SrgXz6V3s00-9qxzZinh9ypdfEmV8sklU1Yhr3xzD2jrV6QcTnyzZdeEqGPFwrNU3vrN-8BSLnI7iUPhdrE-9Nmclh9KN-RrpZXAREewYsogEmjiQZiA_3WuV2PEUcxpgrhzqhkPe-akFFMQnTYOwhCiUaNemcR05b6Hhq8L-BvHtpHseKwXNm1AICOmsAfHzAcPzmK0SsiRg5Vs3iDMv_I4mnxAI1LnlLbHwZWtPsQ0oPZFD1vn5iDHYvbbdtUzM1FuHtwnT4txrp5JVTq7-wksyALrU0GkJVcUwIwA9sLVjwDK9iYVlIqlEF9lo2WeIVaH-u7_L13srWs1JfwxK45aLKcZgr-SNmiVeDCvC-_1_G1uQqEmDPpxCHZUMGlLOR-CqeDJ-tGoSnrbx2b-we5ieVjNGlca_e-WMSaVsZF73Rf9Ps5pkGB5KKZUFXx4lpFD9S0uJdxZsZHlYKj39KUJtrJg-qbvC3ClzkK-4KfIrH2frgwhGoHRyvxbHLoBS77i3RtlSR1bpjYNI8HSvPTCE9uc_DLKJXdCzjOwBvVsKK7i1rpo3AAzivUlR9bsK_TVWZ_AEjncPTD_Z1wt6TO7wX5UDjjdlcZO-ATldvEplerqwdFpf7UVJmghp92eSmJ3hBTggESS1LzPTcn11HVs-dVQnlenhRMc92iTx5ISFiY3ayAw9Tlun1xJdnIPZr9IyYOkk-ftO2aiiWtwKgQxKzjifBkmsv4rMR7eKS2ghdfKArazFU08Y3DGJD1ZxSP4BZpvP2Jul3SzxP9fhkoNVFXjpS95dK6c3Vta5AKmxNxIDMnc7YbIKLpg4JKzw2eO7zxXCxQHsFbItrL3CZJ0xeyBxV3LqE4j-JtRQfXjHxuGACT9--WovRZhgM4R_EroSC3y9W6O4TAU7dWUn9tJ5x3HmU6CB5yUqMsQXculgV6xUSgmBOB3QV7wSdbvSc_VlofcLSaU3Uorf58VYG-uQJYEqAb1zcH7gdvIDUTX4wdq8vWUExCSca4gZL9H30Qu7kPbGinZZBM79Ix4JR5JIdkNRiXzJ3MX4P1ePxcWErk2Q2vo8S444PuUwFsXJFjMHFSrjdA0BOiQ7IhkKDkgUzrwLrqY2dpqXrHch5PTEvTMp-SFAzNSHwWT4i-Gdi-X1zENg22G-gtDR0giNCPAxU5ZzwIzCF9gnFxub4FBvSmls-q6hAiB6u0wnNTFlIAEY0dfWXHznV9fggKQiWYFT3JOMWPpHY-lw7a_OsvKY15xYYjbsKt36qTBV7At5bQnpPfX6aKfe4ThX6gFbIMzoL2r8Tex3wfY9SRBuUdFaBbXYf2D0hHyCxvYDO8Md5SzySg3bPXUDcUnGZM25WHfr6SOj_pWYd2Oy6ZB_6ik404o0P87iMC0Da0bMM5KIQTzQ_8DbfC7Y15W7e0nLM90vRdprzvG987V5XkVLX6oXBW_8Q3RS_tB2fB4DjF6_ncTRpb1kLG7a_fRtTKpvrnCtMjouqpk3A1Zxqn9Je2F40QJO0I8ND15W6o08gpl0CKkUyinap60OeXW2c4ubf-19mhLA82KCGVr7M6SSBtmYbYvC987JNP0RoDdSq5K9Tx1HRv1INYBiA8qp1EOral8besMd6Uym0fWkC09u9YWsAbn8_uEF29gFHG6Rw1FIBK8XILPn2QY8g5ok1rxX6U3fu8pI0q4HOBbf0hrVzmo8HSdVw7WsVoFlM8audJm4tW4IOdJ8vhfYDI8qYvxqIEa4r35bLi4g-eLJueEIutYaWD8HN7gY2iuY0r2LH4Q10Xzvsv4IKJfQ4BUIDEBfoYCdc052UwGAXYlvl2AG8q2D30NQaH9ZTC4I8BehXpFn2Y28yDp_3DgH4W7Q08Z0NCrBsd4IKBfNYWSGoVk0TW39quF4yXD70jQ4J9YLBK9r-aOb8UBvWYGeC8HGKQWoSYOoFZlj0mWYF0SLwW6A6Hq0pUdXZnqV29UcFX4dE43oEpZGED2vQuTd03uxWaC2BJ81D1iK2nhnsCg4XKfYuoZ32vOPguwp32veOjGcH3D79fOaH88TI_Sp4Y8v29reyB5SSTYn6O1fZXAneZHXP64Hi7DiCNGqQC6emYA1Oe_LiE8ou25_TbXn4RXOrzVUCV6fVaY_I4CP8XEVQo94daEZqz-keeVVhqnp_T5Y1xjzaN0E4Dtw7i7OQC_VVNFprzAgjeYJ-4NEslJNg72fYeC-U-nEniL-bnkXL56_MdUv8a8nSQMjp4pQamjzZzbgP7-2ZjtPAH7eixEysoJGe6cIME-ye2-4zTf9SUMxn5bOsZp7njTQbQLx6tGEqRoT2zFxC5ihVYzMHgAso67jHl7b2sfaU4IYRVEw1SmoqvBTjZjAbQUSuGJhreIJPFe2QErfD2PzvKMeMZSNUjYstpR3LkveWvzg6zsgl9uEuZcvHsJrVZfSR0gU-KjLRZgVMBASPTrTMu3_Tqc_bGlmxXtMwlJuzJjeSP0WLYl2qLZLht6AtC52FfNSaqSoPNxnxNLvlRJpQo_0KbPU-THHBqBWaGrejLjZ6i2y5X6SjUdaTfCLc5ApDrdnT8Z-khOAm7JkRMdKb1pUoub4eQRMRvfbUYXfF6P5ZHziZaVvEcHZZdZaMdi8fLezZYrmp2ZeyWLj6c_goaTs5A01_d9JvYJIFAD-gF_NXLXevZTSFi7PKN2UC8KOcnKIzbjHJE9LVuF7edrrtwxBcCRi-OrHbO5ciefw6Eh5YuEsyeZvxyn2YebwYpgHed5NJgneEPN0R2vvq6hKlS6NGMp5pbpThUSHj5u7pfklIZdZQjHnjN8Kk6BZDOTms-bqGRpU-MsIjmd-3duXHAtYcX0hbvjAbPhiEeVwYWnsuxMdqLANJxTvXvP_ikuTdmO2RnPBddfQ6yIGaLxaLG37bSf8qD64DR37C7eM1XXgPl9OvxzWxbCMGqRtgcyppQlQwbY9iTAvIehLbAM5EJLXm9dKFVVBXxGxQOT5kz6XnbWzdeT_2qNyBqqbbqvVW8ACIrwp7ReIAVXuQnFczdxxeF1rFhxxSHywSeUOFXHlrt_Puewh983XNlIT9pU_ip7Kg6AnOD0u_wplHL-9ivh0p-vgC1_ejTTNMamE6X2wO_EF8f5WD3NoWNY-fs9XNrmh48-gZ_Qu3da6elHMZy20ifscTPb6rZ52sbpJgQcfoXjkYW8sNJzwUmcVHDP3Swm8aUHlCdQrrAO0NWaFcqvX5EtwIzqNYmnCfL7Z9oM6yUfvoYxHPIc3zxs7G_4e-qmxC6B3lTip5azTA5RleFspSVHyGsQR1BKAjACz7AuTMTL7U9GAqcttK47G3Lkhq-_z4s2s-jnVAqUQq6T4WztEXm7K0A9_SfhYkfQAiHRAp732d4IaACTH2_dh6I84CjuMIjfqXTfGcs7K6VDbZCFy3oArrS4sU2pxMDu8xqPj0qNb6IqP7ABSl8GBLKciacicKnNrXT4fS8REEKAXd9RBf00kTOOJuQwAzhIZ60WvElaMDohTbgTBXkAwugXNkoR4ejsAsiVwl7Wh1HwXSKcY-JdmpuW3oxiFYvnRM9CLhraowm7xuPG7UKuRfiq_xNESmS3kCLFS-zkCoa-tcHFFxneSr0o6Xb_deh-CYmKhiCP63o5ABUphME1BP_hySjMNCBcy6jyzjFRs4RyU1h-uDcYJgzQMFZth-nd5zlYy6cjzjW8OzU1zjOaTw5z9qTIEFXw33pEaglW-YgQdM8sHr1ESyrRPGUT5t1zCH5Ixsof2NsuFJDpcLczZQTITVHavxxSP7difaXBteUJ3MZskL9ww5Sms6wwNbE4mte-Hil17xjthp-pWisZyj0e4bZv0mqpUFLB7nrwcgLEukUCv3JqaxgR3Apvmb5JT2m9m8sWxOPjUuewnREBBeTg3N11j5GIawRhA5A-iPNE0SjcPX6Uj-Lpg3P6EUL-Bj9TwI4YaZIpGPhdQYWzV_ZvoYMytLEQ4FC7Rl-bqlWmtWPls5ijulH7DfTOlBecz5pUBcMK1sV_X9g3ey9VI3hQC3eUiJ1pO4VAU3IKrsKg7s5rfDWsbrkg9OeROk2gRKP1UgHfZvl9YWcAgtGx66GYTVDKT2r8tLvKBpUZpWK5b_6T78RP7EYGTyLkJhFmTsHJXcSjPDQQTOx8CN5FrF7eOAv3g_QQtv3A_K5d0OvpAHizD6QgDP9zKmCWNtLJd8XTK0MRMJ_jPydoenOuqYO8D_iG6tB5zAtdG4w3zC9i8oFF89KyPqu3b80nj_kSt78MiJvQMtvXZ9mBMCQ5lqrJ2XrF-UnWil7PHpAtxKjKd7hRukSGzlUdDVHDfw4qtRjewc9zxVHX58VQmMy0kg3JZB5Oi0_5ih5dAOLQNsM3gNNPR4IXv4eLAUkM5iQJD0sIZQTQJABbcFGxCWk7Z5TkMDQ3lVMWwH96BBmPE5zJQP_kcqMY_QL9ZZpVKk_SJer9HEP3_1H-hl6at3kuDdCaOq9oypF64WVu4_QOTypdvEskc_Jcvjz48_r3YYjmaO_dtGW5bwuhSlIj99OoAdaPSWj8MWTkB1zQ0i86pjeLYKz48hw9-8xKZN7DypoNk6gyXXkTzs3ZjPbvANKpeFNS_KXypdL7Q0JjUjQsY-hanyCKQxBnl1cNkyegRQxdesvCH_tx3NpkTjOSWW-m6wavlG1zb4XN0VCvuvMXLWzj2UirsXM5V1q72oUg-_s-cCXSNiCrCYt9t33SHZTZr4VA5r0tePv7hdH4zkizU_8qVbg-62igEbq0RaFpCvjT-P_5dOkYu53eSkQtunCpIKzCA_qYQz4D9oO5K4oZ_VCdt_gE5omzjZYA9tfxIkRImyFRnjR2dyJx73l1bfAdVXj_vflKeynM5F-cMI7vPr9q58CZLmRXVKVaLKCf8vcoDN3LWLqIR7iAwaU_PdxROf84wYPIqLzMvBy7UAyAela_m40 \ No newline at end of file +xLt_RzqsalzTVuNW_Q5jyBBOjjS3pjWxhEFOQN29OzXE5zkYC6Y9rcCZYMz9ogdRw_z-8Aal94L9fAHdEob_iXz5pOm-79B36NBu3ye0OLMHHt7yHGpkC4hZ7S4tEIne_16nRGpAB8Tfd13yaSQt4B8eZka7LEu00KMSenAo-nsCCM5Rh3rASa1f_7iKnt7y0fCKacESOnB_vTjl__Fel_wcb5zjKVAXX9J6tqHn_8SGvPY_3MaKrtIE4eRk4Bk_W0dQ8LWo-diKFujH6X_6g6GmWoG-ZF-UmH8Im63wFr6S4L2ortg5YvFJaukJi-EJo_ZW5NzE3_wAqYZ6R0l9ISaGknzvurrR2y7wnMSnQ2NROJB6xqYhsBwV4CW5FcBnOSnG0Ia3nKvYpt_6l-4IneTnYJz--HMlN-rIz_f_H9697sT-jDiHV0V9D8ZBlw-Ya8oyzPv2yZ1On2dCuLJjA2unu-ym-2kBOie0gsXy6CEoAeRGFCPv3cum0Gp_kH0TmECKvV0XSBX5EHnvIuZXWuFhzmzzzoiCybC4y_G2qXqkwGmGE0bd87ZbzWCp3F8hMEnomA0GufpWOZSw_jdVs0zaCQangRlMJp-FeNW1AQv8yg00afhdoDkjMFk1I18NJT4CEH8c_f_uUJq2rRNs-kzHN892uYxA8y7fbl32cgGxjR__t_FdOyqqt9BJBOW9ob09yecMqzfgwSYHUV1QjusJ75DuMT4TBDDZNFAkq4uswhCB22WkcuadXcNw4eXvYJE9OaJ5by7y_YH53F9FkS4uXu2_SWjoAkfSC0Pse2N25QARsKJBjS_QYUuEa6GBo9VVVFVTLuhEDEyDTDftDxz08T0nhiYSWQybuDoOxHjTImdU8mHguHvpRcobdZT9hW7JKvisMmddZ_fhmF89Zlzzv7gJW3hyivp_OU2Su3kKmdHW7fYYQfaC-gzCDFKLtg7aSTgPSTOZxqlH7gK3k4-MBa3qFttfj8bdSTtleWwGTzo7eCdpzUnvjlt2Oodqzv30RcuTd2PfjUD0NN5FI4DAzBUMfzBj9gRI-QEWVuD-WcFUy51tSlpcVu_Rn-yfJACOf2bY29SWFyECkvCIgGjycL_QNcZ7I_lOw3uaJeo4qwsR0yhUImnVtBijztqS0mHc29UZ3SyhF50lVXPpRnGIFR4Jvvj8qV3QxrVtCRt_6StSzZeW_LoJHZd8auelWzDBpT_JQ4itSd0GCBd0UTVFKvYZEqZktqAsnMbFjBGYWCaFIs622f1_-UtcwwziwjejZVlsVi6LHbJvXUBoXgj7cLKWCx7WB-Sm0ubK6LqMgyuhNCkgk87atUqv80mbQCVzers3HF4EP90Z16inU8bMqvHaHt16GC7RpFQOD8Dl_y6_AqYPK09ZfEN-QWqQMjqKY7BTCHfFF60CwaWoG3B8pl6EDpXNS0jxOI9O7p1WqJ_-v0uHLe7yPQqCDYrjntlLNyXLoN-aLoauZ_gQcx8T1l3eOa28jrzRI1LBACea6WNOqIiyiiep23Rotu4SfQUZYFrGLvaxwjLBR5rdd_5-i0CPOF1T-HQI36hBTKOgk2TdjW9oKLGbIeJAly6Pw-epCTuRNLphLP_GUhCdciENasR26PqYcs3Klbppl5uA6EZ6VVzlTtF8J7QgHQuJpVNqBDxnoPuo-gvylyiniBglzjiXJkvWoUIuU8voxEYhf51CD2CjV2bhA9HRpE3Tk3QP8itoLle4FVVLtSmFEGFIDZk69OD4z0673WWDAdEGApNE8nHq4HyaqgRBTcQVE7ojQ2wmZTHWsxXD0ggreLY4tF1n_l3ZznSN9sTNrrUltvvSNXszFRUDRVXZgIDkNwfuG6DXspUcTpWnFwn5p7cgTEnBV3gyHBz1_Mi-m7jBypVk7Yx3W8Re4Mhllie73z_uTM8OMAD6mO0jvZEcVMex279KVdW1aW-jVcbeUqU8lOR_Hui2u_AeMMnVg1upySGeMHmnzeqH-q2uJv-O7IJLvj71yhM6dFnfIwF6Kt5YQsIO5rwY0kM087R_Yk1gvsPo-Uk_mMRYLQFsdjoSyDSahrAOlhuzm-meBL1fQUG_Hi2Q1khMDuW-RuMpBYvoSFyUqDUbM9s3WLXsppjeW2KcmUCjABFLnuEzse3muwKzel2iSuurYwQrRC7waN3jM3nPfiyJvwbTHgq5R5E8OqCqhpfEKlw3Babvrz3jhPqGKK5N3zSuR-S0LUtSbU_Tyi_Nma1RL2fOxXgNO-DohRM-BXLELIkkNUIqWM7Fw6AJeKlCRtOR-Hkj3IjVCs0k7fz4gCmApDGKhyxh4o-tytkldgrfffja7q6ejXx2PHkJQHP7Mq2tQgUl9JtJtLDgyLkSebkqMYEAg5uTTPbewT7nrc7x-snbbwx0Sq1WoLuzkkzf_pPpBSaF2AX1FOU5NdzNtYd1nMK12ADR2DaL0-SvADN5p_YcFCBikncMRjOJo9-9wDuRL7vOz-o4UrDcdHZUCwsVUrVAr_jCOSsyylWstm5gVpQrPZOs42vp5uAoh41-MfKfAhEtk6JR7iaaHRQULJU6xL7N9uRRKkW1j7kqnBFB7KmGo15b9mL0-LGbAo5KYfYfc0Sc9L8h6rk2wXZsb4YzQbQXrF3roFZFO-p7EBM-Fsg9ywNYexZpfbRQsjhwCtBe2KU6VR2ns9zUeweVfdkojDry3-xiZK2WszYFw7brawD4suct1GIc_qHYqD9FPxqM_lsNW05NtxsC29oE1wfVjvMyGTUSzF5X_CNhboTdLwzFNv-y_EBmy42OtuRKr_AT0tUKH9ozlCLTM4EpTWbCC4cFSIMtwjHLQBA51UWhjlAn3fudzm2_H7eIPVyWEVvOyaZo4UF6kxfjAJwC_rQl-1D8wN05zqQQsq1iTphQHWRwQ_Qx5DwY4gb-1X5lWoMuoU50_FsMxIuXOwZCj7UCBimrAArc-4wushm5z4FxuWwmFXHl0SeXqJTjtF2e6BDlab9cRdFNrDp8PJktG3xpYqqIfjFiMVmBlh7ik7l6Tw5nvyXYOur0MkMitNX7guHhip8YgeYL39QWJA0BR8oWB8EatMNQrb9xfK6pxPs0mGoJUmNo6RjQn99RzPcvpmkN4eRRAhSYWKl4C45b9ewJNrP50GY2pbErjbInpTNAakhWhmVAEmToCN27uCVNgPr09zo5gDTGQTuwy9fWn0BnsAlsUrSFlUF1Da0fmRXuHp9Gej_CJQ_VRVx3sTw21PPx8oxblleU6MrYGoLbf4h6to1Y16YsPqvRu0AXbrvhpgv1Jv5OKZdRXRUo_hIcr8GRLMdVEsXL5i9fAgzaHKrj-Ni7tImuCa7tf97HWOPQy_w1tvu8GQbsd3VJYE6iUmewZYcSNjucc10ezF4b1EaRLCBbderQWHsujxuYzPpdGat-7b7-syaMNAxA_YeevRiVqSG778jlDPbQbaz3XTsKBOKCaWALG0jkQVsn18GVRBZhDCqIPrjH-TJ6NT4kxklQlboIuz_bP9JiesFCNBX_AfgyYWQkhNJc8FbWAdV9G9a2aZwSKK9hZavAsuYdA6hzyYTc33-WRdvsm-9UnyCm42vgcmSTDy8o92n3B2lM5KSvSyMy_p5EBY_gpt7sGorUr7zYtYnPxmeLyD5d-XVtthhHr9kK_o46RgKrLkmuXYuyLB_vV6mTzNlMDdLwM0LBnxjbt4u8BnuGLsrLlc-xtbxGDDddjc8oDzmP7Yb5NN754gpkh9DvRna3oRRGOV8C3SW6r6n43uth9x2mwA2s3bvtfEijnlS_rlau7LPr5o36Wzlwfoxf9Kzl8O2Oxg5rwqLPXL8UoPsbl-hPaBQnvvtmVcgdi_stHnc2BKsoCF2T-znRrNqA_9LTChZpEKzHrk-CDLrTvTCwHz43et-60ZFR6Og95yNvYLuTimaU8lERiqwfsT3bpwivMpKINEpuy6AT-PJiiG-_TNLUKiFFPmlhZDIzlebsds3UoFxdk-uLzTdjkByFVv2JCNsGV6Q7UH__sH-_dv6qjvbTd3Bp3kVYxHtJtAlAFy5pepr-izHvqOTz4kRFC4x-gkfoedIuyc3BEIUGNgVPdaBIw1b7m9_A-Tehut2zLlu89smjc7hhazUijX_zUGG3mEtSiTk9OVMSyPo4vcjqxGKNV_dQf_jkhOxNpEJdiyz1to92sN6zmdEf-xeyvySbnN6SwTfdc5rohwcR7FMtEOqJZZBpgiuYyyhE4lFAhW8F7WwVcPE-wzogTg_aRdP8YZjllNREDwQA79jkCHg_2P0cUDIBSCcVF-6BsCxbAUHpI2WkIvWlzKYQzBIR9A2UrStt2tkdOUjJUfnXBmMapBY-x0WLlBsLSy1aZ0TQZtZBmSYcpABFsnxi2Bn5lrhwvgsjkEcUziFTTLlOiXhi8_V6V8zK5wKpqi_R4MfJn8-UbhSy-HS4nFU4_CZzeOyrj8rbKo2ZrnvK41bb_DZg5uU7_3T8UFxyEq3kKPcf06IEOsSvbaVsGcReFo54yzGEdSnSTmbRsAzQm3lOthMWFwdl4tY1q_lsp66JNj9QQ4s-K14qWeUx9y7zJ7C1K3bd_n79sxU4XI7JuyblQhMzW0pe-NUR4hSePO4AQ5LBkvN1yyqvhx9yhYLu2cjprsiSNBaZsYKIqMVP1IEEipbVvRbrDZEDXUxxfLsq1zinXJGXQ6VjrIjRbltKxVlmZz8UbtdPvFUZnts6zO5QL6RTvfa_EoREwUldvAnVCvtwx1pftSUZuZB118eyuI3PhZhASLVHruOTYq7-ZPd-lRQ1harhZNB9UXShURSlOl0eXsxvDlQnvyGbPTQpk82KolkUsWr8CejyawwasVxK9YlfFkoQLsrs73eae9gR3jL8Hdy720B27DGJz3YR0PuxN_OvAGxFVU-RPBehspMFlxs9iwWpmBoxWuIW5AxTHwgEnSGhJIgQVIMYlWDv1VlR8rJMBXehNkgheaUU7j3bURaPlXh2loL_Q5CDo_N08urs37-0DbkEsPOIhitN9W_tm6CQW2qkuCMUxqdSKd4D7naOmlZoxGtEv39mVK-DtS-LWwmB3SU7yT75nT6_VlgvcLS4UDUYrW5FViG_uQXYMqo41zcI7gdvIDkTX5Qdq1QNyCoQvL8BL2kIy60qAEz4LYv46KfeSr3kcjiKrmM_T-qQryDO4ne5kNoQ0hgzmO2aF1yIG2KgiskvBvmgpvhWjifM1B15GQDRpHroItslI--YGrIQb_Q8qepDedFlslhnw6MzYdC0fLloOTBp8VnuT8fo1edRri2gAAtBMB4jVFIMf1-FtXoP5uywUBcu-Nsjr11bHNuDQA_evhvNr04vCKNmkhyADbKbLKCKgO6U3aF3Q2xXnsk2FrxhAmMSfvRIUbbsJL5cQOat-ixIEhP90aoZC0tiS0rGzQ4ol2y1eZv4O_T91RpiU5ayzG4gErG1eb68XdVE1xH6q0hZkZjMOR3omylqB0QmHi0AE8tY5FgU4qm17WCUTObdn0K2G2P0uYXc0CW4g2Yg4YN2MVy6Py5YSW0f0DG3AAnABB2yVFd60PBKuyDIuyCIN1IWJAyPo7g-PrvPWDX-sk0to-CjroY5udXAVxkZV6wDcybhNQwjmPK9VCoDAS4Hu03IQ0AK09aDiW2G0L2OvIsWY7rd8MOo3b080KmX5DRo8-1SeWBbW21sBwyp31E-4qu18nj6ygZ95fHPw6msWBhSAp1FpmdcTn46d8Pn6ijw4T0oqGhpd0D80HmBE04K4nGZ9Nx0nu9FGAM7ol0Dx06X5g6WF8FG15GCL0QlSm_mTF04Q0QX2R0OiFXSgVwdGyRdwlG_7JoJzwa7d7IS1cu23p1POR9SCnsG6a7AVYToW6mQig1YatW5hN91oNAvKK1g2AamLdbX5GQfIQ02GeC8sU_C3IZfA0rTo1jmik4KbCa1f33HUK8L-jqKJW6WGO06xaeDCDbX2X0P48MT-vuG1NXCU8PlJWq0gG05O0nWfkuz3IWPA8K3ZMFuX3q0O-Y4uNaAeO5hGGDALfI2FhaY5PBoEC4K41f4A2ZG63m16HCP-uM60HmEZlK2nG2DW6RmziI0Zu9Fq1i3bv0ZV1YPB0mqDbZ2si4EZEMIm81CWqm0nG35l7Ome29GcRh8CC1aXsdYhiC0cnss0949qSYbYG4XYL3_piM034ScM3ysL2ntB0PW6c26hsWC61aO1Mmis0nV31amQZ0Ae1YWz6yv3BXmNEoN7GPi93RczOr_QboYB-8ZId62nDXBeoWIw_JuuEk3-Fdpd_voauFamsQN0rHks1Ob7qf8wNz_y_FpvwAAalY3ozN-siItA8UHF7FkIipCTXKVnXalsiW_tPCe6hdGqE36Rqw5gS7kzpW-A0_YtYqPyI6_irClsyHWa5bakQ_CW__KHNhneS6RLzbOolJNLfUgTHKx2zI-4GtT-pDR87ChNa-cji9cw47zvXvbQtg4hsJYlJtADToIqx8zH9lAbUSCuUIBXcJp16hYQ3qfLEPDfLKuQdVNsjWsprRZfe-OOn_QgxsQ3FO-ieb9ztGrNd8CdFfEKMirdag_c6BSLLsD-t1FDvaFzMiVtkts-lWmfZkO890ZojfItgXrZr7AT36YtfLCCsTo-UvXVRMv-MGZoay9BdhlB9AWTqa0jrwCiercNN0EorZsyZmAYyaeN9cf_Rn0V5XV1MCyi38txapoQcRBfLJ2QDFBDxqIEPmq9iEAjaSY_fiqDVmvTomwXPMi6iNclsOGjdm4DeeszMT5lGjJFFXOB_7XQnfUlf5_pCUhChGSgnjcRwcyI1XBY8gFZMefhQMmBhdyvz5RiUvIPyzbT7l6hCh0i5XzEGrrPCd2tdbzUVJanrf1lKITJLKxgQ1IrnxCv38GFkyqQ5tYrg0pPsOhRzRsbjieFETBswKVzRHfFDhO2caqT9d1kclmdI3QQ7wtp5w1-mG_6oTVybO99SZDeqtDSXr6_KC5FNRPQFLLf53jts7cdUsxX6V3W-h4e-MUbuRo9iQ4knT1FkHn4JOse1Hb9KmjXBo56Pg-fJZssTkNnv3HlEcPplDezxgM9AvtB5-YfcP9ONLDMd4aj0vzy-7k3TbyqctrQd2KzMQZti7JVWbLIsVH5UCZ8B2iNO_95kNfF3IqzNaxUzTzs9jQVxyDdpzvoRiIRkH_Ln-nf2wAn53n4KSzjxSxqw5ak7pHCF2exqnVXR-UmqhZhpyQuB_OLLT72YmUEc_wWoEVP34mzFboCQXcCwd85mvvq4V-NmCyXrHxAKBZHrX8qJpB8cqRhMWfRThHLEJqjKK77IcRlZ-5pgIl8xjH0OxKC9exMUDI0YC0X_IdDGz_-ZhjZSA3HaQkSf-HmtZpC6O4PHaaC7rnl-b-H0vfXsSDM6QwPst8wgKBtVGVjcy-Z8Xjqc2Re4QLPg8LmwizgUuIWLfDlkq8MW2gTNjz_gDjvjzQY-LfyreDw91yk57XseCKLkvJN5TIqLOZw5YF6LA8bOGOwo1kFMCbGOPQmifQJP6wIXDa7K6NDbZCtyFoAsnS8sk2pxMDu8xqPj0qNb6IqP7ABil8GBLKciacCcNHNrXT4fi8T6ELAXh9RBf00kjOeJyQwAzhIZ60WvMlbcDohTbgTBXkAwugXNsoR4eDs8siVwl7Wagjr2qeD5ycDndAFVBimk9d1jScncZKZxh0llzc0DLHLjPbc_Q_pc5cSHYlw7dknMKctS-Bv76F3sq6GaOhyrTRmKM6bTfb80EJen3rTgvr933zUprkqPfRs3HkdTz-UWlRY0TVsHyqIzJfJHiR-_wDvVnwMmmslTq62tdqEjZ6YFGkf6_jG0eFIuUPrr5w7KHLLQD3pEu8qdckQAFmeAiAfYOkMkgLnIsnUwjlTYuplRUfJBgE7lNSZuiybyqCUTxpOCePrIoFMW_b6WxJJSzp6Yb0pzzumV5hz-RrTrxGULm60aqA8skWQHwlPk6hKfUht5dqh86SbdPKPvEPFKz8Qfo6EH7G6RJrg7L7MRLmPj7jGAq9DeZwKhBQP0rLt3U-_3aeoSGKqhkkT0RDnZYl-DzDlCK5b4IYRZPOwqG5gVyVFqUndAzrGXjYRjdrlrm25yRB-0rZcor6SsXtYSwZRqRFuMLRGdLy-akeEJmcz06lem6Zwn4BDmj-E8TBJtKHBFSL6a-yQNUveLgYf2tofjPc5AX7clgy6QSOoRH2iuT1ob_NHq7RZjJbGV5wF-9GM7mPqybjaCs91dLNvEey1tT7McMmrevgfLdlW1JZ_qmTX_BcEhngh_aDhTGNS1haC9EoraTheaedLJCnUFPLCyc5q05Hj17zrtmUIJDYZIDXd7op0xKjNqZVT0QeF7Gdm38-uWXInRRyE4WEA7k_I_aXQnxd9xNbwyl0jenfMFJNCBxKtPp74YuNbx4lVzksICcjloro3crpSrv7MtlYJzksZwOctjz6uqjzh1NA5L0VT9995WF-CLyk-ZGjIQkpj2-zBeiLFun4e3nrHTjIRuAcKRBfJ9DPj2o3PaTsyOXfontJShWp7aHDmf259mllQZBzqsspMBIlDC6P7rhwZTEfAPd8V50Un7yeF35Z5fxD7DcOi5J_Z87q0UwaBVOzTJbfg_esdRcP1_5exu3IAcpKyqbxOk64sxeiTIk9-fnANeRS4eB6WGlJXxQ0iBQ3PbNI0w6eVoAsnLLpV4ClxnMkAe_cTbSzw6XTHavARJruFLSV4fTJtHuwKRkkXVsoEld14EMwR3HlvjMMu2hRzcpCZVwuPw_fp-t6aaNm0NOZDQSFi8yAOJjWFdUqoldgeJrXlKQpoe2dvM3nN7qtrnyBYPjZe4A-FO7hZyFeVepwGEa2yYRCyyYDdjYchNz7ZCwNmmTZUKsh2yX-O7PkkrFtix1pMGmS2btM_7faQYxfWNcbJtmbelx4Z0YIVhnd_lnJn-6yjSSKH-fCRr_PN7hbyBQnfV0tmGxxRg2brB7Rzg_v9lKOWpNbdqbsMDwP10t5KCYrKLZt4Ld6GEfeXbWzP3AWY_DbNqdKwC_SRvD4ca3DN2hoswBe7x1CgoAF_Xy0 \ No newline at end of file diff --git a/docs/logical_data_model.puml b/docs/logical_data_model.puml index aae36a5b78..f1a2cb734e 100644 --- a/docs/logical_data_model.puml +++ b/docs/logical_data_model.puml @@ -137,6 +137,7 @@ class ActivityReportObjectives{ arOrder : integer : 1 closeSuspendContext : text closeSuspendReason : enum + objectiveCreatedHere : boolean status : varchar(255) supportType : enum title : text diff --git a/frontend/src/components/FileUploader/FileTable.js b/frontend/src/components/FileUploader/FileTable.js index 49accc33aa..6b7ceae980 100644 --- a/frontend/src/components/FileUploader/FileTable.js +++ b/frontend/src/components/FileUploader/FileTable.js @@ -80,23 +80,19 @@ const FileTable = ({ onFileRemoved, files }) => { {getStatus(file.status)}
@@ -356,5 +362,3 @@ GoalCard.defaultProps = { hideGoalOptions: false, erroneouslySelected: false, }; - -export default GoalCard; diff --git a/frontend/src/components/GoalForm/Form.js b/frontend/src/components/GoalForm/Form.js index 05387bb6a9..dc555be31b 100644 --- a/frontend/src/components/GoalForm/Form.js +++ b/frontend/src/components/GoalForm/Form.js @@ -3,7 +3,7 @@ import React, { useContext } from 'react'; import PropTypes from 'prop-types'; import { uniq } from 'lodash'; import { - Alert, FormGroup, + Alert, } from '@trussworks/react-uswds'; import ObjectiveForm from './ObjectiveForm'; import PlusButton from './PlusButton'; @@ -16,11 +16,12 @@ import { } from './constants'; import AppLoadingContext from '../../AppLoadingContext'; import './Form.scss'; -import ReadOnlyField from '../ReadOnlyField'; import GoalName from './GoalName'; import RTRGoalSource from './RTRGoalSource'; import FormFieldThatIsSometimesReadOnly from './FormFieldThatIsSometimesReadOnly'; import RTRGoalPrompts from './RTRGoalPrompts'; +import ReadOnlyGoalCollaborators from '../ReadOnlyGoalCollaborators'; +import GoalFormTitle from './GoalFormTitle'; export const BEFORE_OBJECTIVES_CREATE_GOAL = 'Enter a goal before adding an objective'; export const BEFORE_OBJECTIVES_SELECT_RECIPIENTS = 'Select a grant number before adding an objective'; @@ -44,7 +45,6 @@ export default function Form({ objectives, setObjectives, setObjectiveError, - topicOptions, isOnApprovedReport, isOnReport, isCurated, @@ -54,7 +54,6 @@ export default function Form({ fetchError, goalNumbers, clearEmptyObjectiveError, - onUploadFiles, userCanEdit, source, setSource, @@ -101,17 +100,16 @@ export default function Form({ }; const objectiveErrors = errors[FORM_FIELD_INDEXES.OBJECTIVES]; - - const formTitle = goalNumbers && goalNumbers.length ? `Goal ${goalNumbers.join(', ')}${isReopenedGoal ? '-R' : ''}` : 'Recipient TTA goal'; - const showAlert = isOnReport && status !== 'Closed'; - const notClosedWithEditPermission = (() => (status !== 'Closed' && userCanEdit))(); return (
- Resource files -
-- Topics -
-Topics
-Resource links
-Link to TTA resource
-