@boarteam/boar-pack-common-frontend 2.6.0-alpha.4 → 2.6.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boarteam/boar-pack-common-frontend",
-  "version": "2.6.0-alpha.4",
+  "version": "2.6.0-alpha.6",
   "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": "32ad0f5a9dbba644c5a01e53f0d83f43cddd7ee2"
+  "gitHead": "66eb6a7fdf64efc00aba0e65762919d878cd7762"
 }

package/src/components/Descriptions/Descriptions.tsx

@@ -3,12 +3,16 @@ import React, { Key, useEffect, useImperativeHandle, useMemo, useRef, useState }
 import { Badge, Button, Result, Tabs, TabsProps, Tooltip } from "antd";
 import { DeleteOutlined, StopOutlined } from "@ant-design/icons";
 import { FormattedMessage, useIntl } from "react-intl";
-import { DescriptionsRefType, TDescriptionsProps, TGetOneParams } from "./descriptionTypes";
+import { DescriptionsRefType, FieldsEdit, TDescriptionsProps, TGetOneParams } from "./descriptionTypes";
 import { PageLoading, ProDescriptions } from "@ant-design/pro-components";
 import { columnsToDescriptionItemProps, TDescriptionSection } from "./useDescriptionColumns";
 import pick from "lodash/pick";
 import safetyRun from "../../tools/safetyRun";
-import { buildJoinFields, collectFieldsFromColumns } from "../Table";
+import {
+  buildFieldsFromColumnsForDescriptionsDisplay,
+  buildJoinFields,
+  collectFieldsFromColumns,
+} from "../Table";
 import { RowEditableConfig } from "@ant-design/pro-utils";
 import { useForm } from "antd/es/form/Form";
 import useContentViewMode, { VIEW_MODE_TYPE } from "./useContentViewMode";
@@ -54,6 +58,7 @@ const DescriptionsComponent = <Entity extends Record<string | symbol, any>,
     actionRef: actionRefProp,
     editable,
     canEdit = false,
+    fieldsEditType = FieldsEdit.Single,
     columns,
     params,
     onEntityChange,
@@ -271,6 +276,10 @@ const DescriptionsComponent = <Entity extends Record<string | symbol, any>,
         cancelText: <Tooltip title={intl.formatMessage({ id: 'table.cancelText' })}><StopOutlined /></Tooltip>,
         deleteText: <Tooltip title={intl.formatMessage({ id: 'table.deleteText' })}><DeleteOutlined /></Tooltip>,
         saveText: <Button size={"small"} type={"primary"}><FormattedMessage id={'table.saveText'} /></Button>,
+        ...(fieldsEditType === FieldsEdit.All && {
+          editableKeys: [...buildFieldsFromColumnsForDescriptionsDisplay(columns, idColumnName)],
+          actionRender: () => [],
+        }),
         ...editable,
       } : undefined}
       columns={section.columns}

package/src/components/Descriptions/descriptionTypes.ts

@@ -30,6 +30,11 @@ export type DescriptionsRefType<Entity> = {
   setFieldErrors: (fields: FieldData<Entity>[]) => void;
 };
 
+export enum FieldsEdit {
+  Single = 'single',
+  All = 'all'
+}
+
 export type TDescriptionsProps<Entity, CreateDto, UpdateDto, TPathParams = object> = {
   mainTitle?: ProColumns<Entity>['title'] | null,
   entity?: Partial<Entity>,
@@ -48,6 +53,7 @@ export type TDescriptionsProps<Entity, CreateDto, UpdateDto, TPathParams = objec
   actionRef?: MutableRefObject<ActionType | undefined>,
   editable?: RowEditableConfig<Entity>,
   canEdit?: boolean,
+  fieldsEditType?: FieldsEdit,
   params?: TDescriptionGetRequestParams,
   columns: ProColumns<Entity>[],
   onEntityChange?: (entity: Entity | null) => void;

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,