@boarteam/boar-pack-common-frontend 2.6.0-alpha.5 → 2.6.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boarteam/boar-pack-common-frontend",
-  "version": "2.6.0-alpha.5",
+  "version": "2.6.0-alpha.7",
   "description": "Common frontend package for Boar Pack",
   "repository": "git@github.com:boarteam/boar-pack.git",
   "author": "Andrew Balakirev <balakirev.andrey@gmail.com>",
@@ -26,7 +26,8 @@
   },
   "dependencies": {
     "@nestjsx/crud-request": "^5.0.0-alpha.3",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "uuid": "^11.1.0"
   },
   "devDependencies": {
     "@ant-design/icons": "^4.8.3",
@@ -46,5 +47,5 @@
   "scripts": {
     "yalc:push": "yalc push"
   },
-  "gitHead": "1505d30b815618afd075af7d97e3945d15c5129b"
+  "gitHead": "b50c6748aef6069eb9e1fa919f42fdde0a886090"
 }

package/src/components/Table/Table.tsx

@@ -36,6 +36,7 @@ const Table = <Entity extends Record<string | symbol, any>,
     onDelete,
     onDeleteMany,
     exportUrl,
+    exportParams,
     onImport,
     pathParams,
     idColumnName = 'id',
@@ -123,6 +124,7 @@ const Table = <Entity extends Record<string | symbol, any>,
 
   const { exportButton, importButton, setLastQueryParams } = useImportExport<TPathParams>({
     exportUrl,
+    exportParams,
     onImport,
   })
 

package/src/components/Table/tableTools.ts

@@ -1,4 +1,5 @@
 import { CondOperator, QueryJoin, SCondition } from "@nestjsx/crud-request";
+import { validate as uuidValidate } from 'uuid';
 import { IWithId, TFilters, TSearchableColumn } from "./tableTypes";
 import React, { Key } from "react";
 import { TColumnsStates } from "./useColumnsSets";
@@ -20,7 +21,12 @@ export function getFiltersSearch({
     let operator = col.filterOperator || col.operator;
     let value = filters[colDataIndex] || baseFilters[colDataIndex];
     filterKeys.delete(colDataIndex);
-    if (value === '' || value === undefined || col.numeric && !Number.isFinite(Number(value))) {
+    if (
+      value === '' ||
+      value === undefined ||
+      col.numeric && !Number.isFinite(Number(value)) ||
+      col.uuid && (typeof value !== 'string' || !uuidValidate(value))
+    ) {
       return;
     }
 
@@ -126,7 +132,10 @@ export function applyKeywordToSearch(
       const field = col.searchField || (Array.isArray(col.field) ? col.field.join('.') : col.field);
       const operator = col.operator;
 
-      if (!col.numeric || Number.isFinite(Number(word))) {
+      const wrongNumeric = col.numeric && !Number.isFinite(Number(word));
+      const wrongUuid = col.uuid && (typeof word !== 'string' || !uuidValidate(word));
+
+      if (!wrongNumeric && !wrongUuid) {
         keywordSearch.$or.push({ [field]: { [operator]: word } });
       }
     });

package/src/components/Table/tableTypes.ts

@@ -78,6 +78,7 @@ export type TSearchableColumn = {
   filterField?: string,
   filterOperator?: typeof Operators[keyof typeof Operators],
   numeric?: boolean,
+  uuid?: boolean,
 }
 
 interface BaseProps<Entity,
@@ -108,6 +109,9 @@ export interface EditableProps<Entity, CreateDto, UpdateDto, TPathParams = {}> {
   afterSave?: (record: Entity) => Promise<void>;
   onCreate?: ({}: { requestBody: CreateDto } & TPathParams) => Promise<Entity>;
   exportUrl?: string;
+  exportParams?: {
+    [key: string]: string | number
+  };
   onImport?: (event: React.ChangeEvent<HTMLInputElement>) => Promise<any>;
   onUpdate: ({}: Partial<Entity> & {
     requestBody: UpdateDto,

package/src/components/Table/useImportExport.tsx

@@ -6,9 +6,13 @@ import { Link } from "react-router-dom";
 
 export function useImportExport<TPathParams = {}>({
   exportUrl,
+  exportParams,
   onImport
 }: {
   exportUrl?: string;
+  exportParams?: {
+    [key: string]: string | number
+  }
   onImport?: (event: React.ChangeEvent<HTMLInputElement>) => Promise<any>;
 }) {
   const [isLoadingImport, setIsLoadingImport] = useState(false);
@@ -25,10 +29,15 @@ export function useImportExport<TPathParams = {}>({
       });
   }
 
-  const url = exportUrl + (lastQueryParams ? '?' + new URLSearchParams({
-    s: lastQueryParams.s,
-    sort: lastQueryParams.sort?.[0],
-  }).toString() : '');
+  const params = {
+    ...(lastQueryParams && {
+      s: lastQueryParams.s,
+      sort: lastQueryParams.sort?.[0],
+    }),
+    ...exportParams
+  }
+
+  const url = exportUrl + (Object.keys(params).length ? '?' + new URLSearchParams(params).toString() : '');
   const exportButton = <Tooltip title="Export">
     <Link to={url} target={'_blank'}>
       <Button icon={<DownloadOutlined />}/>