Skip to content

Commit

Permalink
Merge branch 'staging' into devex-add-migration-check-github-action
Browse files Browse the repository at this point in the history
  • Loading branch information
Mwindo authored Feb 26, 2025
2 parents 0100cbd + bd7ecc0 commit b494e21
Show file tree
Hide file tree
Showing 55 changed files with 5,730 additions and 6,094 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
orbs:
git-shallow-clone: guitarrapc/git-shallow-clone@2.8.0

efcms-docker-image: &efcms-docker-image $AWS_ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/ef-cms-us-east-1:4.3.30
efcms-docker-image: &efcms-docker-image $AWS_ACCOUNT_ID.dkr.ecr.us-east-1.amazonaws.com/ef-cms-us-east-1:4.3.31

parameters:
run_build_and_deploy:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN apt-get install -y build-essential
RUN apt-get install -y libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev

ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.24.4.zip" -o "awscliv2.zip" && \
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.24.10.zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
./aws/install && \
rm -rf awscliv2.zip
Expand Down
3 changes: 0 additions & 3 deletions docs/dependency-updates.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@ Below is a list of dependencies that are locked down due to known issues with se
- `pdfjs-dist` has a major version update to ^3.x,x. A devex card has been created to track work being done towards updating the package. Please add notes and comments to [this card](https://trello.com/c/gjDzhUkb/1111-upgrade-pdfjs-dist).
- The high-severity security issue "vulnerable to arbitrary JavaScript execution" has been addressed by us here: https://github.com/flexion/ef-cms/issues/10407 and can therefore be ignored.

### @uswds/uswds
- Keep pinned on 3.7.1, upgrading to 3.8.0+ will cause DAWSON UI issues with icon spacing and break Cypress Snapshots in the Cypress UI (as you hover over each step after initial run, it loses styles, making it harder to debug issues).

### ws, 3rd party dependency of Cerebral
- When running npm audit, you'll see a high severity issue with ws, 'affected by a DoS when handling a request with many HTTP headers - https://github.com/advisories/GHSA-3h5v-q93c-6h6q'. This doesn't affect us as the vulnerability is on the server side and we're not using this package on the server. We tried to override this to 5.2.4 and 8.18.0 and weren't able to make this work as import paths have changed. In the mean time, we recommend skipping this issue. We could always fork the cerebral repo in the future if needed.

Expand Down
10,339 changes: 4,935 additions & 5,404 deletions package-lock.json

Large diffs are not rendered by default.

86 changes: 43 additions & 43 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@
"dependencies": {
"@18f/us-federal-holidays": "4.0.0",
"@aws-crypto/sha256-browser": "5.2.0",
"@aws-sdk/client-api-gateway": "3.744.0",
"@aws-sdk/client-apigatewaymanagementapi": "3.744.0",
"@aws-sdk/client-apigatewayv2": "3.745.0",
"@aws-sdk/client-batch": "3.744.0",
"@aws-sdk/client-cloudfront": "3.745.0",
"@aws-sdk/client-cloudwatch": "3.744.0",
"@aws-sdk/client-cloudwatch-logs": "3.744.0",
"@aws-sdk/client-cognito-identity-provider": "3.744.0",
"@aws-sdk/client-dynamodb": "3.744.0",
"@aws-sdk/client-dynamodb-streams": "3.744.0",
"@aws-sdk/client-glue": "3.744.0",
"@aws-sdk/client-lambda": "3.744.0",
"@aws-sdk/client-opensearch": "3.744.0",
"@aws-sdk/client-route-53": "3.744.0",
"@aws-sdk/client-s3": "3.744.0",
"@aws-sdk/client-ses": "3.744.0",
"@aws-sdk/client-sns": "3.744.0",
"@aws-sdk/client-sqs": "3.744.0",
"@aws-sdk/client-ssm": "3.744.0",
"@aws-sdk/credential-provider-node": "3.744.0",
"@aws-sdk/lib-dynamodb": "3.744.0",
"@aws-sdk/lib-storage": "3.744.0",
"@aws-sdk/rds-signer": "3.744.0",
"@aws-sdk/s3-presigned-post": "3.744.0",
"@aws-sdk/s3-request-presigner": "3.744.0",
"@aws-sdk/util-dynamodb": "3.744.0",
"@aws-sdk/client-api-gateway": "3.750.0",
"@aws-sdk/client-apigatewaymanagementapi": "3.750.0",
"@aws-sdk/client-apigatewayv2": "3.750.0",
"@aws-sdk/client-batch": "3.751.0",
"@aws-sdk/client-cloudfront": "3.750.0",
"@aws-sdk/client-cloudwatch": "3.750.0",
"@aws-sdk/client-cloudwatch-logs": "3.750.0",
"@aws-sdk/client-cognito-identity-provider": "3.750.0",
"@aws-sdk/client-dynamodb": "3.751.0",
"@aws-sdk/client-dynamodb-streams": "3.750.0",
"@aws-sdk/client-glue": "3.750.0",
"@aws-sdk/client-lambda": "3.750.0",
"@aws-sdk/client-opensearch": "3.750.0",
"@aws-sdk/client-route-53": "3.750.0",
"@aws-sdk/client-s3": "3.750.0",
"@aws-sdk/client-ses": "3.750.0",
"@aws-sdk/client-sns": "3.750.0",
"@aws-sdk/client-sqs": "3.750.0",
"@aws-sdk/client-ssm": "3.750.0",
"@aws-sdk/credential-provider-node": "3.750.0",
"@aws-sdk/lib-dynamodb": "3.751.0",
"@aws-sdk/lib-storage": "3.750.0",
"@aws-sdk/rds-signer": "3.750.0",
"@aws-sdk/s3-presigned-post": "3.750.0",
"@aws-sdk/s3-request-presigner": "3.750.0",
"@aws-sdk/util-dynamodb": "3.751.0",
"@cerebral/react": "4.2.1",
"@fortawesome/fontawesome-svg-core": "1.2.36",
"@fortawesome/free-regular-svg-icons": "5.15.4",
Expand Down Expand Up @@ -68,7 +68,7 @@
"export-to-csv": "1.4.0",
"express": "4.21.2",
"fflate": "0.8.2",
"form-data": "4.0.1",
"form-data": "4.0.2",
"htmlparser2": "10.0.0",
"image-blob-reduce": "4.1.0",
"joi": "17.13.3",
Expand Down Expand Up @@ -102,7 +102,7 @@
"supports-color": "10.0.0",
"tmp": "0.2.3",
"util": "0.12.5",
"uuid": "11.0.5",
"uuid": "11.1.0",
"websocket": "1.0.35",
"wicg-inert": "3.1.3",
"winston": "3.17.0"
Expand Down Expand Up @@ -254,13 +254,13 @@
"cypress": "$cypress"
},
"devDependencies": {
"@aws-sdk/client-iam": "3.744.0",
"@aws-sdk/client-rds": "3.743.0",
"@aws-sdk/client-secrets-manager": "3.743.0",
"@aws-sdk/client-sts": "3.743.0",
"@aws-sdk/client-iam": "3.750.0",
"@aws-sdk/client-rds": "3.753.0",
"@aws-sdk/client-secrets-manager": "3.750.0",
"@aws-sdk/client-sts": "3.750.0",
"@babel/cli": "7.26.4",
"@babel/core": "7.26.8",
"@babel/preset-env": "7.26.8",
"@babel/core": "7.26.9",
"@babel/preset-env": "7.26.9",
"@babel/preset-react": "7.26.3",
"@babel/preset-typescript": "7.26.0",
"@babel/register": "7.25.9",
Expand All @@ -271,7 +271,7 @@
"@types/jest": "29.5.14",
"@types/lodash": "4.17.15",
"@types/luxon": "3.4.2",
"@types/node": "22.13.2",
"@types/node": "22.13.4",
"@types/promise-retry": "1.1.6",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
Expand All @@ -283,7 +283,7 @@
"axe-core": "4.10.2",
"babel-jest": "29.7.0",
"babel-plugin-cerebral": "1.0.1",
"cognito-local": "4.0.0",
"cognito-local": "4.1.0",
"crypto-browserify": "3.12.1",
"csv-parse": "5.6.0",
"cypress": "14.0.3",
Expand Down Expand Up @@ -318,17 +318,17 @@
"livereload": "0.9.3",
"nodemon": "3.1.9",
"pdf2pic": "3.1.3",
"pixelmatch": "6.0.0",
"pixelmatch": "7.1.0",
"pngjs": "7.0.0",
"postcss": "8.5.2",
"postcss": "8.5.3",
"postcss-preset-env": "10.1.4",
"prettier": "3.5.1",
"puppeteer": "24.1.1",
"puppeteer-core": "24.1.1",
"puppeteer": "24.2.1",
"puppeteer-core": "24.2.1",
"readline": "1.3.0",
"s3rver": "github:20minutes/s3rver",
"sass": "1.84.0",
"sass-loader": "16.0.4",
"sass": "1.85.0",
"sass-loader": "16.0.5",
"shuffle-seed": "1.1.6",
"stream-browserify": "3.0.0",
"stylelint": "16.14.1",
Expand All @@ -342,7 +342,7 @@
"ts-node": "10.9.2",
"tsconfig-paths": "4.2.0",
"typescript": "5.7.3",
"typescript-eslint": "8.24.0",
"typescript-eslint": "8.24.1",
"utf8": "3.0.0"
}
}
2 changes: 1 addition & 1 deletion shared/admin-tools/glue/glue_migrations/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.87.0"
version = "~> 5.88.0"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion shared/admin-tools/glue/remote_role/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 5.87.0"
version = "~> 5.88.0"
}
}
}
Expand Down
13 changes: 4 additions & 9 deletions shared/src/business/entities/cases/Case.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,11 @@ import { Statistic } from '../Statistic';
import { TrialSession } from '../trialSessions/TrialSession';
import { UnprocessableEntityError } from '../../../../../web-api/src/errors/errors';
import { User } from '../User';
import { clone, compact, includes, isEmpty, startCase } from 'lodash';
import { clone, compact, includes, startCase } from 'lodash';
import { compareStrings } from '../../utilities/sortFunctions';
import { getDocketNumberSuffix } from '../../utilities/getDocketNumberSuffix';
import { shouldGenerateDocketRecordIndex } from '../../utilities/shouldGenerateDocketRecordIndex';
import joi from 'joi';
import { RawCaseDeadline } from '@shared/business/entities/CaseDeadline';

