Skip to content

[WEB-67] [CMS] rename redux function #355

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

Merged
merged 11 commits into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
started attempting to fix infinite loop issue when calling delete action
  • Loading branch information
brian2w committed Apr 15, 2023
commit b8650b8d280b1aa72dce3198663b27e1831cb694
32 changes: 16 additions & 16 deletions frontend/src/packages/dashboard/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,21 @@ export const newFolder = async (
return response.Response.NewID;
};

// export const deleteFileEntity = async (fileEntityID: string): Promise<void> => {
// const delete_resp = await fetch('/api/filesystem/delete', {
// method: 'POST',
// body: new URLSearchParams({
// EntityID: fileEntityID,
// }),
// });
export const deleteFileEntity = async (fileEntityID: string): Promise<void> => {
const delete_resp = await fetch('/api/filesystem/delete', {
method: 'POST',
body: new URLSearchParams({
EntityID: fileEntityID,
}),
});

// if (!delete_resp.ok) {
// const message = `An error has occured: ${delete_resp.status}`;
// throw new Error(message);
// }
// const response = await delete_resp.json();
if (!delete_resp.ok) {
const message = `An error has occured: ${delete_resp.status}`;
throw new Error(message);
}
const response = await delete_resp.json();

// console.log(response);
// console.log(JSON.stringify(response));
// return;
// };
console.log(response);
console.log(JSON.stringify(response));
return;
};
26 changes: 13 additions & 13 deletions frontend/src/packages/dashboard/components/SideBar/SideBar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { useDispatch } from 'react-redux';
import {
// deleteFileEntityAction,
deleteFileEntityAction,
DeletePayloadType,
} from '../../state/folders/actions';

Expand Down Expand Up @@ -133,17 +133,17 @@ export default function SideBar({
});
};

// // temporary delete file entity button
// const dispatch = useDispatch();
// console.log('deleteFileEntity loop');
// const handleDeleteFile = () => {
// if (selectedFile !== null) {
// const folderPayload: DeletePayloadType = {
// id: selectedFile,
// };
// dispatch(deleteFileEntityAction(folderPayload));
// }
// };
// temporary delete file entity button
const dispatch = useDispatch();
console.log('deleteFileEntity loop 1');
const handleDeleteFile = () => {
if (selectedFile !== null) {
const folderPayload: DeletePayloadType = {
id: selectedFile,
};
dispatch(deleteFileEntityAction(folderPayload));
}
};

const navigate = useNavigate();
const handleEdit = () => {
Expand Down Expand Up @@ -196,7 +196,7 @@ export default function SideBar({
</SidebarButton>
<SidebarButton
bgcolor="#b4c6ff"
// onClick={handleDeleteFile}
onClick={handleDeleteFile}
data-anchor="NewFolderButton"
>
<ButtonIcon>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/packages/dashboard/state/folders/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ export const renameFileEntityAction = createAction<RenamePayloadType>(

// TODO deleteFolderItemAction
// TODO removeFileItemAction
// export const deleteFileEntityAction = createAction<DeletePayloadType>(
// 'folders/deleteFileEntity'
// );
export const deleteFileEntityAction = createAction<DeletePayloadType>(
'folders/deleteFileEntity'
);
8 changes: 4 additions & 4 deletions frontend/src/packages/dashboard/state/folders/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ const reducer = createReducer(initialState, (builder) => {
reducerFns.addFolderItems
);
builder.addCase(foldersActions.addFileItemAction, reducerFns.addFileItems);
// builder.addCase(
// foldersActions.deleteFileEntityAction,
// reducerFns.deleteFileEntityItems
// );
builder.addCase(
foldersActions.deleteFileEntityAction,
reducerFns.deleteFileEntityItems
);
builder.addCase(
foldersActions.renameFileEntityAction,
reducerFns.renameFileEntity
Expand Down
23 changes: 12 additions & 11 deletions frontend/src/packages/dashboard/state/folders/reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,18 @@ export function addFileItems(state: sliceState, action: PayloadAction<File>) {
};
}

// export function deleteFileEntityItems(
// state: sliceState,
// action: PayloadAction<DeletePayloadType>
// ) {
// const { id } = action.payload;

// return {
// ...state,
// items: [...state.items].filter((item) => item.id !== id),
// };
// }
export function deleteFileEntityItems(
state: sliceState,
action: PayloadAction<DeletePayloadType>
) {
const { id } = action.payload;
return {
...state,
items: [...state.items]
.map((item) => ({ ...item }))
.filter((item) => item.id !== id),
};
}

export function renameFileEntity(
state: sliceState,
Expand Down
26 changes: 13 additions & 13 deletions frontend/src/packages/dashboard/state/folders/sagas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ function* addItemSaga({ payload }: { payload: actions.AddPayloadType }) {
}
}

// function* deleteFileEntitySaga({
// payload,
// }: {
// payload: actions.DeletePayloadType;
// }) {
// yield call(API.deleteFileEntity, payload.id);
// // now put results to redux store
// const deleteFileEntityPayload: actions.DeletePayloadType = {
// id: payload.id,
// };
// yield put(actions.deleteFileEntityAction(deleteFileEntityPayload));
// }
function* deleteFileEntitySaga({
payload,
}: {
payload: actions.DeletePayloadType;
}) {
yield call(API.deleteFileEntity, payload.id);
// now put results to redux store
const deleteFileEntityPayload: actions.DeletePayloadType = {
id: payload.id,
};
yield put(actions.deleteFileEntityAction(deleteFileEntityPayload));
}

function* renameFileEntitySaga({
payload: renamePayload,
Expand Down Expand Up @@ -119,7 +119,7 @@ export function* rootFoldersSaga() {
// runs in parallel
yield takeEvery(actions.initAction, initSaga);
yield takeEvery(actions.addItemAction, addItemSaga);
// yield takeEvery(actions.deleteFileEntityAction, deleteFileEntitySaga);
yield takeEvery(actions.deleteFileEntityAction, deleteFileEntitySaga);
yield takeEvery(actions.renameFileEntityAction, renameFileEntitySaga);
yield takeLatest(actions.traverseIntoFolder, traverseIntoFolderSaga);
yield takeLatest(actions.traverseBackFolder, traverseBackFolderSaga);
Expand Down