Fix flatui

.changeset/lovely-ghosts-sin.md

@@ -0,0 +1,5 @@
+---
+'@portaljs/components': patch
+---
+
+fix bug when there were multiple flatuitable components at the same time

.changeset/rare-pianos-repair.md

@@ -0,0 +1,5 @@
+---
+'@portaljs/ckan': patch
+---
+
+added package_count to organization type

packages/ckan/src/interfaces/group.interface.ts

@@ -1,6 +1,6 @@
-import { Activity } from "./activity.interface";
-import { Dataset, Tag } from "./dataset.interface";
-import { User } from "./user.interface";
+import { Activity } from './activity.interface';
+import { Dataset, Tag } from './dataset.interface';
+import { User } from './user.interface';
 
 export interface Group {
   display_name: string;
@@ -10,9 +10,9 @@ export interface Group {
   created: string;
   name: string;
   is_organization: false;
-  state: "active" | "deleted" | "inactive";
+  state: 'active' | 'deleted' | 'inactive';
   image_url: string;
-  type: "group";
+  type: 'group';
   title: string;
   revision_id: string;
   num_followers: number;

packages/ckan/src/interfaces/organization.interface.ts

@@ -1,6 +1,6 @@
-import { Activity } from "./activity.interface";
-import { Dataset, Tag } from "./dataset.interface";
-import { User } from "./user.interface";
+import { Activity } from './activity.interface';
+import { Dataset, Tag } from './dataset.interface';
+import { User } from './user.interface';
 
 export interface Organization {
   id: string;
@@ -13,8 +13,9 @@ export interface Organization {
   image_display_url?: string;
   created?: string;
   is_organization: boolean;
-  approval_status?: "approved";
-  state: "active";
+  package_count: number;
+  approval_status?: 'approved';
+  state: 'active';
   packages?: Array<Dataset>;
   activity_stream?: Array<Activity>;
   users?: Array<User>;

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 }
   );