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

Redux Toolkit Migration #1113

Merged
merged 141 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
eaaeaea
rtk install
ChrisMart21 Sep 12, 2023
c0bebe1
RTK Query Sample Usage
ChrisMart21 Sep 18, 2023
5bc5384
Initial Graph Slice Reducer Refactor
ChrisMart21 Sep 18, 2023
30f7e6e
Options Slice Refactor
ChrisMart21 Sep 18, 2023
a444612
Current User Slice Refactor
ChrisMart21 Sep 18, 2023
ca57840
unSavedWarningSliceRefactor
ChrisMart21 Sep 18, 2023
d3b61a0
Meter Slice Refactor
ChrisMart21 Sep 18, 2023
9c5405c
Incremental RTK Adoptions
ChrisMart21 Sep 18, 2023
7489524
wip
ChrisMart21 Sep 19, 2023
988b2ea
Fix Groups Query for deep meters
ChrisMart21 Sep 19, 2023
fcbe73d
fix RPDSelect
ChrisMart21 Sep 19, 2023
3ee5052
wip
ChrisMart21 Sep 20, 2023
0600dc2
Initial ChartDataSelector Refactor
ChrisMart21 Sep 20, 2023
0445f17
Incremental Changes
ChrisMart21 Sep 21, 2023
c8acbe8
Mutations React Router Bump
ChrisMart21 Sep 28, 2023
1b6cbe1
Initialization Component Changes
ChrisMart21 Sep 28, 2023
4b967ff
RouteComponentWip
ChrisMart21 Sep 30, 2023
b7e3fa3
useSelector changes
ChrisMart21 Sep 30, 2023
8b57651
Routing Changes to Admin and Role Routes.
ChrisMart21 Oct 1, 2023
e9cf6e3
Ui Options Component Refactor
ChrisMart21 Oct 2, 2023
2357e7d
Line & Bar Component refactor
ChrisMart21 Oct 2, 2023
4a52299
Merge remote-tracking branch 'huss/development'
ChrisMart21 Oct 3, 2023
535bafb
UserChanges.
ChrisMart21 Oct 3, 2023
ab19dbf
Merge remote-tracking 'upstream/development'
ChrisMart21 Oct 3, 2023
14dfcc1
Query updates
ChrisMart21 Oct 8, 2023
a098351
RTK 5.0.0-beta.2 Selector Refactor
ChrisMart21 Oct 8, 2023
56f1aa7
Query Updates, and Data Selectors
ChrisMart21 Oct 16, 2023
12e022e
LoadingHook
ChrisMart21 Oct 16, 2023
a3344b2
Fix Merge property usage
ChrisMart21 Oct 16, 2023
ca9a7f1
Basic Graph State History
ChrisMart21 Oct 17, 2023
fc0ca0d
Chart Data Select Update
ChrisMart21 Oct 18, 2023
b4b694d
Routing & Unsaved Changes
ChrisMart21 Oct 22, 2023
54e0319
Add ESLint for React-Hooks
ChrisMart21 Oct 22, 2023
cffcaca
Add Translation TS Completions
ChrisMart21 Oct 23, 2023
8eb9114
Drop Meter, Group, and Unit Slices/Reducer
ChrisMart21 Nov 1, 2023
bf0136e
RTK Beta Version Bump
ChrisMart21 Nov 5, 2023
d30ff3d
Simplify Redux Store
ChrisMart21 Nov 7, 2023
78004ab
Convert Compare to RTKQuery
ChrisMart21 Nov 8, 2023
042e9e7
Sweep for bugs Add TODOS
ChrisMart21 Nov 8, 2023
e481080
Api Selector Refactor
ChrisMart21 Nov 8, 2023
21e16eb
Refactor Query Arg Selectors
ChrisMart21 Nov 9, 2023
cbd6921
Refactor Query Arg Selectors
ChrisMart21 Nov 9, 2023
e6068e7
Separate GraphHistory from Graph
ChrisMart21 Nov 12, 2023
88dc79d
Sweep Selectors for clarity/usage
ChrisMart21 Nov 13, 2023
3fa18cf
Entity Adapter Reafactor
ChrisMart21 Nov 14, 2023
2bdf17d
PRSTASH
ChrisMart21 Nov 14, 2023
6bc3d04
Hist
ChrisMart21 Nov 20, 2023
4cc8b9d
CreateTunkSlice as init sequence
ChrisMart21 Nov 20, 2023
f3ba7de
CutUnsaved warning for maps
ChrisMart21 Nov 27, 2023
3869ec5
Multi Select Changes
ChrisMart21 Dec 1, 2023
390ea80
Merge remote-tracking branch 'upstream/development' into rtk
ChrisMart21 Jan 9, 2024
fc13310
Legacy Router Cleanup
ChrisMart21 Jan 10, 2024
813d30d
Simplify History
ChrisMart21 Jan 13, 2024
9d1691a
Purge Duped Files
ChrisMart21 Jan 14, 2024
72f111b
Cleanup Legacy code
ChrisMart21 Jan 14, 2024
1e1b964
test B5
kaito1105 Jan 6, 2024
a9a1cd6
Fix Headers
ChrisMart21 Jan 15, 2024
85c6630
Fix failed tests
ChrisMart21 Jan 15, 2024
ec2e575
format, console.log removed, simple edits
huss Jan 30, 2024
3bad170
use Toast msgs + other
huss Jan 31, 2024
1ab2f02
basic edits
huss Feb 4, 2024
27ccb65
Auth Midleware, address comments.
ChrisMart21 Feb 5, 2024
74d52ce
Line ErrorBar Fix & Layout Tweaks
ChrisMart21 Feb 7, 2024
053c865
Plotly Bar SelectFromResult Refactor
ChrisMart21 Feb 8, 2024
cc252d2
Minor Fixes / Tweaks
ChrisMart21 Feb 8, 2024
22d6cd5
fix export bug + edits
huss Feb 11, 2024
adda4a8
login translation, remove spinner commented out code & basic edits
huss Feb 12, 2024
6059a82
ChartLink bug fix + single dispatch
ChrisMart21 Feb 13, 2024
ccb5310
basic edits +
huss Feb 13, 2024
8d51cf0
Merge remote-tracking branch 'ChrisMart21/rtk' into pr/ChrisMart21/1113
huss Feb 13, 2024
6c74c28
Select-Tooltip fix.
ChrisMart21 Feb 13, 2024
ca5ad29
basic edits +
huss Feb 14, 2024
04ff3c3
basic edits
huss Feb 14, 2024
9d8f929
ChartLink Component rework.
ChrisMart21 Feb 14, 2024
209210c
fix up packages
huss Feb 15, 2024
05dcb8a
Merge remote-tracking branch 'ChrisMart21/rtk' into pr/ChrisMart21/1113
huss Feb 15, 2024
171e0fd
minor edits/commenting
huss Feb 16, 2024
ce4913d
remove adminState.selectedMeter
huss Feb 17, 2024
bbf1828
basic edits
huss Feb 17, 2024
a0ccbf9
simple edits
huss Feb 17, 2024
27aef9b
minor edits +
huss Feb 18, 2024
0bf39ee
Fix Circular
ChrisMart21 Feb 19, 2024
e46c875
Header
ChrisMart21 Feb 19, 2024
7128083
File Restructure.
ChrisMart21 Feb 19, 2024
bc2ec29
Merge remote-tracking branch 'upstream/development' into rtk
ChrisMart21 Feb 19, 2024
14c013d
small edits
huss Feb 19, 2024
b707761
More Selector File shifts
ChrisMart21 Feb 20, 2024
5cd1bd8
Bar Export Fix
ChrisMart21 Feb 20, 2024
33d9ec2
Initial Export Rework
ChrisMart21 Feb 20, 2024
f7bf29c
Export as Thunks Continued
ChrisMart21 Feb 20, 2024
cce3a2a
GraphNav Initial
ChrisMart21 Feb 20, 2024
e8da5c9
generalize translation key
huss Feb 21, 2024
b872734
Merge remote-tracking branch 'ChrisMart21/rtk' into pr/ChrisMart21/1113
huss Feb 21, 2024
c381310
Fix Slider Range
ChrisMart21 Feb 21, 2024
80aae20
PlotlyMinHeight
ChrisMart21 Feb 21, 2024
dfbcf53
address some PR comments
huss Feb 21, 2024
c4bdf38
MorePlotly
ChrisMart21 Feb 21, 2024
e92c41d
fix export label +
huss Feb 22, 2024
82d6f2d
enable ESLint semicolon rule
huss Feb 25, 2024
a8671dd
fix TS/cleint files for semicolon
huss Feb 25, 2024
a3b3746
Merge remote-tracking branch 'origin/development' into pr/ChrisMart21…
huss Feb 28, 2024
15d283f
fix MPL headers
huss Feb 28, 2024
cb78560
fix LG6 merge issue
huss Feb 28, 2024
c6f10d5
remove resolved comment
huss Feb 28, 2024
13763d2
convert console.log to error notification
huss Feb 28, 2024
a65532d
add comment on CSS value
huss Feb 28, 2024
4c30c6b
useDispatch -> useAppDispatch
huss Feb 28, 2024
190fa07
Clarify comment
huss Feb 28, 2024
59ca36c
Restore Options Scroll Bars
ChrisMart21 Feb 28, 2024
c014101
update icons
huss Feb 28, 2024
a08c908
Restore Options Export
ChrisMart21 Feb 28, 2024
ffb2962
Merge branch 'rtk' of github.com:ChrisMart21/OED-CSUMB-Capstone-Sum23…
ChrisMart21 Feb 28, 2024
00d43d9
RollBack Plotly + Tweaks
ChrisMart21 Feb 29, 2024
73f5320
Map Chart Select Restore
ChrisMart21 Feb 29, 2024
1943552
Purge unused Legacy Api endpoints
ChrisMart21 Feb 29, 2024
57c8df2
Keep maps as is
ChrisMart21 Feb 29, 2024
4b4eadf
Min Heigh Plots
ChrisMart21 Feb 29, 2024
2416186
remove unneeded await
huss Feb 29, 2024
ee58099
Fix Maps Data Fetch
ChrisMart21 Feb 29, 2024
8021225
Fix Alignment on Admin pages
ChrisMart21 Feb 29, 2024
489e03c
Create Meter No Unit Fix
ChrisMart21 Feb 29, 2024
569f2d4
Fix Create MeterModal
ChrisMart21 Feb 29, 2024
8f9601d
cik refresh restored.
ChrisMart21 Mar 1, 2024
6edcbf6
Radar Include Rate Menu
ChrisMart21 Mar 1, 2024
0ed1395
Merge remote-tracking branch 'ChrisMart21/rtk' into pr/ChrisMart21/1113
huss Mar 1, 2024
f31b244
Address PR Comments.
ChrisMart21 Mar 3, 2024
f33e63f
Re-home stable emtpy readings
ChrisMart21 Mar 3, 2024
a5cb490
3d Revisions
ChrisMart21 Mar 3, 2024
e97bdcf
More 3d Revisions
ChrisMart21 Mar 3, 2024
9870586
3d Bugs
ChrisMart21 Mar 3, 2024
d38ea62
update dispatch 3d from selects.
ChrisMart21 Mar 3, 2024
4db53cf
logs
ChrisMart21 Mar 4, 2024
4a35bac
minor format/edit
huss Mar 4, 2024
870b634
remove actions now in RTK
huss Mar 4, 2024
9754faf
defaultGraphicUnit -> unitId bug fix
huss Mar 5, 2024
ca21cd3
createMeterModalTweak
ChrisMart21 Mar 5, 2024
e3775f6
fix bug where meter/group dropdown wrong for maps
huss Mar 5, 2024
584cff9
update group edit state so correct after create
huss Mar 5, 2024
5b0199f
invalidated readings on appropriate conversion change
huss Mar 5, 2024
dda8170
comment out/TODO for 3D when > 1 yr
huss Mar 5, 2024
c023dcc
Merge remote-tracking branch 'ChrisMart21/rtk' into pr/ChrisMart21/1113
huss Mar 5, 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
7 changes: 5 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
"arrow-parens": [
"error",
"as-needed"
],
"semi": [
"error",
"always"
]
},
"overrides": [
Expand Down Expand Up @@ -151,8 +155,7 @@
{
// disable jsdoc requirement for reducers and actions
"files": [
"src/client/app/reducers/*.ts",
"src/client/app/actions/*.ts"
"src/client/app/redux/actions/*.ts"
],
"rules": {
"jsdoc/require-jsdoc": "off",
Expand Down
216 changes: 98 additions & 118 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"babel-plugin-lodash": "~3.3.4"
},
"dependencies": {
"@reduxjs/toolkit": "~2.1.0",
"@wojtekmaj/react-daterange-picker": "~5.2.0",
"axios": "~1.6.2",
"bcryptjs": "~2.4.3",
Expand Down Expand Up @@ -102,15 +103,16 @@
"react-dom": "~18.2.0",
"react-intl": "~6.4.4",
"react-plotly.js": "~2.6.0",
"react-redux": "~8.1.2",
"react-router-dom": "~5.3.0",
"react-redux": "~8.1.3",
"react-router-dom": "~6.21.1",
"react-select": "~5.7.4",
"react-toastify": "~9.1.3",
"react-tooltip": "~4.2.20",
"reactstrap": "~9.1.10",
"redux": "~4.2.1",
"redux-thunk": "~2.4.0",
"serve-favicon": "~2.5.0",
"usehooks-ts": "~2.14.0",
"xml2js": "~0.5.0"
},
"devDependencies": {
Expand All @@ -128,7 +130,6 @@
"@types/react-dom": "~18.2.7",
"@types/react-plotly.js": "~2.6.0",
"@types/react-redux": "~7.1.25",
"@types/react-router-dom": "~5.3.0",
"@typescript-eslint/eslint-plugin": "~6.4.1",
"@typescript-eslint/parser": "~6.11.0",
"babel-loader": "~8.2.3",
Expand Down
Loading
Loading