Merge pull request #1011 from datopian/fix-flatui

Fix flatui
datopian · Aug 15, 2023 · 8c5c6a2 · 8c5c6a2 · vercel · Aug 15, 2023
2 parents b2b4fbd + 8e89613
commit 8c5c6a2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/.changeset/lovely-ghosts-sin.md b/.changeset/lovely-ghosts-sin.md
@@ -0,0 +1,5 @@
+---
+'@portaljs/components': patch
+---
+
+fix bug when there were multiple flatuitable components at the same time
diff --git a/.changeset/rare-pianos-repair.md b/.changeset/rare-pianos-repair.md
@@ -0,0 +1,5 @@
+---
+'@portaljs/ckan': patch
+---
+
+added package_count to organization type
diff --git a/packages/components/portaljs-components-0.1.12.tgz b/packages/components/portaljs-components-0.1.12.tgz
diff --git a/packages/components/src/components/FlatUiTable.tsx b/packages/components/src/components/FlatUiTable.tsx
@@ -42,17 +42,25 @@ export interface FlatUiTableProps {
   data?: { [key: string]: number | string }[];
   rawCsv?: string;
   corsProxy?: string;
+  randomId?: number;
 }
 export const FlatUiTable: React.FC<FlatUiTableProps> = ({
   url,
   data,
   rawCsv,
   corsProxy,
 }) => {
+  const randomId = Math.random();
   return (
     // Provide the client to your App
     <QueryClientProvider client={queryClient}>
-      <TableInner corsProxy={corsProxy} url={url} data={data} rawCsv={rawCsv} />
+      <TableInner
+        corsProxy={corsProxy}
+        url={url}
+        data={data}
+        rawCsv={rawCsv}
+        randomId={randomId}
+      />
     </QueryClientProvider>
   );
 };
@@ -62,6 +70,7 @@ const TableInner: React.FC<FlatUiTableProps> = ({
   data,
   rawCsv,
   corsProxy,
+  randomId,
 }) => {
   if (data) {
     return (
@@ -71,12 +80,12 @@ const TableInner: React.FC<FlatUiTableProps> = ({
     );
   }
   const { data: csvString, isLoading: isDownloadingCSV } = useQuery(
-    ['dataCsv', url],
+    ['dataCsv', url, randomId],
     () => getCsv(url as string, corsProxy),
     { enabled: !!url }
   );
   const { data: parsedData, isLoading: isParsing } = useQuery(
-    ['dataPreview', csvString],
+    ['dataPreview', csvString, randomId],
     () => parseCsv(rawCsv ? (rawCsv as string) : (csvString as string)),
     { enabled: rawCsv ? true : !!csvString }
   );