@boarteam/boar-pack-common-frontend 2.1.0 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boarteam/boar-pack-common-frontend",
-  "version": "2.1.0",
+  "version": "2.3.1",
   "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": "ff8bb25f429f1e0a7d20038c9094e1bed9e37321"
+  "gitHead": "441251d33aa4c5b62f82c351811c581c8c8113a3"
 }

package/src/components/Descriptions/DescriptionsCreateModal.tsx

@@ -4,7 +4,7 @@ import { TDescriptionsCreateModalProps } from "./descriptionTypes";
 import { ProDescriptions } from "@ant-design/pro-components";
 import { columnsToDescriptionItemProps } from "./useDescriptionColumns";
 import { useForm } from "antd/es/form/Form";
-import { buildFieldsFromColumns } from "../Table";
+import { buildFieldsFromColumnsForDescriptionsDisplay } from "../Table";
 
 const DescriptionsCreateModal = <Entity extends Record<string | symbol, any>>({
   idColumnName,
@@ -19,7 +19,7 @@ const DescriptionsCreateModal = <Entity extends Record<string | symbol, any>>({
 
   const editableKeys = useMemo(() => {
     return [
-      ...buildFieldsFromColumns(
+      ...buildFieldsFromColumnsForDescriptionsDisplay(
         columns,
         idColumnName,
       ),

package/src/components/Table/Table.tsx

@@ -68,6 +68,7 @@ const Table = <Entity extends Record<string | symbol, any>,
     popupCreation = false,
     toolBarRender,
     params,
+    popupDataState,
     ...rest
   }: TTableProps<Entity,
     CreateDto,
@@ -77,7 +78,7 @@ const Table = <Entity extends Record<string | symbol, any>,
 ) => {
   const actionRefComponent = useRef<ActionType>();
   const actionRef = actionRefProp || actionRefComponent;
-  const [createPopupData, setCreatePopupData] = useState<Partial<Entity> | undefined>();
+  const [createPopupData, setCreatePopupData] = popupDataState ?? useState<Partial<Entity> | undefined>();
   const [editableKeys, setEditableRowKeys] = useState<React.Key[]>([]);
   const [selectedRecords, setSelectedRecords] = useState<Entity[]>([]);
   const [lastRequest, setLastRequest] = useState<[TGetAllParams & TPathParams, any] | []>([]);
@@ -253,6 +254,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' }),

package/src/components/Table/tableTools.ts

@@ -113,6 +113,21 @@ export function collectFieldsFromColumns<T>(
   return [Array.from(buildFieldsFromColumns<T>(columns, idColumnName, joinFields, fields)).join(',')];
 }
 
+export function buildFieldsFromColumnsForDescriptionsDisplay<T>(
+  columns: TIndexableRecord[] | undefined,
+  idColumnName: string | string[],
+  fields: Set<string> = new Set,
+): Set<string> {
+  columns?.forEach(col => {
+    if ('children' in col && Array.isArray(col.children)) {
+      buildFieldsFromColumnsForDescriptionsDisplay(col.children, idColumnName, fields);
+    }
+    fields.add(String(Array.isArray(col.dataIndex) ? col.dataIndex[0] : col.dataIndex));
+  });
+
+  return fields;
+}
+
 export function buildFieldsFromColumns<T>(
   columns: TIndexableRecord[] | undefined,
   idColumnName: string | string[],

package/src/components/Table/tableTypes.ts

@@ -98,6 +98,7 @@ interface BaseProps<Entity,
   popupCreation?: boolean;
   columnsState?: ColumnStateType;
   columnsSetSelect?: () => React.ReactNode;
+  popupDataState?: [Partial<Entity>, React.Dispatch<React.SetStateAction<Partial<Entity>>>]
 }
 
 interface EditableProps<Entity, CreateDto, UpdateDto, TPathParams = {}> {