fix: template defects
This commit is contained in:
@@ -8,6 +8,7 @@ import {useMarkdown} from "../../utils/queries/markdown-queries";
|
||||
import {usePath} from "../../utils/queries/path-queries";
|
||||
import {useMarkdownSetting} from "../../utils/queries/markdown-setting-queries";
|
||||
import {useMarkdownTemplate} from "../../utils/queries/markdown-template-queries";
|
||||
import {useMarkdownTemplateSetting} from "../../utils/queries/markdown-template-setting-queries";
|
||||
|
||||
const MarkdownContent = () => {
|
||||
const { id } = useParams();
|
||||
@@ -15,8 +16,8 @@ const MarkdownContent = () => {
|
||||
const {data: markdown, isLoading, error} = useMarkdown(id);
|
||||
const {data: path, isFetching: isPathFetching} = usePath(markdown?.path_id);
|
||||
const {data: setting, isFetching: isSettingFetching} = useMarkdownSetting(markdown?.setting_id);
|
||||
const {data: template_setting, isFetching: isTemplateSettingFetching} = useMarkdownTemplate(setting?.template_setting_id);
|
||||
|
||||
const {data: templateSetting, isFetching: isTemplateSettingFetching} = useMarkdownTemplateSetting(setting?.template_setting_id);
|
||||
const {data: template, isFetching: isTemplateFetching} = useMarkdownTemplate(templateSetting?.template_id);
|
||||
|
||||
useEffect(() => {
|
||||
if(markdown && markdown.title === "index" && path){
|
||||
@@ -25,7 +26,7 @@ const MarkdownContent = () => {
|
||||
}, [markdown, path]);
|
||||
|
||||
|
||||
const notReady = isLoading || isPathFetching || isSettingFetching || isTemplateSettingFetching;
|
||||
const notReady = isLoading || isPathFetching || isSettingFetching || isTemplateSettingFetching || isTemplateFetching;
|
||||
|
||||
if (notReady) {
|
||||
return <div>Loading...</div>;
|
||||
@@ -45,9 +46,9 @@ const MarkdownContent = () => {
|
||||
</Link>
|
||||
</PermissionGuard>
|
||||
</div>
|
||||
<MarkdownView content={JSON.parse(markdown.content)} template={template_setting}/>
|
||||
<MarkdownView content={JSON.parse(markdown.content)} template={template}/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default MarkdownContent;
|
||||
export default MarkdownContent;
|
||||
|
||||
Reference in New Issue
Block a user