export class Case extends JoiValidationEntity {
public associatedJudge?: string;
Expand Down Expand Up @@ -1400,18 +1399,14 @@ export class Case extends JoiValidationEntity {
* @param {object} caseDeadlines - the case deadlines
* @returns {Case} the updated case entity
*/
updateAutomaticBlocked({
caseDeadlines,
}: {
caseDeadlines?: RawCaseDeadline[];
}) {
updateAutomaticBlocked({ hasCaseDeadline }: { hasCaseDeadline: boolean }) {
const hasPendingItems = this.doesHavePendingItems();
let automaticBlockedReason;
if (hasPendingItems && !isEmpty(caseDeadlines)) {
if (hasPendingItems && hasCaseDeadline) {
automaticBlockedReason = AUTOMATIC_BLOCKED_REASONS.pendingAndDueDate;
} else if (hasPendingItems) {
automaticBlockedReason = AUTOMATIC_BLOCKED_REASONS.pending;
} else if (!isEmpty(caseDeadlines)) {
} else if (hasCaseDeadline) {
automaticBlockedReason = AUTOMATIC_BLOCKED_REASONS.dueDate;
}
if (automaticBlockedReason) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('updateAutomaticBlocked', () => {

expect(caseToUpdate.automaticBlocked).toBeFalsy();

caseToUpdate.updateAutomaticBlocked({});
caseToUpdate.updateAutomaticBlocked({ hasCaseDeadline: false });

expect(caseToUpdate.automaticBlocked).toEqual(true);
expect(caseToUpdate.consolidatedCases[0].automaticBlocked).toEqual(true);
Expand Down Expand Up @@ -48,7 +48,7 @@ describe('updateAutomaticBlocked', () => {

expect(caseToUpdate.automaticBlocked).toBeTruthy();

caseToUpdate.updateAutomaticBlocked({});
caseToUpdate.updateAutomaticBlocked({ hasCaseDeadline: false });

expect(caseToUpdate.consolidatedCases[0].automaticBlocked).toBeFalsy();
expect(caseToUpdate.automaticBlocked).toBeFalsy();
Expand Down
Loading

0 comments on commit b494e21

Please sign in to comment.