Merge pull request #199 from lflangis/feat/FLUI-25-26/fix-table-and-query-builder-tools

Feat/fl UI 25 26/fix table and query builder tools

Author: lflangis

packages/style/components/queryBuilder/QueryBuilderHeaderTools.module.scss

@@ -3,11 +3,6 @@
 .queryBuilderHeaderTools {
   .toolsContainer {
     .queryBuilderHeaderActionIconBtn {
-      &:focus,
-      &:hover {
-        background-color: transparent;
-      }
-
       &:focus-visible {
         border: 1px solid !important;
       }
@@ -19,18 +14,20 @@
           color: $query-builder-header-tools-icon-color-dirty;
 
           &:not(span) {
-            @include hoverFocus(
-              $query-builder-header-tools-icon-color-dirty,
-              $query-builder-header-tools-icon-color-dirty
-            );
+            &:hover,
+            &:focus {
+              border: $query-builder-header-tools-icon-color-dirty;
+              color: $query-builder-header-tools-icon-color-dirty;
+            }
           }
         }
 
         &:not(span) {
-          @include hoverFocus(
-            $query-builder-header-tools-icon-hover,
-            $query-builder-header-tools-icon-focus
-          );
+          &:hover,
+          &:focus {
+            border: $query-builder-header-tools-icon-color-dirty;
+            color: $query-builder-header-tools-icon-color-dirty;
+          }
         }
       }
     }
@@ -63,4 +60,4 @@
     overflow: hidden;
     white-space: nowrap;
   }
-}
+}

packages/style/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ferlab/style",
-  "version": "1.26.1",
+  "version": "1.26.2",
   "description": "Core components for scientific research data portals",
   "publishConfig": {
     "access": "public"

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ferlab/ui",
-    "version": "4.7.7",
+    "version": "4.7.8",
     "description": "Core components for scientific research data portals",
     "publishConfig": {
         "access": "public"
@@ -79,7 +79,6 @@
         "md5": "^2.3.0",
         "query-string": "^7.0.1",
         "react-icons": "^4.2.0",
-        "simplebar-react": "^2.3.6",
         "uuid": "^8.3.2",
         "xss": "^1.0.9"
     },

packages/ui/src/components/ProTable/index.tsx

@@ -4,6 +4,8 @@ import { Button, Space, Table, Tooltip } from 'antd';
 import cx from 'classnames';
 import { isEmpty } from 'lodash';
 
+import Empty from '../Empty';
+
 import ColumnSelector from './ColumnSelector';
 import TableHeader from './Header';
 import Pagination from './Pagination';
@@ -215,6 +217,9 @@ const ProTable = <RecordType extends object & { key: string } = any>({
                     .map(({ key }) => columns.find((column) => column.key === key)!)
                     .filter((column) => !isEmpty(column))
                     .map(generateColumnTitle)}
+                locale={{
+                    emptyText: <Empty description={dictionary.table?.emptyText || 'No available data'} size="mini" />,
+                }}
                 pagination={
                     pagination && (pagination as IPaginationProps)?.searchAfter === undefined
                         ? {

packages/ui/src/components/ProTable/types.ts

@@ -50,6 +50,9 @@ export interface IProTableDictionary {
         view: string;
     };
     numberFormat?: (value: number) => React.ReactNode;
+    table?: {
+        emptyText: string;
+    };
 }
 
 export interface ProColumnType<T = any> extends ColumnType<T> {