mirror of
https://github.com/usebruno/bruno.git
synced 2025-02-02 19:09:25 +01:00
feat: folder documentation (#3206)
* add docs, save not working yet * working folder docs * revert unrelated changes * prettier fix * allow save folder with command * include folder docs in `bruno-collection` json export * docs --------- Co-authored-by: Filip Gala <filip.gala@student.tuke.sk> Co-authored-by: lohit <lohxt.space@gmail.com>
This commit is contained in:
parent
ee715a6dc6
commit
dc469afeea
@ -0,0 +1,10 @@
|
|||||||
|
import styled from 'styled-components';
|
||||||
|
|
||||||
|
const StyledWrapper = styled.div`
|
||||||
|
.editing-mode {
|
||||||
|
cursor: pointer;
|
||||||
|
color: ${(props) => props.theme.colors.text.yellow};
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
export default StyledWrapper;
|
@ -0,0 +1,63 @@
|
|||||||
|
import 'github-markdown-css/github-markdown.css';
|
||||||
|
import get from 'lodash/get';
|
||||||
|
import { updateFolderDocs } from 'providers/ReduxStore/slices/collections';
|
||||||
|
import { useTheme } from 'providers/Theme';
|
||||||
|
import { useState } from 'react';
|
||||||
|
import { useDispatch, useSelector } from 'react-redux';
|
||||||
|
import { saveFolderRoot } from 'providers/ReduxStore/slices/collections/actions';
|
||||||
|
import Markdown from 'components/MarkDown';
|
||||||
|
import CodeEditor from 'components/CodeEditor';
|
||||||
|
import StyledWrapper from './StyledWrapper';
|
||||||
|
|
||||||
|
const Documentation = ({ collection, folder }) => {
|
||||||
|
const dispatch = useDispatch();
|
||||||
|
const { displayedTheme } = useTheme();
|
||||||
|
const preferences = useSelector((state) => state.app.preferences);
|
||||||
|
const [isEditing, setIsEditing] = useState(false);
|
||||||
|
const docs = get(folder, 'root.docs', '');
|
||||||
|
|
||||||
|
const toggleViewMode = () => {
|
||||||
|
setIsEditing((prev) => !prev);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onEdit = (value) => {
|
||||||
|
dispatch(
|
||||||
|
updateFolderDocs({
|
||||||
|
folderUid: folder.uid,
|
||||||
|
collectionUid: collection.uid,
|
||||||
|
docs: value
|
||||||
|
})
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const onSave = () => dispatch(saveFolderRoot(collection.uid, folder.uid));
|
||||||
|
|
||||||
|
if (!folder) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<StyledWrapper className="flex flex-col gap-y-1 h-full w-full relative">
|
||||||
|
<div className="editing-mode" role="tab" onClick={toggleViewMode}>
|
||||||
|
{isEditing ? 'Preview' : 'Edit'}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{isEditing ? (
|
||||||
|
<CodeEditor
|
||||||
|
collection={collection}
|
||||||
|
theme={displayedTheme}
|
||||||
|
font={get(preferences, 'font.codeFont', 'default')}
|
||||||
|
fontSize={get(preferences, 'font.codeFontSize')}
|
||||||
|
value={docs || ''}
|
||||||
|
onEdit={onEdit}
|
||||||
|
onSave={onSave}
|
||||||
|
mode="application/text"
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Markdown collectionPath={collection.pathname} onDoubleClick={toggleViewMode} content={docs} />
|
||||||
|
)}
|
||||||
|
</StyledWrapper>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Documentation;
|
@ -7,6 +7,7 @@ import Script from './Script';
|
|||||||
import Tests from './Tests';
|
import Tests from './Tests';
|
||||||
import StyledWrapper from './StyledWrapper';
|
import StyledWrapper from './StyledWrapper';
|
||||||
import Vars from './Vars';
|
import Vars from './Vars';
|
||||||
|
import Documentation from './Documentation';
|
||||||
import DotIcon from 'components/Icons/Dot';
|
import DotIcon from 'components/Icons/Dot';
|
||||||
|
|
||||||
const ContentIndicator = () => {
|
const ContentIndicator = () => {
|
||||||
@ -60,6 +61,9 @@ const FolderSettings = ({ collection, folder }) => {
|
|||||||
case 'vars': {
|
case 'vars': {
|
||||||
return <Vars collection={collection} folder={folder} />;
|
return <Vars collection={collection} folder={folder} />;
|
||||||
}
|
}
|
||||||
|
case 'docs': {
|
||||||
|
return <Documentation collection={collection} folder={folder} />;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -89,6 +93,9 @@ const FolderSettings = ({ collection, folder }) => {
|
|||||||
Vars
|
Vars
|
||||||
{activeVarsCount > 0 && <sup className="ml-1 font-medium">{activeVarsCount}</sup>}
|
{activeVarsCount > 0 && <sup className="ml-1 font-medium">{activeVarsCount}</sup>}
|
||||||
</div>
|
</div>
|
||||||
|
<div className={getTabClassname('docs')} role="tab" onClick={() => setTab('docs')}>
|
||||||
|
Docs
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<section className={`flex mt-4 h-full`}>{getTabPanel(tab)}</section>
|
<section className={`flex mt-4 h-full`}>{getTabPanel(tab)}</section>
|
||||||
</div>
|
</div>
|
||||||
|
@ -6,7 +6,12 @@ import { useSelector, useDispatch } from 'react-redux';
|
|||||||
import EnvironmentSettings from 'components/Environments/EnvironmentSettings';
|
import EnvironmentSettings from 'components/Environments/EnvironmentSettings';
|
||||||
import NetworkError from 'components/ResponsePane/NetworkError';
|
import NetworkError from 'components/ResponsePane/NetworkError';
|
||||||
import NewRequest from 'components/Sidebar/NewRequest';
|
import NewRequest from 'components/Sidebar/NewRequest';
|
||||||
import { sendRequest, saveRequest, saveCollectionRoot } from 'providers/ReduxStore/slices/collections/actions';
|
import {
|
||||||
|
sendRequest,
|
||||||
|
saveRequest,
|
||||||
|
saveCollectionRoot,
|
||||||
|
saveFolderRoot
|
||||||
|
} from 'providers/ReduxStore/slices/collections/actions';
|
||||||
import { findCollectionByUid, findItemInCollection } from 'utils/collections';
|
import { findCollectionByUid, findItemInCollection } from 'utils/collections';
|
||||||
import { closeTabs, switchTab } from 'providers/ReduxStore/slices/tabs';
|
import { closeTabs, switchTab } from 'providers/ReduxStore/slices/tabs';
|
||||||
import { getKeyBindingsForActionAllOS } from './keyMappings';
|
import { getKeyBindingsForActionAllOS } from './keyMappings';
|
||||||
@ -43,7 +48,11 @@ export const HotkeysProvider = (props) => {
|
|||||||
if (collection) {
|
if (collection) {
|
||||||
const item = findItemInCollection(collection, activeTab.uid);
|
const item = findItemInCollection(collection, activeTab.uid);
|
||||||
if (item && item.uid) {
|
if (item && item.uid) {
|
||||||
dispatch(saveRequest(activeTab.uid, activeTab.collectionUid));
|
if (activeTab.type === 'folder-settings') {
|
||||||
|
dispatch(saveFolderRoot(collection.uid, item.uid));
|
||||||
|
} else {
|
||||||
|
dispatch(saveRequest(activeTab.uid, activeTab.collectionUid));
|
||||||
|
}
|
||||||
} else if (activeTab.type === 'collection-settings') {
|
} else if (activeTab.type === 'collection-settings') {
|
||||||
dispatch(saveCollectionRoot(collection.uid));
|
dispatch(saveCollectionRoot(collection.uid));
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
import { uuid } from 'utils/common';
|
import { uuid } from 'utils/common';
|
||||||
import path from 'path';
|
import { find, map, forOwn, concat, filter, each, cloneDeep, get, set } from 'lodash';
|
||||||
import { find, map, forOwn, concat, filter, each, cloneDeep, get, set, debounce } from 'lodash';
|
|
||||||
import { createSlice } from '@reduxjs/toolkit';
|
import { createSlice } from '@reduxjs/toolkit';
|
||||||
import {
|
import {
|
||||||
addDepth,
|
addDepth,
|
||||||
@ -13,6 +12,7 @@ import {
|
|||||||
findEnvironmentInCollection,
|
findEnvironmentInCollection,
|
||||||
findItemInCollection,
|
findItemInCollection,
|
||||||
findItemInCollectionByPathname,
|
findItemInCollectionByPathname,
|
||||||
|
isItemAFolder,
|
||||||
isItemARequest
|
isItemARequest
|
||||||
} from 'utils/collections';
|
} from 'utils/collections';
|
||||||
import { parsePathParams, parseQueryParams, splitOnFirst, stringifyQueryParams } from 'utils/url';
|
import { parsePathParams, parseQueryParams, splitOnFirst, stringifyQueryParams } from 'utils/url';
|
||||||
@ -1733,6 +1733,15 @@ export const collectionsSlice = createSlice({
|
|||||||
item.draft.request.docs = action.payload.docs;
|
item.draft.request.docs = action.payload.docs;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
updateFolderDocs: (state, action) => {
|
||||||
|
const collection = findCollectionByUid(state.collections, action.payload.collectionUid);
|
||||||
|
const folder = collection ? findItemInCollection(collection, action.payload.folderUid) : null;
|
||||||
|
if (folder) {
|
||||||
|
if (isItemAFolder(folder)) {
|
||||||
|
set(folder, 'root.docs', action.payload.docs);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -1827,7 +1836,8 @@ export const {
|
|||||||
runRequestEvent,
|
runRequestEvent,
|
||||||
runFolderEvent,
|
runFolderEvent,
|
||||||
resetCollectionRunner,
|
resetCollectionRunner,
|
||||||
updateRequestDocs
|
updateRequestDocs,
|
||||||
|
updateFolderDocs
|
||||||
} = collectionsSlice.actions;
|
} = collectionsSlice.actions;
|
||||||
|
|
||||||
export default collectionsSlice.reducer;
|
export default collectionsSlice.reducer;
|
||||||
|
@ -404,7 +404,7 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
|
|||||||
request: {}
|
request: {}
|
||||||
};
|
};
|
||||||
|
|
||||||
let { request, meta } = si?.root || {};
|
let { request, meta, docs } = si?.root || {};
|
||||||
let { headers, script = {}, vars = {}, tests } = request || {};
|
let { headers, script = {}, vars = {}, tests } = request || {};
|
||||||
|
|
||||||
// folder level headers
|
// folder level headers
|
||||||
@ -436,6 +436,11 @@ export const transformCollectionToSaveToExportAsFile = (collection, options = {}
|
|||||||
di.root.request.tests = tests;
|
di.root.request.tests = tests;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// folder level docs
|
||||||
|
if (docs?.length) {
|
||||||
|
di.root.docs = docs;
|
||||||
|
}
|
||||||
|
|
||||||
if (meta?.name) {
|
if (meta?.name) {
|
||||||
di.root.meta = {};
|
di.root.meta = {};
|
||||||
di.root.meta.name = meta?.name;
|
di.root.meta.name = meta?.name;
|
||||||
|
Loading…
Reference in New Issue
Block a user