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

Shaw/appeals 44523 efolder express reactv18.20.x upgrade UAT branch #1719

Merged
merged 4 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions .github/workflows/ecr-login.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ jobs:
- name: retrieve ecr password and store as secret
if: steps.acquire-credentials.outcome == 'success'
run: |
pip3 install -r .github/workflows/requirements.txt
python3 .github/workflows/ecr_password_updater.py
sudo apt install python3-venv
python3 -m venv .venv
source .venv/bin/activate

pip install -r .github/workflows/requirements.txt

python .github/workflows/ecr_password_updater.py
env:
AWS_ACCESS_KEY_ID: ${{ steps.acquire-credentials.outputs.aws-access-key-id }}
AWS_SECRET_ACCESS_KEY: ${{ steps.acquire-credentials.outputs.aws-secret-access-key }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
awscli==1.35.2
pynacl==1.4.0
requests==2.25.1
boto3==1.17.107
boto3==1.35.36
10 changes: 5 additions & 5 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@
"@babel/preset-react": "^7.0.0",
"@babel/register": "^7.7.0",
"@babel/runtime-corejs2": "^7.0.0",
"@department-of-veterans-affairs/caseflow-frontend-toolkit": "https://github.com/department-of-veterans-affairs/caseflow-frontend-toolkit#a05abe6",
"@department-of-veterans-affairs/caseflow-frontend-toolkit": "https://github.com/department-of-veterans-affairs/caseflow-frontend-toolkit#upgrade-test",
"babel-loader": "^8.0.0",
"es5-shim": "^4.5.10",
"glamor": "^2.20.40",
"history": "^4.7.2",
"imports-loader": "^0.7.1",
"prop-types": "^15.6.0",
"react": "^16.2.0",
"react": "18.2.0",
"react-copy-to-clipboard": "^5.0.1",
"react-dom": "^16.2.0",
"react-dom": "18.2.0",
"react-hot-loader": "^4.12.18",
"react-redux": "^5.0.6",
"react-router-dom": "^4.2.2",
"react-redux": "7.2.0",
"react-router-dom": "5.3.4",
"redux": "^3.7.2",
"redux-thunk": "^2.2.0",
"superagent": "^3.8.2",
Expand Down
4 changes: 4 additions & 0 deletions client/src/containers/InitContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ import RecentDownloadsContainer from './RecentDownloadsContainer';
import FeedbackContainer from './FeedbackContainer';

class InitContainer extends React.PureComponent {
// componentDidMount() {
// console.log('InitContainer mounted. Props:', this.props);
// console.log('Redux store state:', this.context.store.getState());
// }
render() {
return <BrowserRouter basename="/">
<React.Fragment>
Expand Down
10 changes: 6 additions & 4 deletions client/src/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { render } from 'react-dom';
import { createRoot } from 'react-dom/client';

import ReduxBase from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/ReduxBase';

Expand All @@ -8,14 +8,16 @@ import InitContainer from './containers/InitContainer';

const efolderExpress = {
init(props) {
render(
const container = document.getElementById('efolder_express_app');
const root = createRoot(container);

root.render(
<ReduxBase reducer={reducer} initialState={{
...initState,
...props
}}>
<InitContainer />
</ReduxBase>,
document.getElementById('efolder_express_app')
</ReduxBase>
);
}
};
Expand Down
Loading
Loading