From cbdd56e57783442c4a0ef2dbbceb65df30c9f146 Mon Sep 17 00:00:00 2001 From: Anoop M D Date: Mon, 2 Oct 2023 15:38:50 +0530 Subject: [PATCH] chore: added some todo's for future code cleanup --- .../components/Sidebar/Collections/index.js | 55 +++++++++++-------- .../ReduxStore/slices/collections/actions.js | 8 ++- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/packages/bruno-app/src/components/Sidebar/Collections/index.js b/packages/bruno-app/src/components/Sidebar/Collections/index.js index 4d427ee35..af54350e4 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/index.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/index.js @@ -1,6 +1,12 @@ import React, { useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import { IconSearch, IconFolders, IconArrowsSort, IconSortAscendingLetters, IconSortDescendingLetters } from '@tabler/icons'; +import { + IconSearch, + IconFolders, + IconArrowsSort, + IconSortAscendingLetters, + IconSortDescendingLetters +} from '@tabler/icons'; import Collection from '../Collections/Collection'; import CreateCollection from '../CreateCollection'; import StyledWrapper from './StyledWrapper'; @@ -9,44 +15,47 @@ import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; import { sortCollections } from 'providers/ReduxStore/slices/collections/actions'; +// todo: move this to a separate folder +// the coding convention is to keep all the components in a folder named after the component const CollectionsBadge = () => { - const dispatch = useDispatch() + const dispatch = useDispatch(); const { collections } = useSelector((state) => state.collections); const { collectionSortOrder } = useSelector((state) => state.collections); const sortCollectionOrder = () => { let order; switch (collectionSortOrder) { case 'default': - order = 'alphabetical' + order = 'alphabetical'; break; case 'alphabetical': - order = 'reverseAlphabetical' + order = 'reverseAlphabetical'; break; case 'reverseAlphabetical': - order = 'default' + order = 'default'; break; } - dispatch(sortCollections({ order })) - } + dispatch(sortCollections({ order })); + }; return (
-
+
Collections
- { - collections.length >= 1 && - } - + )}
); @@ -95,12 +104,12 @@ const Collections = () => {
{collections && collections.length ? collections.map((c) => { - return ( - - - - ); - }) + return ( + + + + ); + }) : null}
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js index 856431e9b..0c6945ae9 100644 --- a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js +++ b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js @@ -145,10 +145,12 @@ export const cancelRequest = (cancelTokenUid, item, collection) => (dispatch) => }) .catch((err) => console.log(err)); }; + +// todo: this can be directly put inside the collections/index.js file +// the coding convention is to put only actions that need ipc in this file export const sortCollections = (order) => (dispatch) => { - console.log("working") - dispatch(_sortCollections(order)) -} + dispatch(_sortCollections(order)); +}; export const runCollectionFolder = (collectionUid, folderUid, recursive) => (dispatch, getState) => { const state = getState(); const collection = findCollectionByUid(state.collections.collections, collectionUid);