Improve error handling

package.json

@@ -6,7 +6,7 @@
         "charts"
     ],
     "license": "MIT",
-    "version": "0.0.35",
+    "version": "0.0.37",
     "type": "module",
     "main": "./dist/galaxy-charts.umd.cjs",
     "module": "./dist/galaxy-charts.js",
@@ -30,7 +30,7 @@
         "build:types": "vue-tsc --declaration --emitDeclarationOnly --outDir dist",
         "postbuild": "npm run build:types",
         "preview": "vite preview",
-        "prettier": "prettier --write 'package.json' '*.js' 'src/**/*.js' 'src/**/*.vue'",
+        "prettier": "prettier --write 'package.json' '*.js' 'src/**/*.js' 'src/**/*.ts' 'src/**/*.vue'",
         "test": "vitest"
     },
     "devDependencies": {

src/Plugin.vue

@@ -21,10 +21,11 @@ const viewport = ref(null);
 
 const columnsStore = useColumnsStore();
 
+const columnsList = ref();
+
 async function render() {
     /** Place your render function here! */
-    const columnsList = await columnsStore.fetchColumns(props.datasetId, props.tracks, ["x", "y", "z"]);
-    console.log(columnsList);
+    columnsList.value = await columnsStore.fetchColumns(props.datasetId, props.tracks, ["x", "y", "z"]);
 }
 
 function onSave() {
@@ -52,6 +53,7 @@ watch(
         <div class="bg-gray-600 text-white rounded-lg p-2">
             <pre class="p-2">Settings: {{ settings }}</pre>
             <pre class="p-2">Tracks: {{ tracks }}</pre>
+            <pre>{{ columnsList }}</pre>
         </div>
     </div>
 </template>

src/api/client.ts

@@ -10,8 +10,12 @@ async function fetchApi(path: string, options: RequestInit): Promise<{ data: any
             headers: { "Content-Type": "application/json" },
             ...options,
         });
-        const data = await response.json();
-        return { data, response };
+        if (response.ok) {
+            const data = await response.json();
+            return { data, response };
+        } else {
+            rethrowSimple(response);
+        }
     } catch (err) {
         rethrowSimple(err);
     }

src/api/datasets.ts

@@ -1,17 +1,17 @@
 import { GalaxyApi } from "@/api/client";
+import { rethrowSimple } from "@/utilities/simpleError";
 
 export async function datasetsGetColumns(datasetId: string, columnList: string[]): Promise<any[][] | undefined> {
-    try {
-        const params = new URLSearchParams({
-            data_type: "raw_data",
-            provider: "dataset-column",
-            indeces: columnList.toString(),
-        }).toString();
+    const params = new URLSearchParams({
+        data_type: "raw_data",
+        provider: "dataset-column",
+        indeces: columnList.toString(),
+    }).toString();
 
+    try {
         const { data } = await GalaxyApi().GET(`/api/datasets/${datasetId}?${params}`);
         const columnLength = columnList.length;
         const results: any[][] = new Array(columnLength).fill(null).map(() => []);
-
         for (const row of data.data) {
             for (const j in row) {
                 const index = Number(j);
@@ -21,11 +21,9 @@ export async function datasetsGetColumns(datasetId: string, columnList: string[]
                 }
             }
         }
-
         return results;
-    } catch (err) {
-        console.error(err);
-        return undefined;
+    } catch (e) {
+        rethrowSimple(e);
     }
 }
 

src/api/visualizations.ts

@@ -1,14 +1,18 @@
-import { rethrowSimple } from "@/utilities/simpleError";
 import { GalaxyApi } from "@/api/client";
-import { InputValuesType } from "@/types"
+import { InputValuesType } from "@/types";
+import { rethrowSimple } from "@/utilities/simpleError";
 
 interface VisualizationConfig {
     dataset_id: string;
     settings: InputValuesType;
     tracks: Array<InputValuesType>;
 }
 
-export async function visualizationsCreate(type: string, title: string, config: VisualizationConfig): Promise<string | undefined> {
+export async function visualizationsCreate(
+    type: string,
+    title: string,
+    config: VisualizationConfig,
+): Promise<string | undefined> {
     try {
         const { data } = await GalaxyApi().POST("/api/visualizations", {
             type,
@@ -21,7 +25,12 @@ export async function visualizationsCreate(type: string, title: string, config:
     }
 }
 
-export async function visualizationsSave(type: string, id: string | null, title: string, config: VisualizationConfig): Promise<string | undefined> {
+export async function visualizationsSave(
+    type: string,
+    id: string | null,
+    title: string,
+    config: VisualizationConfig,
+): Promise<string | undefined> {
     try {
         if (id) {
             await visualizationsUpdate(id, title, config);

src/types.ts

@@ -45,9 +45,9 @@ export interface PluginConfigType {
 
 export interface PluginIncomingType {
     root?: string;
-    visualization_config?: PluginConfigType,
+    visualization_config?: PluginConfigType;
     visualization_id?: string;
-    visualization_plugin?: PluginType,
+    visualization_plugin?: PluginType;
     visualization_title?: string;
 }
 

src/utilities/parseColumns.ts

@@ -7,12 +7,7 @@ interface Column {
     value: string;
 }
 
-export function parseColumns(
-    dataset: Dataset,
-    isAuto: boolean,
-    isText: boolean,
-    isNumber: boolean
-): Array<Column> {
+export function parseColumns(dataset: Dataset, isAuto: boolean, isText: boolean, isNumber: boolean): Array<Column> {
     const columns: Array<Column> = [];
 
     if (isAuto) {

src/utilities/parsePlugin.ts

@@ -9,10 +9,7 @@ interface ParsedPlugin {
 }
 
 // Parse plugin either from incoming object or XML
-export async function parsePlugin(
-    plugin: PluginType,
-    config: PluginConfigType = {}
-): Promise<ParsedPlugin> {
+export async function parsePlugin(plugin: PluginType, config: PluginConfigType = {}): Promise<ParsedPlugin> {
     const settings = parseValues(plugin.settings, config.settings);
     const specs = plugin.specs;
     const tracks = parseTracks(plugin.tracks, config.tracks);

src/utilities/sleep.ts

@@ -0,0 +1,6 @@
+const WAITTIME = 2000;
+
+/** Wait helper */
+export function sleep(wt = WAITTIME) {
+    return new Promise((resolve) => setTimeout(resolve, wt));
+}