Browse Source

fix: empty google sheets error message

Ahmad Kholid 3 years ago
parent
commit
33a7e3c531

+ 10 - 6
src/background/workflow-engine/blocks-handler/handler-google-sheets.js

@@ -9,13 +9,15 @@ import { getBlockConnection } from '../helper';
 
 async function getSpreadsheetValues({ spreadsheetId, range, firstRowAsKey }) {
   const response = await googleSheets.getValues({ spreadsheetId, range });
+  const result = await response.json();
 
-  if (response.status !== 200) {
-    throw new Error(response.statusText);
+  if (!response.ok) {
+    throw new Error(result.statusMessage);
   }
 
-  const { values } = await response.json();
-  const sheetsData = firstRowAsKey ? convert2DArrayToArrayObj(values) : values;
+  const sheetsData = firstRowAsKey
+    ? convert2DArrayToArrayObj(result.values)
+    : result.values;
 
   return sheetsData;
 }
@@ -51,8 +53,10 @@ async function updateSpreadsheetValues(
     },
   });
 
-  if (response.status !== 200) {
-    throw new Error(response.statusText);
+  if (!response.ok) {
+    const error = await response.json();
+
+    throw new Error(error.statusMessage);
   }
 }
 

+ 2 - 1
src/components/newtab/workflow/edit/EditGoogleSheets.vue

@@ -97,8 +97,9 @@
       <shared-codemirror
         v-if="previewDataState.data && previewDataState.status !== 'error'"
         :model-value="previewDataState.data"
+        :line-numbers="false"
         readonly
-        class="mt-4 max-h-96"
+        class="mt-4 max-h-96 scroll"
       />
     </template>
     <template v-else-if="data.type === 'update'">