Docker/flame
Docker/flame
1
0
Fork 0
mirror of https://github.com/pawelmalak/flame.git synced 2025-07-24 21:39:36 +02:00
Code Issues Releases Wiki Activity

Moved entityInUpdate to app state. It applies for apps, categories and bookmarks

Browse source
This commit is contained in:
Paweł Malak 2021-11-22 14:36:00 +01:00
parent d110d9b732
commit dfdd49cf4a
15 changed files with 197 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

29
client/src/components/Bookmarks/Bookmarks.tsx
View file

@ -19,9 +19,6 @@ import { Container, Headline, ActionButton, Spinner, Modal } from '../UI';
// Components
import { BookmarkGrid } from './BookmarkGrid/BookmarkGrid';
import { Form } from './Form/Form';
// Utils
import { bookmarkTemplate, categoryTemplate } from '../../utility';
import { Table } from './Table/Table';
interface Props {
@ -36,13 +33,14 @@ export enum ContentType {
export const Bookmarks = (props: Props): JSX.Element => {
// Get Redux state
const {
bookmarks: { loading, categories },
bookmarks: { loading, categories, categoryInEdit },
auth: { isAuthenticated },
} = useSelector((state: State) => state);
// Get Redux action creators
const dispatch = useDispatch();
const { getCategories } = bindActionCreators(actionCreators, dispatch);
const { getCategories, setEditCategory, setEditBookmark } =
bindActionCreators(actionCreators, dispatch);
// Load categories if array is empty
useEffect(() => {
@ -55,10 +53,6 @@ export const Bookmarks = (props: Props): JSX.Element => {
const [modalIsOpen, setModalIsOpen] = useState(false);
const [formContentType, setFormContentType] = useState(ContentType.category);
const [isInUpdate, setIsInUpdate] = useState(false);
const [categoryInUpdate, setCategoryInUpdate] =
useState<Category>(categoryTemplate);
const [bookmarkInUpdate, setBookmarkInUpdate] =
useState<Bookmark>(bookmarkTemplate);
// Table
const [showTable, setShowTable] = useState(false);
@ -74,6 +68,13 @@ export const Bookmarks = (props: Props): JSX.Element => {
}
}, [isAuthenticated]);
useEffect(() => {
if (categoryInEdit && !showTable) {
setTableContentType(ContentType.bookmark);
setShowTable(true);
}
}, [categoryInEdit]);
// Form actions
const toggleModal = (): void => {
setModalIsOpen(!modalIsOpen);
@ -94,10 +95,10 @@ export const Bookmarks = (props: Props): JSX.Element => {
if (instanceOfCategory(data)) {
setFormContentType(ContentType.category);
setCategoryInUpdate(data);
setEditCategory(data);
} else {
setFormContentType(ContentType.bookmark);
setBookmarkInUpdate(data);
setEditBookmark(data);
}
toggleModal();
@ -121,8 +122,6 @@ export const Bookmarks = (props: Props): JSX.Element => {
modalHandler={toggleModal}
contentType={formContentType}
inUpdate={isInUpdate}
category={categoryInUpdate}
bookmark={bookmarkInUpdate}
/>
</Modal>
@ -145,11 +144,11 @@ export const Bookmarks = (props: Props): JSX.Element => {
icon="mdiPencil"
handler={() => showTableForEditing(ContentType.category)}
/>
{/* <ActionButton
<ActionButton
name="Edit Bookmarks"
icon="mdiPencil"
handler={() => showTableForEditing(ContentType.bookmark)}
/> */}
/>
</div>
)}