From 15812aba6391d26979cb4f8085468285b585a0d0 Mon Sep 17 00:00:00 2001
From: milan-deepfence <milan@deepfence.io>
Date: Wed, 18 Jan 2023 20:08:42 +0530
Subject: [PATCH 1/2] fix:add icon sizes, table checkbox padding not align for
 sm size, tab remove default value

---
 .../src/components/button/Button.stories.tsx  | 38 +++++++++++++++-
 .../src/components/button/Button.tsx          | 43 +++++++++++--------
 .../src/components/table/Table.stories.tsx    | 13 ++++++
 .../src/components/table/Table.tsx            | 20 +++++----
 .../src/components/tabs/Tabs.tsx              |  4 +-
 5 files changed, 87 insertions(+), 31 deletions(-)

diff --git a/deepfence_frontend/packages/ui-components/src/components/button/Button.stories.tsx b/deepfence_frontend/packages/ui-components/src/components/button/Button.stories.tsx
index aa2a8cbc43..49edfabe73 100644
--- a/deepfence_frontend/packages/ui-components/src/components/button/Button.stories.tsx
+++ b/deepfence_frontend/packages/ui-components/src/components/button/Button.stories.tsx
@@ -18,6 +18,40 @@ Default.args = {
   children: 'Button text md',
 };
 
