Loading...
);
}
+ console.log("template", template);
+ console.log("selectedTemplateId", selectedTemplateId);
return setting ? (
Template Setting
@@ -52,12 +64,14 @@ const MarkdownTemplateSettingPanel = ({markdownSetting, onClose}) => {
@@ -77,7 +91,7 @@ const MarkdownTemplateSettingPanel = ({markdownSetting, onClose}) => {
type="button"
onClick={handleCreateTemplateSetting}
>
- Create Template Setting
+ Create Template Setting
);
};
diff --git a/src/components/Settings/PathSettings/WebhookSettingPanel.js b/src/components/Settings/PathSettings/WebhookSettingPanel.js
index 0c9c81f..28102ae 100644
--- a/src/components/Settings/PathSettings/WebhookSettingPanel.js
+++ b/src/components/Settings/PathSettings/WebhookSettingPanel.js
@@ -11,7 +11,7 @@ import {
useUpdateWebhook,
useDeleteWebhook,
} from "../../../utils/queries/webhook-queries";
-import {useUpdatePathSetting} from "../../../utils/queries/setting-queries";
+import {useUpdatePathSetting} from "../../../utils/queries/path-setting-queries";
const WebhookSettingPanel = ({pathSetting, onClose}) => {
diff --git a/src/utils/queries/markdown-queries.js b/src/utils/queries/markdown-queries.js
index 76e954f..87c101f 100644
--- a/src/utils/queries/markdown-queries.js
+++ b/src/utils/queries/markdown-queries.js
@@ -61,7 +61,7 @@ export const useSaveMarkdown = () => {
const url = id
? `${config.BACKEND_HOST}/api/markdown/${id}`
: `${config.BACKEND_HOST}/api/markdown/`;
- const method = id ? "PUT" : "POST";
+ const method = id ? "PATCH" : "POST";
return fetch_(url, {
method,
body: JSON.stringify(data),
@@ -70,6 +70,7 @@ export const useSaveMarkdown = () => {
onSuccess: (res) => {
queryClient.invalidateQueries(["markdownsByPath", res.path_id]);
queryClient.invalidateQueries(["markdown", res.id]);
+ queryClient.invalidateQueries("tree");
},
});
};
@@ -87,6 +88,7 @@ export const useMoveMarkdown = () => {
{
onSuccess: () => {
queryClient.invalidateQueries("paths");
+ queryClient.invalidateQueries("tree");
}
}
);
diff --git a/src/utils/queries/markdown-setting-queries.js b/src/utils/queries/markdown-setting-queries.js
new file mode 100644
index 0000000..b06a2cb
--- /dev/null
+++ b/src/utils/queries/markdown-setting-queries.js
@@ -0,0 +1,75 @@
+import {useConfig} from "../../ConfigProvider";
+import {useMutation, useQuery, useQueryClient} from "react-query";
+import {fetch_} from "../request-utils";
+
+export const useMarkdownSettings = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useQuery(
+ "markdown_setting",
+ () => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/`),
+ {
+ onSuccess: (data) => {
+ if(data){
+ for(const setting of data)
+ queryClient.invalidateQueries(["markdown_setting", setting.id]);
+ }
+ }
+ }
+ );
+};
+
+export const useMarkdownSetting = (setting_id) => {
+ const config = useConfig();
+ return useQuery(
+ ["markdown_setting", setting_id],
+ () => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/${setting_id}`, {}), {
+ enabled: !!setting_id,
+ }
+ );
+};
+
+
+export const useCreateMarkdownSetting = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useMutation(
+ (data) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/`, {
+ method: "POST",
+ body: JSON.stringify(data)
+ }), {
+ onSuccess: (data) => {
+ queryClient.invalidateQueries(["markdown_setting", data.id]);
+ }
+ }
+ );
+};
+
+
+export const useUpdateMarkdownSetting = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useMutation(
+ ({id, data}) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/${id}`, {
+ method: "PATCH",
+ body: JSON.stringify(data)
+ }),{
+ onSuccess: (data, variables) => {
+ queryClient.invalidateQueries(["markdown_setting", variables.id]);
+ }
+ });
+};
+
+export const useDeleteMarkdownSetting = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useMutation(
+ (id) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/${id}`, {
+ method: "DELETE",
+ }),{
+ onSuccess: (data) => {
+ queryClient.invalidateQueries(["markdown_setting", data.id]);
+ }
+ }
+ );
+};
diff --git a/src/utils/queries/template-queries.js b/src/utils/queries/markdown-template-queries.js
similarity index 57%
rename from src/utils/queries/template-queries.js
rename to src/utils/queries/markdown-template-queries.js
index 7d61e2a..e935a7f 100644
--- a/src/utils/queries/template-queries.js
+++ b/src/utils/queries/markdown-template-queries.js
@@ -24,7 +24,7 @@ export const useMarkdownTemplates = () => {
onSuccess: (data) => {
if(data){
for(const template of data){
- queryClient.setQueryData(["markdown_template", template.id], data);
+ queryClient.setQueryData(["markdown_template", template.id], template);
}
}
}
@@ -99,75 +99,3 @@ export const useSaveMarkdownTemplate = () => {
}
});
}
-
-export const useMarkdownTemplateSettings = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useQuery(
- "markdown_template_settings",
- () => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/`), {
- onSuccess: (data) => {
- if(data){
- for(const setting of data){
- queryClient.invalidateQueries(["markdown_template_setting", settings.id]);
- }
- }
- }
- }
- );
-};
-
-export const useMarkdownTemplateSetting = (setting_id) => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useQuery(
- ["markdown_template_setting", setting_id],
- () => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/${settings.id}`), {
- enabled: !!setting_id,
- }
- );
-};
-
-
-export const useCreateMarkdownTemplateSetting = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useMutation(({id, data}) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/${id}`, {
- method: "POST",
- body: JSON.stringify(data),
- }), {
- onSuccess: (data) => {
- queryClient.invalidateQueries(["markdown_template_setting", data.id]);
- }
- });
-};
-
-export const useUpdateMarkdownTemplateSetting = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useMutation(
- ({id, data}) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/${id}`, {
- method: "PUT",
- body: JSON.stringify(data),
- }),{
- onSuccess: (res) => {
- queryClient.invalidateQueries(["markdown_template_setting", res.id]);
- queryClient.invalidateQueries("markdown_template_settings");
- }
- }
- );
-};
-
-export const useDeleteMarkdownTemplateSetting = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useMutation(
- ({id}) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/${id}`, {
- method: "DELETE",
- }), {
- onSuccess: (res, variables) => {
- queryClient.invalidateQueries(["markdown_template_setting", variables.id]);
- }
- }
- );
-};
diff --git a/src/utils/queries/markdown-template-setting-queries.js b/src/utils/queries/markdown-template-setting-queries.js
new file mode 100644
index 0000000..3c3d08e
--- /dev/null
+++ b/src/utils/queries/markdown-template-setting-queries.js
@@ -0,0 +1,74 @@
+import {useConfig} from "../../ConfigProvider";
+import {useMutation, useQuery, useQueryClient} from "react-query";
+import {fetch_} from "../request-utils";
+
+export const useMarkdownTemplateSettings = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useQuery(
+ "markdown_template_settings",
+ () => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/`), {
+ onSuccess: (data) => {
+ if(data){
+ for(const setting of data){
+ queryClient.invalidateQueries(["markdown_template_setting", settings.id]);
+ }
+ }
+ }
+ }
+ );
+};
+
+export const useMarkdownTemplateSetting = (setting_id) => {
+ const config = useConfig();
+ return useQuery(
+ ["markdown_template_setting", setting_id],
+ () => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/${setting_id}`), {
+ enabled: !!setting_id,
+ }
+ );
+};
+
+
+export const useCreateMarkdownTemplateSetting = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useMutation((data) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/`, {
+ method: "POST",
+ body: JSON.stringify(data),
+ }), {
+ onSuccess: (data) => {
+ queryClient.invalidateQueries(["markdown_template_setting", data.id]);
+ }
+ });
+};
+
+export const useUpdateMarkdownTemplateSetting = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useMutation(
+ ({id, data}) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/${id}`, {
+ method: "PATCH",
+ body: JSON.stringify(data),
+ }),{
+ onSuccess: (res) => {
+ queryClient.invalidateQueries(["markdown_template_setting", res.id]);
+ queryClient.invalidateQueries("markdown_template_settings");
+ }
+ }
+ );
+};
+
+export const useDeleteMarkdownTemplateSetting = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useMutation(
+ ({id}) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/template/${id}`, {
+ method: "DELETE",
+ }), {
+ onSuccess: (res, variables) => {
+ queryClient.invalidateQueries(["markdown_template_setting", variables.id]);
+ }
+ }
+ );
+};
diff --git a/src/utils/queries/path-setting-queries.js b/src/utils/queries/path-setting-queries.js
new file mode 100644
index 0000000..957060d
--- /dev/null
+++ b/src/utils/queries/path-setting-queries.js
@@ -0,0 +1,80 @@
+import {useConfig} from "../../ConfigProvider";
+import {useMutation, useQuery, useQueryClient} from "react-query";
+import {fetch_} from "../request-utils";
+
+export const usePathSettings = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useQuery(
+ "path_settings",
+ () => fetch_(`${config.BACKEND_HOST}/api/setting/path/`),
+ {
+ onSuccess: (data) => {
+ if(data){
+ for(const setting of data)
+ queryClient.setQueryData(["path_setting", setting.id], setting);
+ }
+ }
+ }
+ );
+};
+
+export const usePathSetting = (setting_id) => {
+ const config = useConfig();
+ return useQuery(
+ ["path_setting", setting_id],
+ () => fetch_(`${config.BACKEND_HOST}/api/setting/path/${setting_id}`),
+ {
+ enabled: !!setting_id,
+ }
+ );
+};
+
+export const useCreatePathSetting = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useMutation(
+ (data) => fetch_(`${config.BACKEND_HOST}/api/setting/path/`, {
+ method: "POST",
+ body: JSON.stringify(data)
+ }), {
+ onSuccess: (data) => {
+ queryClient.invalidateQueries(["path_setting", data.id]);
+ queryClient.invalidateQueries("path_settings");
+ }
+ }
+ );
+};
+
+
+export const useUpdatePathSetting = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useMutation(
+ ({id, data}) => fetch_(`${config.BACKEND_HOST}/api/setting/path/${id}`, {
+ method: "PATCH",
+ body: JSON.stringify(data)
+ }), {
+ onSuccess: (data, variables) => {
+ queryClient.invalidateQueries(["path_setting", variables.id]);
+ queryClient.invalidateQueries("path_settings");
+ }
+ }
+ );
+};
+
+
+export const useDeletePathSetting = () => {
+ const config = useConfig();
+ const queryClient = useQueryClient();
+ return useMutation(
+ (id) => fetch_(`${config.BACKEND_HOST}/api/setting/path/${id}`, {
+ method: "DELETE",
+ }),{
+ onSuccess: (data, variables) => {
+ queryClient.invalidateQueries(["path_setting", variables.id]);
+ queryClient.invalidateQueries("path_settings");
+ }
+ }
+ );
+};
diff --git a/src/utils/queries/setting-queries.js b/src/utils/queries/setting-queries.js
deleted file mode 100644
index cf9bd0a..0000000
--- a/src/utils/queries/setting-queries.js
+++ /dev/null
@@ -1,151 +0,0 @@
-import {fetch_} from "../request-utils";
-import {useConfig} from "../../ConfigProvider";
-import {useMutation, useQuery, useQueryClient} from "react-query";
-
-export const usePathSettings = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useQuery(
- "path_settings",
- () => fetch_(`${config.BACKEND_HOST}/api/setting/path/`),
- {
- onSuccess: (data) => {
- if(data){
- for(const setting of data)
- queryClient.setQueryData(["path_setting", setting.id], setting);
- }
- }
- }
- );
-};
-
-export const usePathSetting = (setting_id) => {
- const config = useConfig();
- return useQuery(
- ["path_setting", setting_id],
- () => fetch_(`${config.BACKEND_HOST}/api/setting/path/${setting_id}`),
- {
- enabled: !!setting_id,
- }
- );
-};
-
-export const useCreatePathSetting = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useMutation(
- (data) => fetch_(`${config.BACKEND_HOST}/api/setting/path/`, {
- method: "POST",
- body: JSON.stringify(data)
- }), {
- onSuccess: (data) => {
- queryClient.invalidateQueries(["path_setting", data.id]);
- queryClient.invalidateQueries("path_setting");
- }
- }
- );
-};
-
-
-export const useUpdatePathSetting = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useMutation(
- ({id, data}) => fetch_(`${config.BACKEND_HOST}/api/setting/path/${id}`, {
- method: "PATCH",
- body: JSON.stringify(data)
- }), {
- onSuccess: (data, variables) => {
- queryClient.invalidateQueries(["path_setting", variables.id]);
- queryClient.invalidateQueries("path_setting");
- }
- }
- );
-};
-
-export const useDeletePathSetting = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useMutation(
- (id) => fetch_(`${config.BACKEND_HOST}/api/setting/path/${id}`, {
- method: "DELETE",
- }),{
- onSuccess: (data, variables) => {
- queryClient.invalidateQueries(["path_setting", variables.id]);
- queryClient.invalidateQueries("path_setting");
- }
- }
- );
-};
-
-export const useMarkdownSettings = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useQuery(
- "markdown_setting",
- () => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/`),
- {
- onSuccess: (data) => {
- if(data){
- for(const setting of data)
- queryClient.invalidateQueries(["markdown_setting", setting.id]);
- }
- }
- }
- );
-};
-
-export const useMarkdownSetting = (setting_id) => {
- const config = useConfig();
- return useQuery(
- ["markdown_setting", setting_id],
- () => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/${setting_id}`, {}), {
- enabled: !!setting_id,
- }
- );
-};
-
-
-export const useCreateMarkdownSetting = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useMutation(
- (data) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/`, {
- method: "POST",
- body: JSON.stringify(data)
- }), {
- onSuccess: (data) => {
- queryClient.invalidateQueries(["path_setting", data.id]);
- }
- }
- );
-};
-
-
-export const useUpdateMarkdownSetting = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useMutation(
- ({id, data}) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/${id}`, {
- method: "PATCH",
- body: JSON.stringify(data)
- }),{
- onSuccess: (data) => {
- queryClient.invalidateQueries(["path_setting", data.id]);
- }
- });
-};
-
-export const useDeleteMarkdownSetting = () => {
- const config = useConfig();
- const queryClient = useQueryClient();
- return useMutation(
- (id) => fetch_(`${config.BACKEND_HOST}/api/setting/markdown/${id}`, {
- method: "DELETE",
- }),{
- onSuccess: (data) => {
- queryClient.invalidateQueries(["path_setting", data.id]);
- }
- }
- );
-};
diff --git a/src/utils/queries/webhook-queries.js b/src/utils/queries/webhook-queries.js
index 83b2fa2..9e8c686 100644
--- a/src/utils/queries/webhook-queries.js
+++ b/src/utils/queries/webhook-queries.js
@@ -77,7 +77,7 @@ export const useWebhookSettings = () => {
const queryClient = useQueryClient();
return useQuery(
"webhook_setting",
- () => fetch_(`${config.BACKEND_HOST}/api/setting/webhook/`),
+ () => fetch_(`${config.BACKEND_HOST}/api/setting/path/webhook/`),
{
onSuccess: (data) => {
if(data){
@@ -94,7 +94,7 @@ export const useWebhookSetting = (setting_id) => {
const config = useConfig();
return useQuery(
["webhook_setting", setting_id],
- () => fetch_(`${config.BACKEND_HOST}/api/setting/webhook/${setting_id}`),
+ () => fetch_(`${config.BACKEND_HOST}/api/setting/path/webhook/${setting_id}`),
{
enabled: !!setting_id,
});
@@ -105,7 +105,7 @@ export const useCreateWebhookSetting = () => {
const config = useConfig();
const queryClient = useQueryClient();
return useMutation(
- (data) => fetch_(`${config.BACKEND_HOST}/api/setting/webhook/`, {
+ (data) => fetch_(`${config.BACKEND_HOST}/api/setting/path/webhook/`, {
method: "POST",
body: JSON.stringify(data)
}),{
@@ -121,7 +121,7 @@ export const useUpdateWebhookSetting = () => {
const config = useConfig();
const queryClient = useQueryClient();
return useMutation(
- ({id, data}) => fetch_(`${config.BACKEND_HOST}/api/setting/webhook/${id}`, {
+ ({id, data}) => fetch_(`${config.BACKEND_HOST}/api/setting/path/webhook/${id}`, {
method: "PATCH",
body: JSON.stringify(data)
}),{
@@ -138,7 +138,7 @@ export const useDeleteWebhookSetting = () => {
const config = useConfig();
const queryClient = useQueryClient();
return useMutation(
- (id) => fetch_(`${config.BACKEND_HOST}/api/setting/webhook/${id}`, {
+ (id) => fetch_(`${config.BACKEND_HOST}/api/setting/path/webhook/${id}`, {
method: "DELETE",
}),
{