From fe060525364be3150e3c8a6813a7bf384d14a7f6 Mon Sep 17 00:00:00 2001
From: Mil4n0r <morenocarmonaenrique@gmail.com>
Date: Wed, 15 May 2024 12:34:12 +0200
Subject: [PATCH 1/5] Fixed resultSet typing for rows

---
 lib/src/resultset-table/ResultsetTable.tsx | 6 +++---
 lib/src/resultset-table/types.ts           | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/src/resultset-table/ResultsetTable.tsx b/lib/src/resultset-table/ResultsetTable.tsx
index 4f783c3726..fe416241a3 100644
--- a/lib/src/resultset-table/ResultsetTable.tsx
+++ b/lib/src/resultset-table/ResultsetTable.tsx
@@ -12,7 +12,7 @@ import CoreTokens from "../common/coreTokens";
 const normalizeSortValue = (sortValue: string | React.ReactNode) =>
   typeof sortValue === "string" ? sortValue.toUpperCase() : sortValue;
 
-const sortArray = (index: number, order: "ascending" | "descending", resultset: { id: string; cells: Row[] }[]) =>
+const sortArray = (index: number, order: "ascending" | "descending", resultset: { id: string; cells: Row }[]) =>
   resultset.slice().sort((element1, element2) => {
     const sortValueA = normalizeSortValue(element1.cells[index].sortValue || element1[index].displayValue);
     const sortValueB = normalizeSortValue(element2.cells[index].sortValue || element2[index].displayValue);
@@ -35,11 +35,11 @@ const getMinItemsPerPageIndex = (currentPageInternal: number, itemsPerPage: numb
 const getMaxItemsPerPageIndex = (
   minItemsPerPageIndex: number,
   itemsPerPage: number,
-  resultset: Row[][],
+  resultset: Row[],
   page: number,
 ) => (minItemsPerPageIndex + itemsPerPage > resultset.length ? resultset.length : itemsPerPage * page - 1);
 
-const assignIdsToRows = (resultset: Row[][]) => {
+const assignIdsToRows = (resultset: Row[]) => {
   if (resultset.length > 0) {
     return resultset.map((row, index) => ({
       cells: row,
diff --git a/lib/src/resultset-table/types.ts b/lib/src/resultset-table/types.ts
index 20fac4edfa..278c0bd683 100644
--- a/lib/src/resultset-table/types.ts
+++ b/lib/src/resultset-table/types.ts
@@ -17,7 +17,7 @@ export type Column = {
   isSortable?: boolean;
 };
 
-export type Row = {
+type Cell = {
   /**
    * Value to be displayed in the cell.
    */
@@ -29,6 +29,8 @@ export type Row = {
   sortValue?: string;
 };
 
+export type Row = Cell[];
+
 type CommonProps = {
   /**
    * An array of objects representing the columns of the table.
@@ -38,7 +40,7 @@ type CommonProps = {
    * An array of objects representing the rows of the table, you will have
    * as many objects as columns in the table.
    */
-  rows: Row[][];
+  rows: Row[];
   /**
    * Size of the margin to be applied to the component. You can pass an object with 'top',
    * 'bottom', 'left' and 'right' properties in order to specify different margin sizes.

From 008d4cc6998b4ee3079e2cdca2981d8d224bf277 Mon Sep 17 00:00:00 2001
From: Mil4n0r <morenocarmonaenrique@gmail.com>
Date: Wed, 15 May 2024 12:42:21 +0200
Subject: [PATCH 2/5] Clarified code page typing

---
 .../resultset-table/code/ResultsetTableCodePage.tsx           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx b/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
index 638deecb76..476186491e 100644
--- a/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
+++ b/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
@@ -81,12 +81,12 @@ const sections = [
             </td>
             <td>
               <TableCode>
-                {"{ displayValue: React.ReactNode; sortValue?: string; }[]"}
+                {"{ displayValue: React.ReactNode; sortValue?: string; }[][]"}
               </TableCode>
             </td>
             <td>
               An array of objects representing the rows of the table, you will
-              have as many objects as columns in the table. Each object has the
+              have as many objects as columns in the table. Each row is composed of cells that have the
               following properties:
               <ul>
                 <li>

From 678f9ce5baed38929879e61868734cb71ce1cd19 Mon Sep 17 00:00:00 2001
From: Mil4n0r <morenocarmonaenrique@gmail.com>
Date: Wed, 15 May 2024 12:45:36 +0200
Subject: [PATCH 3/5] Fixed typo

---
 .../components/resultset-table/code/ResultsetTableCodePage.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx b/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
index 476186491e..79add0234a 100644
--- a/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
+++ b/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
@@ -86,7 +86,7 @@ const sections = [
             </td>
             <td>
               An array of objects representing the rows of the table, you will
-              have as many objects as columns in the table. Each row is composed of cells that have the
+              have as many objects as columns in the table. Each row is a set of cells that have the
               following properties:
               <ul>
                 <li>

From fd25e6baf901adcd7fc0038dc056a6a4053a0c12 Mon Sep 17 00:00:00 2001
From: Mil4n0r <morenocarmonaenrique@gmail.com>
Date: Mon, 20 May 2024 08:48:55 +0200
Subject: [PATCH 4/5] Clarified types in code doc

---
 .../code/ResultsetTableCodePage.tsx           | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx b/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
index 79add0234a..e7d95b870c 100644
--- a/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
+++ b/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
@@ -31,6 +31,9 @@ const actionsType = `{
   options: Option[];
 }[]`;
 
+const cellTypeString = `{ displayValue: React.ReactNode; sortValue?: string; }[]`;
+const columnTypeString = `{ displayValue: React.ReactNode; isSortable?: boolean; }`;
+
 const sections = [
   {
     title: "Props",
@@ -53,9 +56,12 @@ const sections = [
               </DxcFlex>
             </td>
             <td>
-              <TableCode>
-                {"{ displayValue: React.ReactNode; isSortable?: boolean; }[]"}
-              </TableCode>
+              <TableCode>Column[]</TableCode>
+              <p>
+                being <Code>Column</Code> an object with the following
+                properties:
+              </p>
+              <ExtendedTableCode>{columnTypeString}</ExtendedTableCode>
             </td>
             <td>
               An array of objects representing the columns of the table. Each
@@ -80,14 +86,17 @@ const sections = [
               </DxcFlex>
             </td>
             <td>
-              <TableCode>
-                {"{ displayValue: React.ReactNode; sortValue?: string; }[][]"}
-              </TableCode>
+              <TableCode>Row[]</TableCode>
+              <p>
+                being <Code>Row</Code> a <Code>Cell[]</Code> and being{" "}
+                <Code>Cell</Code> an object with the following properties:
+              </p>
+              <ExtendedTableCode>{cellTypeString}</ExtendedTableCode>
             </td>
             <td>
               An array of objects representing the rows of the table, you will
-              have as many objects as columns in the table. Each row is a set of cells that have the
-              following properties:
+              have as many objects as columns in the table. Each row is a set of
+              cells that have the following properties:
               <ul>
                 <li>
                   <b>displayValue</b>: Value to be displayed in the cell.

From f2570956ccaa5a0936b330a2764b565667e40d8f Mon Sep 17 00:00:00 2001
From: Mil4n0r <morenocarmonaenrique@gmail.com>
Date: Mon, 20 May 2024 11:55:46 +0200
Subject: [PATCH 5/5] Added linebreaks

---
 .../resultset-table/code/ResultsetTableCodePage.tsx    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx b/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
index e7d95b870c..4fd6631aba 100644
--- a/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
+++ b/website/screens/components/resultset-table/code/ResultsetTableCodePage.tsx
@@ -31,8 +31,14 @@ const actionsType = `{
   options: Option[];
 }[]`;
 
-const cellTypeString = `{ displayValue: React.ReactNode; sortValue?: string; }[]`;
-const columnTypeString = `{ displayValue: React.ReactNode; isSortable?: boolean; }`;
+const cellTypeString = `{ 
+  displayValue: React.ReactNode; 
+  sortValue?: string; 
+}[]`;
+const columnTypeString = `{ 
+  displayValue: React.ReactNode; 
+  isSortable?: boolean; 
+}`;
 
 const sections = [
   {