@boarteam/boar-pack-common-frontend 2.3.0 → 2.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boarteam/boar-pack-common-frontend",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Common frontend package for Boar Pack",
   "repository": "git@github.com:boarteam/boar-pack.git",
   "author": "Andrew Balakirev <balakirev.andrey@gmail.com>",
@@ -46,5 +46,5 @@
   "scripts": {
     "yalc:push": "yalc push"
   },
-  "gitHead": "41820e4b6df7d9d82c5a87e735d59dbf95e36751"
+  "gitHead": "a1da0e1cce86e1e5c0a4604242ee0033ff2cba17"
 }

package/src/components/Descriptions/DescriptionsCreateModal.tsx

@@ -12,6 +12,7 @@ const DescriptionsCreateModal = <Entity extends Record<string | symbol, any>>({
   data,
   onClose,
   onSubmit,
+  modalProps,
   ...rest
 }: TDescriptionsCreateModalProps<Entity>) => {
   const sections = columnsToDescriptionItemProps(columns, 'General');
@@ -38,6 +39,7 @@ const DescriptionsCreateModal = <Entity extends Record<string | symbol, any>>({
       footer={[
         <Button key='submit' type="primary" onClick={async () => form.validateFields().then(onSubmit)}>Create</Button>
       ]}
+      {...modalProps}
     >
       {sections.map((section, index) => (
         <ProDescriptions<Entity>

package/src/components/Descriptions/descriptionTypes.ts

@@ -3,6 +3,7 @@ import { ActionType } from "@ant-design/pro-table";
 import { RowEditableConfig } from "@ant-design/pro-utils";
 import { QueryJoin } from "@nestjsx/crud-request";
 import { ProColumns, ProDescriptionsProps } from "@ant-design/pro-components";
+import { ModalProps } from "antd";
 
 export type TGetOneParams = {
   /**
@@ -46,4 +47,5 @@ export type TDescriptionsCreateModalProps<Entity> = Omit<ProDescriptionsProps<En
   data: Partial<Entity> | undefined,
   onSubmit: (data: Entity) => Promise<void>,
   onClose: () => void,
+  modalProps: ModalProps,
 }

package/src/components/Table/Table.tsx

@@ -69,6 +69,7 @@ const Table = <Entity extends Record<string | symbol, any>,
     toolBarRender,
     params,
     popupDataState,
+    popupProps,
     ...rest
   }: TTableProps<Entity,
     CreateDto,
@@ -254,6 +255,7 @@ const Table = <Entity extends Record<string | symbol, any>,
           }
         },
         async onDelete(id, row) {
+          if (isRecordNew(row)) return;
           await onDelete({ ...row, ...pathParams });
         },
         deletePopconfirmMessage: intl.formatMessage({ id: 'table.deletePopconfirmMessage' }),
@@ -392,6 +394,7 @@ const Table = <Entity extends Record<string | symbol, any>,
       }}
       idColumnName={idColumnName}
       columns={columns ?? []}
+      {...popupProps}
     />
     {contextHolder}
   </>);

package/src/components/Table/tableTypes.ts

@@ -5,6 +5,7 @@ import { Operators } from "./tableTools";
 import { TColumnsSet } from "./useColumnsSets";
 import { ColumnStateType } from "@ant-design/pro-table/es/typing";
 import { RowEditableConfig } from "@ant-design/pro-utils";
+import { TDescriptionsCreateModalProps } from "../Descriptions";
 
 export type IWithId = {
   id: string | number,
@@ -99,6 +100,7 @@ interface BaseProps<Entity,
   columnsState?: ColumnStateType;
   columnsSetSelect?: () => React.ReactNode;
   popupDataState?: [Partial<Entity>, React.Dispatch<React.SetStateAction<Partial<Entity>>>]
+  popupProps?: TDescriptionsCreateModalProps<Entity>;
 }
 
 interface EditableProps<Entity, CreateDto, UpdateDto, TPathParams = {}> {