@addev-be/ui 2.4.2 → 2.4.3

package/dist/components/data/DataGrid/helpers/columns.d.ts

@@ -1,6 +1,6 @@
 import { DataGridCheckboxColumn, DataGridColorColumn, DataGridColumn, DataGridDateColumn, DataGridNumberColumn, DataGridSelectColumn, DataGridSettings, DataGridTextColumn } from '../types';
+import { SqlRequestDataGridCheckboxColumn, SqlRequestDataGridTextColumn } from '../../SqlRequestDataGrid/types';
 import { DeepPartial } from '../../../../types';
-import { SqlRequestDataGridTextColumn } from '../../SqlRequestDataGrid/types';
 export declare const isColumnVisible: <R>(obj: DataGridColumn<R> | DataGridSettings) => boolean;
 export declare const buildExcelFormat: (decimals?: number, suffix?: string) => string;
 export declare const textColumn: <R extends Record<string, any>>(key: string, title: string, options?: DeepPartial<SqlRequestDataGridTextColumn<R>>, otherOptions?: Partial<DataGridTextColumn<R>>) => DataGridTextColumn<R>;
@@ -12,6 +12,6 @@ export declare const monthColumn: <R extends Record<string, any>>(key: string, t
 export declare const numberColumn: <R extends Record<string, any>>(key: string, title: string, decimals?: number, options?: DeepPartial<SqlRequestDataGridTextColumn<R>>, otherOptions?: Partial<DataGridNumberColumn<R>>) => DataGridNumberColumn<R>;
 export declare const moneyColumn: <R extends Record<string, any>>(key: string, title: string, decimals?: number, currency?: string | ((row: R) => string), options?: DeepPartial<SqlRequestDataGridTextColumn<R>>, otherOptions?: Partial<DataGridNumberColumn<R>>) => DataGridNumberColumn<R>;
 export declare const percentageColumn: <R extends Record<string, any>>(key: string, title: string, decimals?: number, options?: DeepPartial<SqlRequestDataGridTextColumn<R>>, otherOptions?: Partial<DataGridNumberColumn<R>>) => DataGridNumberColumn<R>;
-export declare const checkboxColumn: <R extends Record<string, any>>(key: string, title: string, otherOptions?: Partial<DataGridCheckboxColumn<R>>) => DataGridCheckboxColumn<R>;
+export declare const checkboxColumn: <R extends Record<string, any>>(key: string, title: string, options?: DeepPartial<DataGridCheckboxColumn<R>>) => SqlRequestDataGridCheckboxColumn<R>;
 export declare const selectColumn: <R extends Record<string, any>, T>(key: string, title: string, items: T[], itemKey: (item: T | null) => string, itemLabel: (item: T | null) => string, otherOptions?: Partial<DataGridSelectColumn<R, T>>) => DataGridSelectColumn<R, T>;
 export declare const colorColumn: <R extends Record<string, any>>(key: string, title: string, otherOptions?: Partial<DataGridColorColumn<R>>) => DataGridColorColumn<R>;

package/dist/components/data/DataGrid/helpers/columns.js

@@ -30,6 +30,7 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var filters_1 = require("./filters");
 var dates_1 = require("../../../../helpers/dates");
 var numbers_1 = require("../../../../helpers/numbers");
+var lodash_1 = require("lodash");
 var CheckboxEditableCell_1 = require("../DataGridEditableCell/CheckboxEditableCell");
 var DateEditableCell_1 = require("../DataGridEditableCell/DateEditableCell");
 var NumberEditableCell_1 = require("../DataGridEditableCell/NumberEditableCell");
@@ -37,7 +38,6 @@ var Select_1 = require("../../../forms/Form/Select");
 var typography_1 = require("../../../../helpers/styled/typography");
 var TextEditableCell_1 = require("../DataGridEditableCell/TextEditableCell");
 var moment_1 = __importDefault(require("moment"));
-var lodash_1 = require("lodash");
 var components_1 = require("../../../../helpers/components");
 var isColumnVisible = function (obj) { return (obj === null || obj === void 0 ? void 0 : obj.order) !== -1; };
 exports.isColumnVisible = isColumnVisible;
@@ -143,15 +143,23 @@ var percentageColumn = function (key, title, decimals, options, otherOptions) {
     return column;
 };
 exports.percentageColumn = percentageColumn;
-var checkboxColumn = function (key, title, otherOptions) { return (__assign({ key: key, type: 'checkbox', name: title, render: function (value, row) { return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("input", { type: "checkbox", checked: row[key], readOnly: true }), (0, jsx_runtime_1.jsx)("span", { children: row[key] ? ' Oui' : ' Non' })] })); }, getter: function (row) { var _a; return (_a = row[key]) !== null && _a !== void 0 ? _a : ''; }, sortGetter: function (row) { var _a; return (_a = row[key]) !== null && _a !== void 0 ? _a : ''; }, filter: (0, filters_1.numberFilter)(key), footer: {
-        count: function (_, filteredRows) { return "".concat(filteredRows.length, " \u00E9l\u00E9ments"); },
-        checked: function (_, filteredRows) {
-            return "".concat(filteredRows.filter(function (row) { return !!row[key]; }).length, " coch\u00E9s");
+var checkboxColumn = function (key, title, options) {
+    return (0, lodash_1.merge)({
+        key: key,
+        name: title,
+        type: 'checkbox',
+        render: function (_row) {
+            var normalized = typeof _row === 'string' ? _row : String(_row);
+            var isChecked = normalized === 'true' || normalized === '1';
+            return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("input", { type: "checkbox", checked: isChecked, readOnly: true }), (0, jsx_runtime_1.jsx)("span", { children: isChecked ? ' Oui' : ' Non' })] }));
         },
-        unchecked: function (_, filteredRows) {
-            return "".concat(filteredRows.filter(function (row) { return !row[key]; }).length, " d\u00E9coch\u00E9s");
-        },
-    }, editComponent: CheckboxEditableCell_1.CheckboxEditableCell }, otherOptions)); };
+        getter: function (row) { var _a; return (_a = row[key]) !== null && _a !== void 0 ? _a : ''; },
+        sortGetter: function (row) { var _a; return (_a = row[key]) !== null && _a !== void 0 ? _a : ''; },
+        filter: __assign(__assign({}, (0, filters_1.numberFilter)(key)), { getter: function (row) { var _a; return +((_a = row[key]) !== null && _a !== void 0 ? _a : 0); } }),
+        footer: function (rows) { return "".concat(rows[0][key], " \u00E9l\u00E9ments"); },
+        editComponent: CheckboxEditableCell_1.CheckboxEditableCell,
+    }, options);
+};
 exports.checkboxColumn = checkboxColumn;
 var selectColumn = function (key, title, items, itemKey, itemLabel, otherOptions) { return (__assign({ key: key, type: 'select', name: title, render: function (value, row) { var _a; return (_a = itemLabel(row[key])) !== null && _a !== void 0 ? _a : ''; }, getter: function (row) { var _a; return (_a = row[key]) !== null && _a !== void 0 ? _a : null; }, sortGetter: function (row) { var _a; return (_a = itemLabel(row[key])) !== null && _a !== void 0 ? _a : ''; }, footer: function (_, filteredRows) { return "".concat(filteredRows.length, " \u00E9l\u00E9ments"); }, filter: __assign(__assign({}, (0, filters_1.textFilter)(key)), { renderer: function (value) { var _a; return (_a = itemLabel(value)) !== null && _a !== void 0 ? _a : ''; } }), items: items, itemKey: itemKey, itemLabel: itemLabel, editComponent: (0, components_1.withDisplayName)(function (_a) {
         var value = _a.value, onChange = _a.onChange, onClose = _a.onClose, ref = _a.ref;

package/dist/components/search/QuickSearchBar.js

@@ -73,6 +73,8 @@ var QuickSearchBar = function (_a) {
             (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
         });
     }, []);
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(InputComponent, { type: "text", ref: fakeInputRef, value: term, onFocus: onFocus, placeholder: placeholder }), dropdownVisible && rect && ((0, jsx_runtime_1.jsx)(Dropdown_1.Dropdown, { "$sourceRect": destRect, onClose: function () { return setDropdownVisible(false); }, "$width": rect.width, "$height": [results ? 250 : rect.height, 400], "$autoPositionY": false, children: (0, jsx_runtime_1.jsxs)(styles.QuickSearchDropdownContainer, { children: [(0, jsx_runtime_1.jsx)(InputComponent, { type: "text", ref: inputRef, value: term, placeholder: placeholder, onChange: function (e) { return setTerm(e.target.value); }, onClick: function (e) { return e.stopPropagation(); } }), results && ((0, jsx_runtime_1.jsx)(QuickSearchResults_1.QuickSearchResults, { results: results, definitions: types, term: debouncedTerm }))] }) }))] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(InputComponent, { type: "text", ref: fakeInputRef, value: term, onFocus: onFocus, placeholder: placeholder }), dropdownVisible && rect && ((0, jsx_runtime_1.jsx)(Dropdown_1.Dropdown, { "$sourceRect": destRect, onClose: function () { return setDropdownVisible(false); }, "$width": rect.width, "$height": [results ? 250 : rect.height, 400], "$autoPositionY": false, children: (0, jsx_runtime_1.jsxs)(styles.QuickSearchDropdownContainer, { children: [(0, jsx_runtime_1.jsx)(InputComponent, { type: "text", ref: inputRef, value: term, placeholder: placeholder, onChange: function (e) { return setTerm(e.target.value); }, onClick: function (e) { return e.stopPropagation(); }, onPaste: function (e) {
+                                e.clipboardData.getData('text');
+                            } }), results && ((0, jsx_runtime_1.jsx)(QuickSearchResults_1.QuickSearchResults, { results: results, definitions: types, term: debouncedTerm }))] }) }))] }));
 };
 exports.QuickSearchBar = QuickSearchBar;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@addev-be/ui",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "type": "module",
   "scripts": {
     "watch": "tsc -b --watch",
@@ -20,7 +20,7 @@
     "update-version": "../../node/update-version.mjs"
   },
   "devDependencies": {
-    "@addev-be/framework-utils": "^2.4.2",
+    "@addev-be/framework-utils": "^2.4.3",
     "@types/lodash": "^4.17.20",
     "@types/react": "^19.1.13",
     "@types/react-dom": "^19.1.9",

package/src/components/data/DataGrid/helpers/columns.tsx

@@ -10,6 +10,10 @@ import {
   DataGridSettings,
   DataGridTextColumn,
 } from '../types';
+import {
+  SqlRequestDataGridCheckboxColumn,
+  SqlRequestDataGridTextColumn,
+} from '../../SqlRequestDataGrid/types';
 import { dateFilter, numberFilter, textFilter } from './filters';
 import { formatDate, formatDateTime } from '../../../../helpers/dates';
 import {
@@ -18,17 +22,17 @@ import {
   formatNumberInvariant,
   formatPercentage,
 } from '../../../../helpers/numbers';
+import { merge, repeat } from 'lodash';
 
 import { CheckboxEditableCell } from '../DataGridEditableCell/CheckboxEditableCell';
 import { DateEditableCell } from '../DataGridEditableCell/DateEditableCell';
 import { DeepPartial } from '../../../../types';
 import { NumberEditableCell } from '../DataGridEditableCell/NumberEditableCell';
 import { Select } from '../../../forms/Form/Select';
-import { SqlRequestDataGridTextColumn } from '../../SqlRequestDataGrid/types';
+import { SqlRequestGridCheckboxColumn } from '../../SqlRequestGrid/types';
 import { StyledTypography } from '../../../../helpers/styled/typography';
 import { TextEditableCell } from '../DataGridEditableCell/TextEditableCell';
 import moment from 'moment';
-import { repeat } from 'lodash';
 import { withDisplayName } from '../../../../helpers/components';
 
 export const isColumnVisible = <R,>(
@@ -365,34 +369,34 @@ export const percentageColumn = <R extends Record<string, any>>(
   };
   return column;
 };
-
 export const checkboxColumn = <R extends Record<string, any>>(
   key: string,
   title: string,
-  otherOptions?: Partial<DataGridCheckboxColumn<R>>
-): DataGridCheckboxColumn<R> => ({
-  key,
-  type: 'checkbox',
-  name: title,
-  render: (value, row) => (
-    <>
-      <input type="checkbox" checked={row[key]} readOnly />
-      <span>{row[key] ? ' Oui' : ' Non'}</span>
-    </>
-  ),
-  getter: (row) => row[key] ?? '',
-  sortGetter: (row) => row[key] ?? '',
-  filter: numberFilter(key),
-  footer: {
-    count: (_, filteredRows) => `${filteredRows.length} éléments`,
-    checked: (_, filteredRows) =>
-      `${filteredRows.filter((row) => !!row[key]).length} cochés`,
-    unchecked: (_, filteredRows) =>
-      `${filteredRows.filter((row) => !row[key]).length} décochés`,
-  },
-  editComponent: CheckboxEditableCell,
-  ...otherOptions,
-});
+  options?: DeepPartial<DataGridCheckboxColumn<R>>
+): SqlRequestDataGridCheckboxColumn<R> =>
+  merge(
+    {
+      key,
+      name: title,
+      type: 'checkbox',
+      render: (_row) => {
+        const normalized = typeof _row === 'string' ? _row : String(_row);
+        const isChecked = normalized === 'true' || normalized === '1';
+        return (
+          <>
+            <input type="checkbox" checked={isChecked} readOnly />
+            <span>{isChecked ? ' Oui' : ' Non'}</span>
+          </>
+        );
+      },
+      getter: (row) => row[key] ?? '',
+      sortGetter: (row) => row[key] ?? '',
+      filter: { ...numberFilter(key), getter: (row) => +(row[key] ?? 0) },
+      footer: (rows) => `${rows[0][key]} éléments`,
+      editComponent: CheckboxEditableCell,
+    } as SqlRequestGridCheckboxColumn<R>,
+    options
+  );
 
 export const selectColumn = <R extends Record<string, any>, T>(
   key: string,

package/src/components/search/QuickSearchBar.tsx

@@ -83,6 +83,9 @@ export const QuickSearchBar = <R,>({
               placeholder={placeholder}
               onChange={(e) => setTerm(e.target.value)}
               onClick={(e) => e.stopPropagation()}
+              onPaste={(e) => {
+                e.clipboardData.getData('text');
+              }}
             />
             {results && (
               <QuickSearchResults