Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PROD] 05/13 [TTAHUB-2830] Message for CSV import [TTAHUB-2889] Save AR FEI root causes in cache [TTAHUB-2895] Update edit goal permissions #2146

Merged
merged 188 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
dc42b52
Bump pydantic from 2.1.1 to 2.4.0 in /similarity_api/src
dependabot[bot] Apr 25, 2024
5655dc9
Bump pydantic-core
kryswisnaskas Apr 30, 2024
cfb3132
Models, Hooks, migrations
GarrettEHill Apr 30, 2024
115156b
through associations somehow change the type for the column from text…
GarrettEHill Apr 30, 2024
42e6686
Fixes
GarrettEHill May 1, 2024
6033d93
lint
GarrettEHill May 1, 2024
b252ccd
Update 20240501053650-monitoring-findings.js
GarrettEHill May 1, 2024
0ed11e5
Update course model to have "other" option
thewatermethod May 1, 2024
75d645a
FE changes and test updates
thewatermethod May 1, 2024
c4b922f
Merge remote-tracking branch 'origin/main' into mb/TTAHUB-2609/move-c…
thewatermethod May 1, 2024
13e0290
Add export courses button
thewatermethod May 1, 2024
d62e236
Add test
thewatermethod May 1, 2024
3bd871e
Merge remote-tracking branch 'origin/main' into mb/TTAHUB-2609/move-c…
thewatermethod May 1, 2024
a170921
test
GarrettEHill May 2, 2024
c9f6c22
Merge branch 'main' into TTAHUB-2885/monitoring-findings
GarrettEHill May 2, 2024
62b0cb9
Update monitoring.test.js
GarrettEHill May 3, 2024
0ac56e9
Update 20240502234137-monitoring-findings.js
GarrettEHill May 3, 2024
997e82c
fix tests
GarrettEHill May 3, 2024
cfb0e52
wip
AdamAdHocTeam May 3, 2024
65d153e
Update monitoring.test.js
GarrettEHill May 3, 2024
d27fa83
fix test
AdamAdHocTeam May 3, 2024
3ddf387
fix test to use new path
AdamAdHocTeam May 3, 2024
55fd296
reorder things a bit since we should only have prompts for single rec…
AdamAdHocTeam May 3, 2024
8b40fe1
remove console log
AdamAdHocTeam May 3, 2024
39c96a3
Bump ejs from 3.1.8 to 3.1.10 in /frontend
dependabot[bot] May 3, 2024
43b5233
fix for zero becoming null
GarrettEHill May 3, 2024
0eeff23
Merge pull request #2114 from HHS/dependabot/pip/similarity_api/src/p…
dependabot[bot] May 3, 2024
3c7fb7c
Initial runthrough
thewatermethod May 3, 2024
90bd640
Update status dropdown test
thewatermethod May 3, 2024
91d0406
Add some BE bubble-wrap
thewatermethod May 3, 2024
88d0cfb
backend work
thewatermethod May 3, 2024
0a6fc94
add multi recipient test
AdamAdHocTeam May 3, 2024
37cdef0
Update known issues (frontend)
kryswisnaskas May 3, 2024
523a83e
Bump tqdm from 4.66.0 to 4.66.3 in /similarity_api/src
dependabot[bot] May 3, 2024
9ef1862
changes based on meeting
GarrettEHill May 4, 2024
d49a525
lint
GarrettEHill May 4, 2024
c737133
Update dataObjectUtils.test.js
GarrettEHill May 4, 2024
e4eef73
lint
GarrettEHill May 4, 2024
45ece3e
fix failing tests
GarrettEHill May 4, 2024
d8cddce
more test fixes
GarrettEHill May 4, 2024
14a3109
Update monitoring.test.js
GarrettEHill May 4, 2024
e7475b6
update ar responses if fei is updated after the fact
AdamAdHocTeam May 5, 2024
570adc4
Remove objective hook, await goal hook
thewatermethod May 6, 2024
af8a75d
More work on the status change handler
thewatermethod May 6, 2024
1647578
Fix the hook call
thewatermethod May 6, 2024
58eb771
Fix route naming
thewatermethod May 6, 2024
a471481
Merge pull request #2126 from HHS/dependabot/npm_and_yarn/frontend/ej…
dependabot[bot] May 6, 2024
c787748
Merge pull request #2135 from HHS/dependabot/pip/similarity_api/src/t…
dependabot[bot] May 6, 2024
3e4bc22
Update failing test
thewatermethod May 6, 2024
dc94f65
update test
AdamAdHocTeam May 6, 2024
a54ef15
Polish off appearances
thewatermethod May 6, 2024
64cdf05
Merge branch 'main' into TTAHUB-2885/monitoring-findings
GarrettEHill May 6, 2024
f61720d
add first set of backend tests
thewatermethod May 6, 2024
b4dc410
Update monitoring.test.js
GarrettEHill May 6, 2024
937bd73
create missing responses by using ARGs that werent updated
AdamAdHocTeam May 6, 2024
d90c592
Update monitoring.test.js
GarrettEHill May 6, 2024
8d0b489
Add new service and test
thewatermethod May 6, 2024
bc552c1
Update migration filename
thewatermethod May 6, 2024
0de6cf4
Move query to service
thewatermethod May 6, 2024
7b05b7d
Add test for handlers
thewatermethod May 6, 2024
8d1f067
hopefully this fixes the failing tests...
AdamAdHocTeam May 6, 2024
b918e6e
add migration
nvms May 6, 2024
145cee4
remove autoPopulateStatusChangeDates
nvms May 6, 2024
9ff656e
Add test for status verification
thewatermethod May 6, 2024
44c599e
Add test for new hook
thewatermethod May 6, 2024
173cf80
Add test for permissions
thewatermethod May 6, 2024
5f25827
Rename StatusDropdown test to GoalStatusDropdown
thewatermethod May 6, 2024
0730858
Add test for goal status change validation
thewatermethod May 6, 2024
2c8b627
Update label for objective status dropdown
thewatermethod May 6, 2024
ad3f5a6
Update monitoring.test.js
GarrettEHill May 6, 2024
988c444
Add objective status dropdown test
thewatermethod May 6, 2024
914e131
this expects an array
nvms May 6, 2024
f58c245
remove fields from model
nvms May 6, 2024
3cd0da2
remove more refs
nvms May 6, 2024
f5a857e
ldm
nvms May 6, 2024
5542057
Add test for objective fetcher
thewatermethod May 6, 2024
66ebfeb
see if rolling back this code fixes the test
AdamAdHocTeam May 6, 2024
52e00c3
possible fix
AdamAdHocTeam May 6, 2024
e8494e8
Update monitoring.test.js
GarrettEHill May 6, 2024
399a006
update goalByIdWithActivityReportsAndRegions
nvms May 6, 2024
93fd519
Update prod-style-server
GarrettEHill May 6, 2024
bc55088
remove refs
nvms May 6, 2024
c05016d
Bump werkzeug from 3.0.1 to 3.0.3 in /similarity_api/src
dependabot[bot] May 6, 2024
68c4bf1
linting
nvms May 6, 2024
b72da2d
Update monitoring.test.js
GarrettEHill May 6, 2024
becc37e
Update config.yml
thewatermethod May 6, 2024
3e8d005
Merge pull request #2137 from HHS/TTAHUB-2920/dynamic-secirity-scan
GarrettEHill May 6, 2024
f43ea4a
Changes from testing via the UI
thewatermethod May 6, 2024
3e2da36
lint
nvms May 6, 2024
e188a9a
unrelated, but should be fixed
nvms May 6, 2024
91ab140
Update config.yml
GarrettEHill May 6, 2024
a438cb5
Test objective status change
thewatermethod May 6, 2024
34320dd
cleanup and fixes
AdamAdHocTeam May 6, 2024
a82df00
whoops, restore these
nvms May 6, 2024
7f89a27
Update monitoring.test.js
GarrettEHill May 6, 2024
1489d83
Bump jinja2 from 3.1.3 to 3.1.4 in /similarity_api/src
dependabot[bot] May 6, 2024
e5c6fb0
Merge pull request #2139 from HHS/TTAHUB-2922/dss-architecture
GarrettEHill May 6, 2024
0ccf258
allow for passing in the migrations feature flags
GarrettEHill May 7, 2024
c960815
Update migrations to use the correct list of flags at the time the mi…
GarrettEHill May 7, 2024
1b3529c
migration included but did not use updateUsersFlagsEnum
GarrettEHill May 7, 2024
5534f22
Update migration.test.js
GarrettEHill May 7, 2024
74b0e63
Update migration.test.js
GarrettEHill May 7, 2024
72b383e
see if these tests are the cause of the failure
AdamAdHocTeam May 7, 2024
57473f9
Suspend modal and UI testing
thewatermethod May 7, 2024
87df3b8
safe check
nvms May 7, 2024
ac116b1
set previousStatus here for FE consumption
nvms May 7, 2024
402e6a6
cleanup
nvms May 7, 2024
621ebf4
lint
nvms May 7, 2024
78ae61b
change creation order to prevent hook
AdamAdHocTeam May 7, 2024
4eecc59
safe check
nvms May 7, 2024
8fd3647
Add e2e test
thewatermethod May 7, 2024
43103c4
add UI test for suspending an objective
thewatermethod May 7, 2024
0a8425a
Merge remote-tracking branch 'origin/main' into mb/TTAHUB-2857/update…
thewatermethod May 7, 2024
bfbacbb
update migration
nvms May 7, 2024
d513940
update migration
nvms May 7, 2024
4744186
ldm
nvms May 7, 2024
4074132
update test
nvms May 7, 2024
5ccc211
update test
nvms May 7, 2024
d7f6de4
Merge pull request #2138 from HHS/dependabot/pip/similarity_api/src/w…
dependabot[bot] May 7, 2024
cf39d61
Add icons back
thewatermethod May 7, 2024
8745de7
fix this test 🤞
nvms May 7, 2024
03b353f
Fiddle with the icons
thewatermethod May 7, 2024
680964c
remove filename from csp directives
thewatermethod May 7, 2024
be308b6
Misread path
thewatermethod May 7, 2024
c81e4d5
Updates from design review
thewatermethod May 7, 2024
212112f
Merge remote-tracking branch 'origin/main' into mb/TTAHUB-2609/move-c…
thewatermethod May 8, 2024
93f8e85
show error if csv is not utf8
AdamAdHocTeam May 8, 2024
c85c14f
fixes and cleanup
AdamAdHocTeam May 8, 2024
2776e23
lint
AdamAdHocTeam May 8, 2024
e3a53c1
fix test
AdamAdHocTeam May 8, 2024
ad51e4f
put back await
AdamAdHocTeam May 8, 2024
6aa7caf
assign default reason when there is none
nvms May 8, 2024
bd3b655
actually, don't do this at the handler
nvms May 8, 2024
89a706b
fix linting error
nvms May 8, 2024
d9d26e0
dont submit if we have errors
AdamAdHocTeam May 8, 2024
6daa2f4
Merge pull request #2136 from HHS/jp/2794/remove-goal-columns
nvms May 8, 2024
b484504
fix disable button and update the unit test
AdamAdHocTeam May 8, 2024
c423cf7
DRY up code in hook
thewatermethod May 9, 2024
4b569e8
Merge main
thewatermethod May 9, 2024
21639da
Fix ID issue
thewatermethod May 9, 2024
779e414
catch per Jon
AdamAdHocTeam May 9, 2024
20204e1
Deploy to dev
thewatermethod May 9, 2024
db66ec0
Merge pull request #2141 from HHS/TTAHUB-2430/fix-flags
GarrettEHill May 9, 2024
107a607
Merge pull request #2140 from HHS/dependabot/pip/similarity_api/src/j…
kryswisnaskas May 9, 2024
27c5d6b
update test to make sure activity report goals already using an fei r…
AdamAdHocTeam May 9, 2024
204f6e2
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
4e1ce1f
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
c9b8bca
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
549fc36
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
1ad71ed
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
d1e1a9a
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
ad2ab9b
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
b61b233
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
b5ad07e
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
f4a14e0
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
8b51831
Update src/models/tests/monitoring/monitoring.test.js
GarrettEHill May 9, 2024
e0f5b66
Update src/models/hooks/genericLink.js
GarrettEHill May 9, 2024
3078041
Update to prevent status change to suspended as well
thewatermethod May 10, 2024
34a4941
update test so its the same response value
AdamAdHocTeam May 10, 2024
971dbd0
Remove unneeded CSP modifications
thewatermethod May 10, 2024
8987f60
Add migration files
thewatermethod May 10, 2024
823d20c
Merge remote-tracking branch origin/main into mb/TTAHUB-2609/move-com…
thewatermethod May 10, 2024
e25c9fb
Update ldm
thewatermethod May 10, 2024
a1bdecc
actually run the migrations *duh*
thewatermethod May 10, 2024
eb4ee9b
Parent watch for child status change
thewatermethod May 10, 2024
318d036
hide edit if the user doesnt have permissions
AdamAdHocTeam May 10, 2024
33cfcd0
add admin
AdamAdHocTeam May 10, 2024
e283e6f
add test
AdamAdHocTeam May 10, 2024
cacc234
confirmed with Angela admin can always add permission
AdamAdHocTeam May 10, 2024
60beac0
always showw view if they dont have create permissions
AdamAdHocTeam May 13, 2024
98d440a
fix goal source when user is read only
AdamAdHocTeam May 13, 2024
96aa423
Merge pull request #2143 from HHS/al-ttahub-2830-fix-bad-chars-in-cou…
AdamAdHocTeam May 13, 2024
c968dba
Update 20240509221012-monitoring-findings.js
GarrettEHill May 13, 2024
add5ee7
Merge branch 'main' into TTAHUB-2885/monitoring-findings
GarrettEHill May 13, 2024
4bd68fb
ldm
GarrettEHill May 13, 2024
f0ddb61
Update monitoring.test.js
GarrettEHill May 13, 2024
eeb4639
Merge pull request #2124 from HHS/TTAHUB-2885/monitoring-findings
GarrettEHill May 13, 2024
1b20e3b
Merge remote-tracking branch origin/main into mb/TTAHUB-2609/move-com…
thewatermethod May 13, 2024
5ec1a21
Regen LDM
thewatermethod May 13, 2024
3beaf46
Merge remote-tracking branch 'origin/main' into mb/TTAHUB-2857/update…
thewatermethod May 13, 2024
a5b92c8
Merge pull request #2128 from HHS/mb/TTAHUB-2609/move-components
thewatermethod May 13, 2024
2a56aad
make support type read only in certain cases
AdamAdHocTeam May 13, 2024
76cccff
assert support type text
AdamAdHocTeam May 14, 2024
7351de7
Merge pull request #2134 from HHS/mb/TTAHUB-2857/update-goal-status-l…
thewatermethod May 14, 2024
e605f49
push to sandbox
AdamAdHocTeam May 14, 2024
d655d71
resolve merge conflict
AdamAdHocTeam May 14, 2024
13c51db
Merge pull request #2145 from HHS/al-ttahub-2895-hide-edit-button-for…
AdamAdHocTeam May 14, 2024
0a7fbbb
Merge pull request #2132 from HHS/al-ttahub-2889-save-arg-fei-responses
AdamAdHocTeam May 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,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: "al/ttahub-2570/flat-resource-sql"
default: "mb/TTAHUB-2857/update-goal-status-logic"
type: string
sandbox_git_branch: # change to feature branch to test deployment
default: "jp/2793/reopen-frontend"
default: "mb/TTAHUB-2609/move-components"
type: string
prod_new_relic_app_id:
default: "877570491"
Expand Down Expand Up @@ -653,7 +653,7 @@ jobs:
command: ./bin/run-owasp-scan
- store_artifacts:
path: reports/owasp_report.html
resource_class: arm.large
resource_class: large
deploy:
executor: docker-executor
steps:
Expand Down
36 changes: 33 additions & 3 deletions bin/prod-style-server
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,43 @@
#
# This script sets up a server as run-owasp-scan expects it

