Fix/bulk action (#38)

#30 --------- Signed-off-by: seven <[email protected]>
geek-fun · Mar 31, 2024 · fb7e824 · fb7e824
1 parent 81a1e8c
commit fb7e824
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/common/editor.ts b/src/common/editor.ts
@@ -226,7 +226,7 @@ export const buildSearchToken = (lines: Array<{ lineNumber: number; lineContent:
     const qdsl = lines
       .slice(lineNumber, endLineNumber)
       .map(({ lineContent }) => lineContent)
-      .join('');
+      .join('\n');
 
     return {
       qdsl,

diff --git a/src/common/httpClient.ts b/src/common/httpClient.ts
@@ -35,7 +35,7 @@ const fetchWrapper = async ({
   method: string;
   path?: string;
   queryParameters?: string;
-  payload?: unknown;
+  payload?: string;
   username?: string;
   password?: string;
   host: string;
@@ -51,7 +51,7 @@ const fetchWrapper = async ({
   const { data, status, details } = await fetchApi.fetch(url, {
     method,
     authorization,
-    payload: payload ? JSON.stringify(payload) : undefined,
+    payload,
     ssl,
   });
   return handleFetch({ data, status, details });
@@ -72,7 +72,7 @@ export const loadHttpClient = (con: {
       queryParameters,
       ssl: con.sslCertVerification,
     }),
-  post: async (path: string, queryParameters?: string, payload?: unknown) =>
+  post: async (path: string, queryParameters?: string, payload?: string) =>
     fetchWrapper({
       ...con,
       method: 'POST',
@@ -81,7 +81,7 @@ export const loadHttpClient = (con: {
       payload,
       ssl: con.sslCertVerification,
     }),
-  put: async (path: string, queryParameters?: string, payload?: unknown) =>
+  put: async (path: string, queryParameters?: string, payload?: string) =>
     fetchWrapper({
       ...con,
       method: 'PUT',
@@ -91,7 +91,7 @@ export const loadHttpClient = (con: {
       ssl: con.sslCertVerification,
     }),
 
-  delete: async (path: string, queryParameters?: string, payload?: unknown) =>
+  delete: async (path: string, queryParameters?: string, payload?: string) =>
     fetchWrapper({
       ...con,
       method: 'DELETE',

diff --git a/src/store/connectionStore.ts b/src/store/connectionStore.ts
@@ -137,7 +137,7 @@ export const useConnectionStore = defineStore('connectionStore', {
       const client = loadHttpClient(this.established);
 
       const reqPath = buildPath(index, path);
-      const body = qdsl ? JSON.parse(qdsl) : undefined;
+      const body = qdsl ?? undefined;
 
       const dispatch: { [method: string]: () => Promise<unknown> } = {
         POST: async () => client.post(reqPath, undefined, body),

diff --git a/src/views/editor/index.vue b/src/views/editor/index.vue
@@ -176,7 +176,9 @@ const executeQueryAction = async (
       });
       return;
     }
-
+    if (action.path.includes('_bulk')) {
+      action.qdsl += '\n';
+    }
     const data = await searchQDSL({
       ...action,
       index: action.index || established.value?.activeIndex?.index,