{page.children &&
page.children.map((item, index) => {
@@ -304,26 +283,19 @@ PageItem.propTypes = {
isDragging: PropTypes.bool,
draggedPage: PropTypes.object,
isEditMode: PropTypes.bool,
- infolder: PropTypes.bool,
page: PropTypes.object,
- folder: PropTypes.object,
pages: PropTypes.array,
pageIndex: PropTypes.number,
- folderId: PropTypes.string,
pagesLength: PropTypes.number,
connectDragSource: PropTypes.func,
connectDragPreview: PropTypes.func,
connectDropTarget: PropTypes.func,
- renderFolderMenuItems: PropTypes.func,
duplicatePage: PropTypes.func,
- onSetFolderId: PropTypes.func,
setCurrentPage: PropTypes.func,
onUpdatePage: PropTypes.func,
onDeletePage: PropTypes.func,
- onMovePageToFolder: PropTypes.func,
onMovePage: PropTypes.func,
isOnlyOnePage: PropTypes.bool,
- onMoveFolder: PropTypes.func,
pathStr: PropTypes.string,
currentPageId: PropTypes.string,
addPageInside: PropTypes.func,
diff --git a/frontend/src/pages/wiki2/wiki-nav/wiki-nav-footer.js b/frontend/src/pages/wiki2/wiki-nav/wiki-nav-footer.js
deleted file mode 100644
index 376e80b288..0000000000
--- a/frontend/src/pages/wiki2/wiki-nav/wiki-nav-footer.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import CommonAddTool from '../../../components/common/common-add-tool';
-import AddPageDropdownMenu from './add-page-dropdownmenu';
-import { gettext } from '../../../utils/constants';
-
-class WikiNavFooter extends Component {
-
- constructor(props) {
- super(props);
- this.state = {
- isShowDropdownMenu: false,
- };
- }
-
- toggleDropdown = (event) => {
- event && event.stopPropagation();
- this.setState({ isShowDropdownMenu: !this.state.isShowDropdownMenu });
- };
-
- render() {
- return (
-
-
-
- {this.state.isShowDropdownMenu &&
-
- }
-
-
- );
- }
-}
-
-WikiNavFooter.propTypes = {
- onToggleAddPage: PropTypes.func,
- onToggleAddFolder: PropTypes.func,
-};
-
-export default WikiNavFooter;
diff --git a/frontend/src/pages/wiki2/wiki-nav/wiki-nav.js b/frontend/src/pages/wiki2/wiki-nav/wiki-nav.js
index de76f6ea70..c8d7ea7211 100644
--- a/frontend/src/pages/wiki2/wiki-nav/wiki-nav.js
+++ b/frontend/src/pages/wiki2/wiki-nav/wiki-nav.js
@@ -1,11 +1,8 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
-import { DropdownItem } from 'reactstrap';
import { DropTarget, DragLayer } from 'react-dnd';
import html5DragDropContext from './html5DragDropContext';
-import DraggedFolderItem from './folders/dragged-folder-item';
import DraggedPageItem from './pages/dragged-page-item';
-import WikiNavFooter from './wiki-nav-footer';
import { repoID } from '../../../utils/constants';
import '../css/wiki-nav.css';
@@ -17,26 +14,17 @@ class WikiNav extends Component {
navigation: PropTypes.array,
pages: PropTypes.array,
onTogglePinViewList: PropTypes.func,
- onToggleAddPage: PropTypes.func,
- onToggleAddFolder: PropTypes.func,
- onModifyFolder: PropTypes.func,
- onDeleteFolder: PropTypes.func,
- onMoveFolder: PropTypes.func,
setCurrentPage: PropTypes.func,
onUpdatePage: PropTypes.func,
onDeletePage: PropTypes.func,
onMovePage: PropTypes.func,
- moveFolderToFolder: PropTypes.func,
- movePageOut: PropTypes.func,
duplicatePage: PropTypes.func,
- onSetFolderId: PropTypes.func,
currentPageId: PropTypes.string,
addPageInside: PropTypes.func,
};
constructor(props) {
super(props);
- this.folderClassNameCache = '';
this.idFoldedStatusMap = this.getFoldedFromLocal();
}
@@ -49,145 +37,63 @@ class WikiNav extends Component {
window.localStorage.setItem(`wiki-folded-${repoID}`, JSON.stringify(items));
};
- getFoldState = (folderId) => {
- return this.idFoldedStatusMap[folderId];
+ getFoldState = (pageId) => {
+ return this.idFoldedStatusMap[pageId];
};
- toggleExpand = (folderId) => {
+ toggleExpand = (pageId) => {
const idFoldedStatusMap = this.getFoldedFromLocal();
- if (idFoldedStatusMap[folderId]) {
- delete idFoldedStatusMap[folderId];
+ if (idFoldedStatusMap[pageId]) {
+ delete idFoldedStatusMap[pageId];
} else {
- idFoldedStatusMap[folderId] = true;
+ idFoldedStatusMap[pageId] = true;
}
this.saveFoldedToLocal(idFoldedStatusMap);
this.idFoldedStatusMap = idFoldedStatusMap;
};
- onMovePageToFolder = (source_page_folder_id, moved_page_id, target_page_folder_id) => {
- this.props.onMovePage({
- moved_page_id,
- source_page_folder_id,
- target_page_folder_id,
- target_page_id: null,
- move_position: 'move_below'
- });
- };
-
- renderFolderMenuItems = ({ currentFolderId, onMovePageToFolder }) => {
- // folder lists (in the root directory)
- const { navigation } = this.props;
- let renderFolders = navigation.filter(item => item.type === 'folder' && item.id !== currentFolderId);
- return renderFolders.map(folder => {
- const { id, name } = folder;
- return (
-
- {name}
-
- );
- });
- };
-
- setClassName = (name) => {
- this.folderClassNameCache = name;
- };
-
- getClassName = () => {
- return this.folderClassNameCache;
- };
-
- renderFolder = (folder, index, pagesLength, isOnlyOnePage, id_page_map, layerDragProps) => {
- const { isEditMode, pages } = this.props;
- const folderId = folder.id;
- return (
-
- );
- };
-
- renderPage = (page, index, pagesLength, isOnlyOnePage, id_page_map) => {
+ renderPage = (page, index, pagesLength, isOnlyOnePage, id_page_map, layerDragProps) => {
const { isEditMode, pages } = this.props;
const id = page.id;
if (!pages.find(item => item.id === id)) return;
- const folderId = null; // Pages in the root directory, no folders, use null
return (
item.id === id), page)}
pages={pages}
pageIndex={index}
- folderId={folderId}
isEditMode={isEditMode}
- renderFolderMenuItems={this.renderFolderMenuItems}
duplicatePage={this.props.duplicatePage}
- onSetFolderId={this.props.onSetFolderId}
setCurrentPage={this.props.setCurrentPage}
onUpdatePage={this.props.onUpdatePage}
onDeletePage={this.props.onDeletePage}
- onMovePageToFolder={(targetFolderId) => {
- this.onMovePageToFolder(folderId, page.id, targetFolderId);
- }}
onMovePage={this.props.onMovePage}
- onMoveFolder={this.props.onMoveFolder}
pathStr={page.id}
currentPageId={this.props.currentPageId}
addPageInside={this.props.addPageInside}
getFoldState={this.getFoldState}
toggleExpand={this.toggleExpand}
+ id_page_map={id_page_map}
+ layerDragProps={layerDragProps}
/>
);
};
// eslint-disable-next-line
renderStructureBody = React.forwardRef((layerDragProps, ref) => {
- const { navigation, pages, isEditMode } = this.props;
+ const { navigation, pages } = this.props;
let isOnlyOnePage = false;
if (pages.length === 1) {
isOnlyOnePage = true;
}
- const pagesLength = pages.length;
let id_page_map = {};
pages.forEach(page => id_page_map[page.id] = page);
- const style = { maxHeight: isEditMode ? 'calc(100% - 40px)' : '100%' };
return (
-
+
{navigation.map((item, index) => {
- return item.type === 'folder' ?
- this.renderFolder(item, index, pagesLength, isOnlyOnePage, id_page_map, layerDragProps) :
- this.renderPage(item, index, pagesLength, isOnlyOnePage, id_page_map);
+ return this.renderPage(item, index, pages.length, isOnlyOnePage, id_page_map, layerDragProps);
})}
);
@@ -211,12 +117,6 @@ class WikiNav extends Component {
return (
- {(this.props.isEditMode) &&
-
- }
);
}