+export const XsSize = Template.bind({});
+XsSize.args = {
+  children: 'Button text md',
+  endIcon: <FaAmazon />,
+  size: 'xs',
+};
+
+export const SMSize = Template.bind({});
+SMSize.args = {
+  children: 'Button text md',
+  endIcon: <FaAmazon />,
+  size: 'sm',
+};
+
+export const MDSize = Template.bind({});
+MDSize.args = {
+  children: 'Button text md',
+  endIcon: <FaAmazon />,
+};
+
+export const LGSize = Template.bind({});
+LGSize.args = {
+  children: 'Button text md',
+  endIcon: <FaAmazon />,
+  size: 'lg',
+};
+
+export const XLSize = Template.bind({});
+XLSize.args = {
+  children: 'Button text md',
+  endIcon: <FaAmazon />,
+  size: 'xl',
+};
+
 export const NormalButton = Template.bind({});
 NormalButton.args = {
   children: 'Normal text md',
@@ -112,8 +146,8 @@ PrimaryWithBothIcon.args = {
   endIcon: <FaAmazon />,
 };
 
-export const DefaultWithIcon = Template.bind({});
-DefaultWithIcon.args = {
+export const XSWithIcon = Template.bind({});
+XSWithIcon.args = {
   children: 'Button text',
   size: 'xs',
   startIcon: <FaAmazon />,
diff --git a/deepfence_frontend/packages/ui-components/src/components/button/Button.tsx b/deepfence_frontend/packages/ui-components/src/components/button/Button.tsx
index 191ef0e716..9f932099ae 100644
--- a/deepfence_frontend/packages/ui-components/src/components/button/Button.tsx
+++ b/deepfence_frontend/packages/ui-components/src/components/button/Button.tsx
@@ -1,5 +1,6 @@
 import { cva, VariantProps } from 'cva';
 import React, { ComponentProps, useId } from 'react';
+import { IconContext } from 'react-icons';
 import { twMerge } from 'tailwind-merge';
 
 import { ObjectWithNonNullableValues } from '@/types/utils';
@@ -156,11 +157,11 @@ interface ButtonProps
 const iconCva = cva('', {
   variants: {
     size: {
-      xs: '',
-      sm: '',
-      md: '',
-      lg: '',
-      xl: '',
+      xs: 'w-3 h-3',
+      sm: 'w-3.5 h-3.5',
+      md: 'w-4.5 h-4.5',
+      lg: 'w-5.5 h-5.5',
+      xl: 'w-5.5 h-5.5',
     },
     withStartIcon: {
       true: '',
@@ -229,31 +230,35 @@ interface IconProps extends VariantProps<typeof iconCva> {
 
 const StartIcon = ({ id, startIcon, endIcon, size }: IconProps) => {
   return (
-    <span
-      className={iconCva({
-        size,
-        withStartIcon: !!startIcon,
-        withEndIcon: !!endIcon,
-      })}
+    <IconContext.Provider
       data-testid={`button-icon-start-${id}`}
+      value={{
+        className: iconCva({
+          size,
+          withStartIcon: !!startIcon,
+          withEndIcon: !!endIcon,
+        }),
+      }}
     >
       {startIcon}
-    </span>
+    </IconContext.Provider>
   );
 };
 
 const EndIcon = ({ id, size, startIcon, endIcon }: IconProps) => {
   return (
-    <span
-      className={iconCva({
-        size,
-        withStartIcon: !!startIcon,
-        withEndIcon: !!endIcon,
-      })}
+    <IconContext.Provider
       data-testid={`button-icon-end-${id}`}
+      value={{
+        className: iconCva({
+          size,
+          withStartIcon: !!startIcon,
+          withEndIcon: !!endIcon,
+        }),
+      }}
     >
       {endIcon}
-    </span>
+    </IconContext.Provider>
   );
 };
 
diff --git a/deepfence_frontend/packages/ui-components/src/components/table/Table.stories.tsx b/deepfence_frontend/packages/ui-components/src/components/table/Table.stories.tsx
index 5c4737fd76..7ab2d27c32 100644
--- a/deepfence_frontend/packages/ui-components/src/components/table/Table.stories.tsx
+++ b/deepfence_frontend/packages/ui-components/src/components/table/Table.stories.tsx
@@ -24,6 +24,11 @@ type Fruit = {
 const Template: ComponentStory<typeof Table<Fruit>> = (args) => {
   const columnHelper = createColumnHelper<Fruit>();
 
+  const checkboxRow = getRowSelectionColumn(columnHelper, {
+    size: 100,
+    minSize: 100,
+    maxSize: 100,
+  });
   const columns = useMemo(
     () => [
       columnHelper.accessor('id', {
@@ -42,6 +47,9 @@ const Template: ComponentStory<typeof Table<Fruit>> = (args) => {
     ],
     [],
   );
+  if (args.enableRowSelection) {
+    columns.unshift(checkboxRow);
+  }
   return (
     <Table
       {...args}
@@ -73,6 +81,11 @@ Default.args = {};
 export const SmallTable = Template.bind({});
 SmallTable.args = {
   size: 'sm',
+  enableRowSelection: true,
+  rowSelectionState: {},
+  onRowSelectionChange: () => {
+    return false;
+  },
 };
 
 export const StripedTable = Template.bind({});
diff --git a/deepfence_frontend/packages/ui-components/src/components/table/Table.tsx b/deepfence_frontend/packages/ui-components/src/components/table/Table.tsx
index 9bfaa4f97b..5f2d382587 100644
--- a/deepfence_frontend/packages/ui-components/src/components/table/Table.tsx
+++ b/deepfence_frontend/packages/ui-components/src/components/table/Table.tsx
@@ -251,8 +251,8 @@ function Th<TData>({
       onClick={header.column.getToggleSortingHandler()}
     >
       <div
-        className={cx(`w-full h-full flex`, {
-          ['p-3']: size === 'sm',
+        className={cx(`w-full h-full flex px-4`, {
+          ['py-3']: size === 'sm',
           ['p-4']: size === 'md',
         })}
       >
@@ -360,12 +360,16 @@ function Td<TData>({
     <td
       key={cell.id}
       style={{ width: cell.column.getSize() }}
-      className={cx(`text-sm text-gray-900 dark:text-white`, Typography.weight.normal, {
-        'border-b border-gray-200 dark:border-gray-700':
-          !striped && rowIdx !== totalRows - 1,
-        ['p-2']: size === 'sm',
-        ['p-4']: size === 'md',
-      })}
+      className={cx(
+        `text-sm text-gray-900 dark:text-white px-4`,
+        Typography.weight.normal,
+        {
+          'border-b border-gray-200 dark:border-gray-700':
+            !striped && rowIdx !== totalRows - 1,
+          ['py-2']: size === 'sm',
+          ['p-4']: size === 'md',
+        },
+      )}
     >
       {flexRender(cell.column.columnDef.cell, cell.getContext())}
     </td>
diff --git a/deepfence_frontend/packages/ui-components/src/components/tabs/Tabs.tsx b/deepfence_frontend/packages/ui-components/src/components/tabs/Tabs.tsx
index 4bff2b4ce6..eb9ec8c5aa 100644
--- a/deepfence_frontend/packages/ui-components/src/components/tabs/Tabs.tsx
+++ b/deepfence_frontend/packages/ui-components/src/components/tabs/Tabs.tsx
@@ -30,9 +30,9 @@ const classes = {
 };
 
 const Tabs = (props: TabProps) => {
-  const { tabs, value, defaultValue, size = 'sm', children, ...rest } = props;
+  const { tabs, value, size = 'sm', children, ...rest } = props;
   return (
-    <TabsPrimitive.Root defaultValue={defaultValue} {...rest} data-testid={'tabs-testid'}>
+    <TabsPrimitive.Root {...rest} data-testid={'tabs-testid'} value={value}>
       <TabsPrimitive.List
         className={cx(
           'inline-flex gap-x-8 border-b bg-transparent border-gray-200 dark:border-gray-700 text-gray-500 dark:text-gray-400 dark:bg-gray-900',

From b0ace38a20ec2592d9c961a661c7913eb04b88b7 Mon Sep 17 00:00:00 2001
From: milan-deepfence <milan@deepfence.io>
Date: Wed, 18 Jan 2023 20:27:44 +0530
Subject: [PATCH 2/2] fix test failed

---
 .../src/components/button/Button.tsx          | 50 ++++++++++---------
 .../table/__snapshots__/table.test.tsx.snap   | 38 +++++++-------
 2 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/deepfence_frontend/packages/ui-components/src/components/button/Button.tsx b/deepfence_frontend/packages/ui-components/src/components/button/Button.tsx
index 9f932099ae..a426969aa0 100644
--- a/deepfence_frontend/packages/ui-components/src/components/button/Button.tsx
+++ b/deepfence_frontend/packages/ui-components/src/components/button/Button.tsx
@@ -230,35 +230,37 @@ interface IconProps extends VariantProps<typeof iconCva> {
 
 const StartIcon = ({ id, startIcon, endIcon, size }: IconProps) => {
   return (
-    <IconContext.Provider
-      data-testid={`button-icon-start-${id}`}
-      value={{
-        className: iconCva({
-          size,
-          withStartIcon: !!startIcon,
-          withEndIcon: !!endIcon,
-        }),
-      }}
-    >
-      {startIcon}
-    </IconContext.Provider>
+    <span data-testid={`button-icon-start-${id}`}>
+      <IconContext.Provider
+        value={{
+          className: iconCva({
+            size,
+            withStartIcon: !!startIcon,
+            withEndIcon: !!endIcon,
+          }),
+        }}
+      >
+        {startIcon}
+      </IconContext.Provider>
+    </span>
   );
 };
 
 const EndIcon = ({ id, size, startIcon, endIcon }: IconProps) => {
   return (
-    <IconContext.Provider
-      data-testid={`button-icon-end-${id}`}
-      value={{
-        className: iconCva({
-          size,
-          withStartIcon: !!startIcon,
-          withEndIcon: !!endIcon,
-        }),
-      }}
-    >
-      {endIcon}
-    </IconContext.Provider>
+    <span data-testid={`button-icon-end-${id}`}>
+      <IconContext.Provider
+        value={{
+          className: iconCva({
+            size,
+            withStartIcon: !!startIcon,
+            withEndIcon: !!endIcon,
+          }),
+        }}
+      >
+        {endIcon}
+      </IconContext.Provider>
+    </span>
   );
 };
 
diff --git a/deepfence_frontend/packages/ui-components/src/components/table/__snapshots__/table.test.tsx.snap b/deepfence_frontend/packages/ui-components/src/components/table/__snapshots__/table.test.tsx.snap
index 78eb358250..7ee39a76a6 100644
--- a/deepfence_frontend/packages/ui-components/src/components/table/__snapshots__/table.test.tsx.snap
+++ b/deepfence_frontend/packages/ui-components/src/components/table/__snapshots__/table.test.tsx.snap
@@ -1,35 +1,35 @@
 // Vitest Snapshot v1
 
-exports[`Component Table > should render a basic table > cells with border 0 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white font-normal border-b border-gray-200 dark:border-gray-700 p-4\\">0</td>"`;
+exports[`Component Table > should render a basic table > cells with border 0 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white px-4 font-normal border-b border-gray-200 dark:border-gray-700 p-4\\">0</td>"`;
 
-exports[`Component Table > should render a basic table > cells with border 1 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white font-normal border-b border-gray-200 dark:border-gray-700 p-4\\">Fruit 0</td>"`;
+exports[`Component Table > should render a basic table > cells with border 1 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white px-4 font-normal border-b border-gray-200 dark:border-gray-700 p-4\\">Fruit 0</td>"`;
 
-exports[`Component Table > should render a basic table > cells with border 2 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white font-normal border-b border-gray-200 dark:border-gray-700 p-4\\">Description for 0</td>"`;
+exports[`Component Table > should render a basic table > cells with border 2 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white px-4 font-normal border-b border-gray-200 dark:border-gray-700 p-4\\">Description for 0</td>"`;
 
-exports[`Component Table > should render a basic table > cells without border 3 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white font-normal p-4\\">1</td>"`;
+exports[`Component Table > should render a basic table > cells without border 3 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white px-4 font-normal p-4\\">1</td>"`;
 
-exports[`Component Table > should render a basic table > cells without border 4 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white font-normal p-4\\">Fruit 1</td>"`;
+exports[`Component Table > should render a basic table > cells without border 4 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white px-4 font-normal p-4\\">Fruit 1</td>"`;
 
-exports[`Component Table > should render a basic table > cells without border 5 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white font-normal p-4\\">Description for 1</td>"`;
+exports[`Component Table > should render a basic table > cells without border 5 1`] = `"<td style=\\"width: 150px;\\" class=\\"text-sm text-gray-900 dark:text-white px-4 font-normal p-4\\">Description for 1</td>"`;
 
 exports[`Component Table > should render a basic table > row with hover state on normal table 1`] = `
 <tr
   class="hover:!bg-gray-100 dark:hover:!bg-gray-600 transition-colors"
 >
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     1
   </td>
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     Fruit 1
   </td>
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     Description for 1
@@ -39,7 +39,7 @@ exports[`Component Table > should render a basic table > row with hover state on
 
 exports[`Component Table > should render a striped table > cells should not have border 1`] = `
 <td
-  class="text-sm text-gray-900 dark:text-white font-normal p-4"
+  class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
   style="width: 150px;"
 >
   Fruit 0
@@ -51,19 +51,19 @@ exports[`Component Table > should render a striped table > even rows should have
   class="bg-gray-50 dark:bg-gray-700 hover:!bg-gray-100 dark:hover:!bg-gray-600 transition-colors"
 >
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     1
   </td>
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     Fruit 1
   </td>
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     Description for 1
@@ -76,19 +76,19 @@ exports[`Component Table > should render a striped table > odd rows should have
   class="hover:!bg-gray-100 dark:hover:!bg-gray-600 transition-colors"
 >
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     0
   </td>
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     Fruit 0
   </td>
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     Description for 0
@@ -101,19 +101,19 @@ exports[`Component Table > should render a striped table > row with hover state
   class="bg-gray-50 dark:bg-gray-700 hover:!bg-gray-100 dark:hover:!bg-gray-600 transition-colors"
 >
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     1
   </td>
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     Fruit 1
   </td>
   <td
-    class="text-sm text-gray-900 dark:text-white font-normal p-4"
+    class="text-sm text-gray-900 dark:text-white px-4 font-normal p-4"
     style="width: 150px;"
   >
     Description for 1