GlcoinCore/squeaknode
1
0
Fork 0
mirror of https://github.com/yzernik/squeaknode.git synced 2026-08-13 12:33:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix update resqueaked squeak slice (#2166)

Browse source 
* Fix update resqueaked squeak in slice state in reducer

* Remove old comments

* Update frontend build
This commit is contained in:
Jonathan Zernik 2022-04-24 18:49:09 -07:00 • committed by GitHub
parent 7658a4d95c
commit e1367bfec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
frontend/src/features/squeaks/squeaksSlice.js
View file

@ -215,6 +215,21 @@ export const setDownloadSqueak = createAsyncThunk(
}
)
const updateCurrentSqueak = (state, newSqueak) => {
const currentSqueak = state.currentSqueak;
if (currentSqueak && currentSqueak.getSqueakHash() === newSqueak.getSqueakHash()) {
state.currentSqueak = newSqueak;
}
// Update resqueaked squeak.
const currentResqueakedSqueak = currentSqueak && currentSqueak.getResqueakedSqueak();
if (currentResqueakedSqueak && currentResqueakedSqueak.getSqueakHash() === newSqueak.getSqueakHash()) {
const modifiedSqueak = currentSqueak.clone();
modifiedSqueak.setResqueakedSqueak(newSqueak);
state.currentSqueak = modifiedSqueak;
}
}
const updatedSqueakInArray = (squeakArr, newSqueak) => {
const currentIndex = squeakArr.findIndex(squeak => squeak.getSqueakHash() === newSqueak.getSqueakHash());
if (currentIndex != -1) {
@ -292,9 +307,7 @@ const squeaksSlice = createSlice({
.addCase(setLikeSqueak.fulfilled, (state, action) => {
console.log(action);
const newSqueak = action.payload;
if (state.currentSqueak && state.currentSqueak.getSqueakHash() === newSqueak.getSqueakHash()) {
state.currentSqueak = newSqueak;
}
updateCurrentSqueak(state, newSqueak);
updatedSqueakInArray(state.timelineSqueaks, newSqueak);
updatedSqueakInArray(state.searchSqueaks, newSqueak);
updatedSqueakInArray(state.ancestorSqueaks, newSqueak);
@ -304,9 +317,7 @@ const squeaksSlice = createSlice({
.addCase(setUnlikeSqueak.fulfilled, (state, action) => {
console.log(action);
const newSqueak = action.payload;
if (state.currentSqueak && state.currentSqueak.getSqueakHash() === newSqueak.getSqueakHash()) {
state.currentSqueak = newSqueak;
}
updateCurrentSqueak(state, newSqueak);
updatedSqueakInArray(state.timelineSqueaks, newSqueak);
updatedSqueakInArray(state.searchSqueaks, newSqueak);
updatedSqueakInArray(state.ancestorSqueaks, newSqueak);
@ -416,9 +427,7 @@ const squeaksSlice = createSlice({
console.log(action);
state.buySqueakStatus = 'idle';
const newSqueak = action.payload;
if (state.currentSqueak && state.currentSqueak.getSqueakHash() === newSqueak.getSqueakHash()) {
state.currentSqueak = newSqueak;
}
updateCurrentSqueak(state, newSqueak);
updatedSqueakInArray(state.timelineSqueaks, newSqueak);
updatedSqueakInArray(state.searchSqueaks, newSqueak);
updatedSqueakInArray(state.ancestorSqueaks, newSqueak);

6
squeaknode/admin/webapp/static/build/asset-manifest.json
View file

@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.206389cd.css",
"main.js": "/static/js/main.bda102e3.js",
"main.js": "/static/js/main.93bc4aa7.js",
"static/css/306.7f7715a0.chunk.css": "/static/css/306.7f7715a0.chunk.css",
"static/js/306.90b2a66c.chunk.js": "/static/js/306.90b2a66c.chunk.js",
"static/css/900.b66ac5fb.chunk.css": "/static/css/900.b66ac5fb.chunk.css",
@ -11,7 +11,7 @@
"static/media/icon.svg": "/static/media/icon.982210ec9275956e4d3cc77fa90167fd.svg",
"index.html": "/index.html",
"main.206389cd.css.map": "/static/css/main.206389cd.css.map",
"main.bda102e3.js.map": "/static/js/main.bda102e3.js.map",
"main.93bc4aa7.js.map": "/static/js/main.93bc4aa7.js.map",
"306.7f7715a0.chunk.css.map": "/static/css/306.7f7715a0.chunk.css.map",
"306.90b2a66c.chunk.js.map": "/static/js/306.90b2a66c.chunk.js.map",
"900.b66ac5fb.chunk.css.map": "/static/css/900.b66ac5fb.chunk.css.map",
@ -21,6 +21,6 @@
},
"entrypoints": [
"static/css/main.206389cd.css",
"static/js/main.bda102e3.js"
"static/js/main.93bc4aa7.js"
]
}

2
squeaknode/admin/webapp/static/build/index.html
View file

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#1da1f2"/><meta nam="description" content="Squeaknode!"/><meta name="og:title" content="Squeaknode"/><meta name="og:description" content="check out my the Squeaknode I made"/><link href="https://fonts.googleapis.com/css2?family=Assistant&display=swap" rel="stylesheet"><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Squeaknode</title><script defer="defer" src="/static/js/main.bda102e3.js"></script><link href="/static/css/main.206389cd.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#1da1f2"/><meta nam="description" content="Squeaknode!"/><meta name="og:title" content="Squeaknode"/><meta name="og:description" content="check out my the Squeaknode I made"/><link href="https://fonts.googleapis.com/css2?family=Assistant&display=swap" rel="stylesheet"><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>Squeaknode</title><script defer="defer" src="/static/js/main.93bc4aa7.js"></script><link href="/static/css/main.206389cd.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

3
squeaknode/admin/webapp/static/build/static/js/main.93bc4aa7.js Normal file
View file

File diff suppressed because one or more lines are too long

0
squeaknode/admin/webapp/static/build/static/js/main.bda102e3.js.LICENSE.txt → squeaknode/admin/webapp/static/build/static/js/main.93bc4aa7.js.LICENSE.txt
View file

1
squeaknode/admin/webapp/static/build/static/js/main.93bc4aa7.js.map Normal file
View file

File diff suppressed because one or more lines are too long

3
squeaknode/admin/webapp/static/build/static/js/main.bda102e3.js
View file

File diff suppressed because one or more lines are too long

1
squeaknode/admin/webapp/static/build/static/js/main.bda102e3.js.map
View file

File diff suppressed because one or more lines are too long