Skip to content

Commit

Permalink
Add more validation and error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Nov 26, 2024
1 parent 8809891 commit 0da7fbc
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 21 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"charts"
],
"license": "MIT",
"version": "0.0.37",
"version": "0.0.38",
"type": "module",
"main": "./dist/galaxy-charts.umd.cjs",
"module": "./dist/galaxy-charts.js",
Expand Down
48 changes: 28 additions & 20 deletions src/store/columnsStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ interface Track {
}

export function useColumnsStore() {
function checkColumns(tracks: Track[], keys: string[]) {
return tracks.every((track) => keys.every((key) => typeof track[key] === "string" && track[key].trim() !== ""));
}

function getColumns(tracks: Track[], keys: string[]): string[] {
const columnsList: string[] = [];
for (const track of tracks) {
Expand All @@ -25,31 +29,35 @@ export function useColumnsStore() {
}

async function fetchColumns(datasetId: string, tracks: Track[], keys: string[]): Promise<Record<string, any>[]> {
columns.value[datasetId] = columns.value[datasetId] || {};
const columnsAvailable = Object.keys(columns.value[datasetId]);
const columnsList = getColumns(tracks, keys).filter((x) => !columnsAvailable.includes(x));
if (columnsList.length > 0) {
const columnsData = await datasetsGetColumns(datasetId, columnsList);
if (columnsData) {
for (const [index, column] of columnsList.entries()) {
columns.value[datasetId][column] = columnsData[index];
if (checkColumns(tracks, keys)) {
columns.value[datasetId] = columns.value[datasetId] || {};
const columnsAvailable = Object.keys(columns.value[datasetId]);
const columnsList = getColumns(tracks, keys).filter((x) => !columnsAvailable.includes(x));
if (columnsList.length > 0) {
const columnsData = await datasetsGetColumns(datasetId, columnsList);
if (columnsData) {
for (const [index, column] of columnsList.entries()) {
columns.value[datasetId][column] = columnsData[index];
}
}
}
}

const results: Record<string, any>[] = [];
tracks.forEach((track) => {
const trackEntry: Record<string, any> = {};
keys.forEach((key) => {
const column = track[key];
if (column && !SPECIAL_KEYS.includes(column)) {
trackEntry[key] = columns.value[datasetId][column];
}
const results: Record<string, any>[] = [];
tracks.forEach((track) => {
const trackEntry: Record<string, any> = {};
keys.forEach((key) => {
const column = track[key];
if (column && !SPECIAL_KEYS.includes(column)) {
trackEntry[key] = columns.value[datasetId][column];
}
});
results.push(trackEntry);
});
results.push(trackEntry);
});

return results;
return results;
} else {
return [];
}
}

return {
Expand Down

0 comments on commit 0da7fbc

Please sign in to comment.