# remove old build directory
rm -r build/
# Setup script to fail on any error and log all output
set -e
set -o pipefail
exec > >(tee -a "setup.log") 2>&1

# run a production style build (single BE server with static FE)
echo "Starting server setup..."

# Check for existence of required docker-compose file
if [ ! -f "docker-compose.dss.yml" ]; then
echo "Error: docker-compose.dss.yml does not exist."
exit 1
fi

# Remove old build directory
if [ -d "build/" ]; then
echo "Removing old build directory..."
rm -r build/
else
echo "No old build directory found, skipping removal."
fi

# Run a production style build (single BE server with static FE)
echo "Running yarn install on server..."
docker-compose -f docker-compose.dss.yml run --rm server yarn install --production=false
echo "Running yarn install on frontend..."
docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend install --production=false
echo "Building backend..."
docker-compose -f docker-compose.dss.yml run --rm server yarn build
echo "Building frontend..."
docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend run build

# Starting services
echo "Starting services..."
docker-compose -f docker-compose.dss.yml up -d

# Running database migrations
echo "Running database migrations..."
docker-compose -f docker-compose.dss.yml run --rm server yarn db:migrate:ci

echo "Server setup completed successfully."
2 changes: 1 addition & 1 deletion docs/logical_data_model.encoded

Large diffs are not rendered by default.

Loading