pixel-react 1.10.4 → 1.10.6

package/src/components/ConnectingBranch/data.tsx

@@ -1,225 +1,219 @@
 const machineData = {
-  executionSettings: {
-    machines: {
-      multiple: true,
-      totalNoScript: 250,
-      selectedMachines: [
-        {
-          clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
-          executionDataSet: {
-            peVariableSetId: 'UUID',
-            globalVariableSetId: 'UUID',
-            testDataSetId: 'UUID',
-          },
-          machineInstances: [],
+  machines: {
+    multiple: true,
+    totalNoScript: 250,
+    selectedMachines: [
+      {
+        clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
+        executionDataSet: {
+          peVariableSetId: 'UUID',
+          globalVariableSetId: 'UUID',
+          testDataSetId: 'UUID',
         },
-        {
-          clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
-          executionDataSet: {
-            peVariableSetId: 'UUID',
-            globalVariableSetId: 'UUID',
-            testDataSetId: 'UUID',
-          },
-          machineInstances: [
-            {
-              clientId:
-                'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
-              numberOfRuns: '3',
-              executionEnv: 'Local',
-              browserName: 'Google Chrome',
-              browserVersion: '107.0.5304.88',
-              systemUrl: '',
-              machineInfo: {
-                osName: 'Windows 11 Home Single Language',
-                osVersion: '10.0.22000',
-                hostName: 'LAPTOP-T793RVQN',
-              },
-              deviceInfo: [
-                {
-                  version: '10.0',
-                  name: 'Samsung Galaxy Note 20 Ultra',
-                  type: 'local',
-                  subType: 'device',
-                  platform: 'android',
-                },
-                {
-                  version: '18',
-                  name: 'iPhone 14',
-                  type: 'local',
-                  subType: 'device',
-                  platform: 'ios',
-                },
-              ],
-              headless: false,
-              runLevelExecutionDataSets: [
-                {
-                  peVariableSetId: 'UUID_1',
-                  globalVariableSetId: 'UUID',
-                  testDataSetId: 'UUID',
-                  runScriptCount: 12,
-                  browserRenderer: `<div>browser</div>`,
-                },
-              ],
-            },
-          ],
+        machineInstances: [],
+      },
+      {
+        clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
+        executionDataSet: {
+          peVariableSetId: 'UUID',
+          globalVariableSetId: 'UUID',
+          testDataSetId: 'UUID',
         },
-        {
-          clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
-          executionDataSet: {
-            peVariableSetId: 'UUID',
-            globalVariableSetId: 'UUID',
-            testDataSetId: 'UUID',
-          },
-          machineInstances: [
-            {
-              clientId:
-                'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
-              numberOfRuns: '3',
-              executionEnv: 'Local',
-              browserName: 'Google Chrome',
-              browserVersion: '107.0.5304.88',
-              systemUrl: '',
-              machineInfo: {
-                osName: 'Windows 11 Home Single Language',
-                osVersion: '10.0.22000',
-                hostName: 'LAPTOP-T793RVQN',
-              },
-              deviceInfo: [
-                {
-                  version: '10.0',
-                  name: 'Samsung Galaxy Note 20 Ultra',
-                  type: 'local',
-                  subType: 'device',
-                  platform: 'android',
-                },
-                {
-                  version: '18',
-                  name: 'iPhone 14',
-                  type: 'local',
-                  subType: 'device',
-                  platform: 'ios',
-                },
-              ],
-              headless: false,
-              runLevelExecutionDataSets: [
-                {
-                  peVariableSetId: 'UUID_1',
-                  globalVariableSetId: 'UUID',
-                  testDataSetId: 'UUID',
-                  runScriptCount: 12,
-                  browserRenderer: `<div>browser</div>`,
-                },
-              ],
+        machineInstances: [
+          {
+            clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
+            numberOfRuns: '3',
+            executionEnv: 'Local',
+            browserName: 'Google Chrome',
+            browserVersion: '107.0.5304.88',
+            systemUrl: '',
+            machineInfo: {
+              osName: 'Windows 11 Home Single Language',
+              osVersion: '10.0.22000',
+              hostName: 'LAPTOP-T793RVQN',
             },
-            {
-              clientId:
-                'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
-              numberOfRuns: '3',
-              executionEnv: 'Local',
-              browserName: 'Google Chrome',
-              browserVersion: '107.0.5304.88',
-              systemUrl: '',
-              machineInfo: {
-                osName: 'Windows 11 Home Single Language',
-                osVersion: '10.0.22000',
-                hostName: 'LAPTOP-T793RVQN',
+            deviceInfo: [
+              {
+                version: '10.0',
+                name: 'Samsung Galaxy Note 20 Ultra',
+                type: 'local',
+                subType: 'device',
+                platform: 'android',
               },
-              deviceInfo: [
-                {
-                  version: '10.0',
-                  name: 'Samsung Galaxy Note 20 Ultra',
-                  type: 'local',
-                  subType: 'device',
-                  platform: 'android',
-                },
-                {
-                  version: '18',
-                  name: 'iPhone 14',
-                  type: 'local',
-                  subType: 'device',
-                  platform: 'ios',
-                },
-              ],
-              headless: false,
-              runLevelExecutionDataSets: [
-                {
-                  peVariableSetId: 'UUID_1',
-                  globalVariableSetId: 'UUID',
-                  testDataSetId: 'UUID',
-                  runScriptCount: 12,
-                  executionDataSetId: 'uuid',
-                },
-              ],
-            },
-          ],
-        },
-        {
-          clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
-          executionDataSet: {
-            peVariableSetId: 'UUID',
-            globalVariableSetId: 'UUID',
-            testDataSetId: 'UUID',
+              {
+                version: '18',
+                name: 'iPhone 14',
+                type: 'local',
+                subType: 'device',
+                platform: 'ios',
+              },
+            ],
+            headless: false,
+            runLevelExecutionDataSets: [
+              {
+                peVariableSetId: 'UUID_1',
+                globalVariableSetId: 'UUID',
+                testDataSetId: 'UUID',
+                runScriptCount: 12,
+                browserRenderer: `<div>browser</div>`,
+              },
+            ],
           },
-          machineInstances: [
-            {
-              clientId:
-                'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
-              numberOfRuns: '3',
-              executionEnv: 'Local',
-              browserName: 'Google Chrome',
-              browserVersion: '107.0.5304.88',
-              systemUrl: '',
-              machineInfo: {
-                osName: 'Windows 11 Home Single Language',
-                osVersion: '10.0.22000',
-                hostName: 'LAPTOP-T793RVQN',
+        ],
+      },
+      {
+        clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
+        executionDataSet: {
+          peVariableSetId: 'UUID',
+          globalVariableSetId: 'UUID',
+          testDataSetId: 'UUID',
+        },
+        machineInstances: [
+          {
+            clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
+            numberOfRuns: '3',
+            executionEnv: 'Local',
+            browserName: 'Google Chrome',
+            browserVersion: '107.0.5304.88',
+            systemUrl: '',
+            machineInfo: {
+              osName: 'Windows 11 Home Single Language',
+              osVersion: '10.0.22000',
+              hostName: 'LAPTOP-T793RVQN',
+            },
+            deviceInfo: [
+              {
+                version: '10.0',
+                name: 'Samsung Galaxy Note 20 Ultra',
+                type: 'local',
+                subType: 'device',
+                platform: 'android',
+              },
+              {
+                version: '18',
+                name: 'iPhone 14',
+                type: 'local',
+                subType: 'device',
+                platform: 'ios',
               },
-              deviceInfo: [
-                {
-                  version: '10.0',
-                  name: 'Samsung Galaxy Note 20 Ultra',
-                  type: 'local',
-                  subType: 'device',
-                  platform: 'android',
-                },
-                {
-                  version: '18',
-                  name: 'iPhone 14',
-                  type: 'local',
-                  subType: 'device',
-                  platform: 'ios',
-                },
-              ],
-              headless: false,
-              runLevelExecutionDataSets: [
-                {
-                  peVariableSetId: 'UUID_1',
-                  globalVariableSetId: 'UUID',
-                  testDataSetId: 'UUID',
-                  runScriptCount: 12,
-                  browserRenderer: `<div>browser</div>`,
-                },
-                {
-                  peVariableSetId: 'UUID_1',
-                  globalVariableSetId: 'UUID',
-                  testDataSetId: 'UUID',
-                  runScriptCount: 12,
-                  browserRenderer: `<div>browser</div>`,
-                },
-                {
-                  peVariableSetId: 'UUID_1',
-                  globalVariableSetId: 'UUID',
-                  testDataSetId: 'UUID',
-                  runScriptCount: 12,
-                  browserRenderer: `<div>browser</div>`,
-                },
-              ],
+            ],
+            headless: false,
+            runLevelExecutionDataSets: [
+              {
+                peVariableSetId: 'UUID_1',
+                globalVariableSetId: 'UUID',
+                testDataSetId: 'UUID',
+                runScriptCount: 12,
+                browserRenderer: `<div>browser</div>`,
+              },
+            ],
+          },
+          {
+            clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
+            numberOfRuns: '3',
+            executionEnv: 'Local',
+            browserName: 'Google Chrome',
+            browserVersion: '107.0.5304.88',
+            systemUrl: '',
+            machineInfo: {
+              osName: 'Windows 11 Home Single Language',
+              osVersion: '10.0.22000',
+              hostName: 'LAPTOP-T793RVQN',
             },
-          ],
+            deviceInfo: [
+              {
+                version: '10.0',
+                name: 'Samsung Galaxy Note 20 Ultra',
+                type: 'local',
+                subType: 'device',
+                platform: 'android',
+              },
+              {
+                version: '18',
+                name: 'iPhone 14',
+                type: 'local',
+                subType: 'device',
+                platform: 'ios',
+              },
+            ],
+            headless: false,
+            runLevelExecutionDataSets: [
+              {
+                peVariableSetId: 'UUID_1',
+                globalVariableSetId: 'UUID',
+                testDataSetId: 'UUID',
+                runScriptCount: 12,
+                executionDataSetId: 'uuid',
+              },
+            ],
+          },
+        ],
+      },
+      {
+        clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
+        executionDataSet: {
+          peVariableSetId: 'UUID',
+          globalVariableSetId: 'UUID',
+          testDataSetId: 'UUID',
         },
-      ],
-      executionType: 'SEND_SUITE_TO_ALL',
-    },
+        machineInstances: [
+          {
+            clientId: 'flinko-client-win-daa67320-d70c-438e-b417-62d76669e7a2',
+            numberOfRuns: '3',
+            executionEnv: 'Local',
+            browserName: 'Google Chrome',
+            browserVersion: '107.0.5304.88',
+            systemUrl: '',
+            machineInfo: {
+              osName: 'Windows 11 Home Single Language',
+              osVersion: '10.0.22000',
+              hostName: 'LAPTOP-T793RVQN',
+            },
+            deviceInfo: [
+              {
+                version: '10.0',
+                name: 'Samsung Galaxy Note 20 Ultra',
+                type: 'local',
+                subType: 'device',
+                platform: 'android',
+              },
+              {
+                version: '18',
+                name: 'iPhone 14',
+                type: 'local',
+                subType: 'device',
+                platform: 'ios',
+              },
+            ],
+            headless: false,
+            runLevelExecutionDataSets: [
+              {
+                peVariableSetId: 'UUID_1',
+                globalVariableSetId: 'UUID',
+                testDataSetId: 'UUID',
+                runScriptCount: 12,
+                browserRenderer: `<div>browser</div>`,
+              },
+              {
+                peVariableSetId: 'UUID_1',
+                globalVariableSetId: 'UUID',
+                testDataSetId: 'UUID',
+                runScriptCount: 12,
+                browserRenderer: `<div>browser</div>`,
+              },
+              {
+                peVariableSetId: 'UUID_1',
+                globalVariableSetId: 'UUID',
+                testDataSetId: 'UUID',
+                runScriptCount: 12,
+                browserRenderer: `<div>browser</div>`,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+    executionType: 'SEND_SUITE_TO_ALL',
   },
 };
 

package/src/components/ConnectingBranch/types.ts

@@ -1,4 +1,4 @@
-import { ReactElement } from 'react';
+import { ReactElement, type FC } from 'react';
 
 type MachineInstanceData = any;
 export interface MachineInstance {
@@ -11,32 +11,41 @@ export interface MachineData {
   [key: string]: machineDataObj;
 }
 export interface MachineInstancesProps {
-  parentNode: number;
-  data: MachineData;
+  parentNodeIndex: number;
+  parentNodeData: MachineData;
   verticalLineHeight: number;
   datasetHeight: number;
   curveHeights: number[];
   itemRefs: React.MutableRefObject<(HTMLDivElement | null)[]>;
   datasetRef: React.RefObject<HTMLDivElement>;
-  getChildNodeComponent: (
-    isButton: boolean,
-    ...args: any[]
-  ) => ReactElement<any, any>;
+  getChildNodeComponent: FC<ConnectingNodeConfig>;
 }
 
 export type indexType = number;
 export type rowType = number;
-
+export interface RunLevelExecutionDataSet {
+  peVariableSetId: string;
+  globalVariableSetId: string;
+  testDataSetId: string;
+  runScriptCount?: number;
+  [key: string]: any;
+}
+export interface ConnectingNodeConfig {
+  isButton?: boolean;
+  isMultiSelect?: boolean;
+  parentNodeData?: { [key: string]: any };
+  parentNodeIndex?: number;
+  childNodeData?: { [key: string]: any };
+  childNodeIndex?: number;
+  runLevelExecutionDataSetIndex?: number;
+  runLevelExecutionDataSet?: RunLevelExecutionDataSet;
+}
 export interface ConnectBranchProps {
   data: MachineData;
   childNodeCurveHeight?: number;
-  getParentNodeComponent: (
-    isMultiSelect: boolean,
-    ...args: any[]
-  ) => ReactElement<any, any>;
-  getParentNodeComponentActionItems: (...args: any[]) => ReactElement<any, any>;
-  getChildNodeComponent: (
-    isButton: boolean,
-    ...args: any[]
-  ) => ReactElement<any, any>;
+  getParentNodeComponent: (nodeArgs: ConnectingNodeConfig) => ReactElement;
+  getParentNodeComponentActionItems: (
+    nodeArgs: ConnectingNodeConfig
+  ) => ReactElement;
+  getChildNodeComponent: (nodeArgs: ConnectingNodeConfig) => ReactElement;
 }

package/src/components/Excel/ColorBarSelector/ColorBarSelector.tsx

@@ -10,7 +10,7 @@ const ColorBarSelector: React.FC<ColorBarSelectorProps> = ({
   disabled,
 }) => {
   const colorInputRef = useRef<HTMLInputElement | null>(null);
-  const [color, setColor] = useState<string>('var(--error-light)');
+  const [color, setColor] = useState<string>('#e42525'); // Needed hexacode for backend
 
   const handleColorClick = () => {
     if (colorInputRef.current) {

package/src/components/Excel/ExcelFile/ExcelFile.scss

@@ -6,6 +6,10 @@
     top: 0;
   }
 
+  .ff-excel-sheet-bar-hider {
+    display: none;
+  }
+
   .ff-excel-sheet-bar {
     position: static;
     max-width: 100%;

package/src/components/Excel/ExcelFile/ExcelFile.tsx

@@ -31,25 +31,35 @@ interface ExcelFileProps {
   };
 
   /** Controls whether the toolbar is shown, disabled, or hidden */
-  toolbar?: 'show' | 'disable' | 'hide';
-
+  toolbar?: 'show' | 'hide';
+  sheetBar?: 'show' | 'hide';
+  rowCount?: number;
+  colCount?: number;
   /** Callback function to save the Excel data */
   onSave?: (saveData: any) => void;
   contextHeightPositioning?: number;
   contextWidthPositioning?: number;
   /** Set your dynamic sheet Height*/
   sheetHeight?: string;
+  columnContextEnable?: boolean;
+  rowContextEnable?: boolean;
 }
 
 const ExcelFile: React.FC<ExcelFileProps> = ({
   excelData,
   contextOption,
+  toolbar = 'show',
+  sheetBar = 'show',
+  rowCount = 26,
+  colCount = 26,
   sheetHeight = '100%',
   contextHeightPositioning = 0,
   contextWidthPositioning = 0,
   onSave = (saveData) => {
     saveData();
   },
+  columnContextEnable = false,
+  rowContextEnable = false,
 }) => {
   const [sheetNames, setSheetNames] = useState<string[]>([]);
   const [contextMenu, setContextMenu] = React.useState<ContextMenuState>({
@@ -61,19 +71,19 @@ const ExcelFile: React.FC<ExcelFileProps> = ({
   const EmptyRow: CellBase = {
     value: '',
     style: {
-      color: 'var(--input-hover-border-color)',
-      backgroundColor: 'var(--drawer-footer-bg)',
-      borderColor: 'var(--excel-sheet-border)',
+      color: '#000000', // Needed hexacode for backend
+      backgroundColor: '#ffffff', // Needed hexacode for backend
+      borderColor: '#c9c9c9', // Needed hexacode for backend
       textDecoration: 'none solid',
-      borderRight: `1px solid var(--excel-sheet-border)`,
-      borderLeft: `1px solid var(--excel-sheet-border)`,
-      borderTop: `1px solid var(--excel-sheet-border)`,
-      borderBottom: `1px solid var(--excel-sheet-border)`,
+      borderRight: `1px solid var(--excel-header-border)`,
+      borderLeft: `1px solid var(--excel-header-border)`,
+      borderTop: `1px solid var(--excel-header-border)`,
+      borderBottom: `1px solid var(--excel-header-border)`,
       fontSize: '15px',
       fontWeight: 'normal',
       fontStyle: 'normal',
       fontFamily: 'Times New Roman',
-      textAlign: 'center',
+      textAlign: 'left',
     },
   };
 
@@ -143,9 +153,9 @@ const ExcelFile: React.FC<ExcelFileProps> = ({
       payload.forEach((sheet) => {
         const sheetName = sheet.sheetName;
         const json = sheet.data;
-        const maxRows = Math.max(26, json.length + 2);
+        const maxRows = Math.max(rowCount, json.length + 2);
         const maxCols = Math.max(
-          26,
+          colCount,
           Math.max(...json.map((row) => row.length)) + 2
         );
 
@@ -164,11 +174,11 @@ const ExcelFile: React.FC<ExcelFileProps> = ({
                 value: checkVal(cell.value),
                 style: convertStyleToFrontend(cell?.styles), //TODO remove 's' for Style
                 type: true,
+                isDisable: checkVal(cell.isDisable),
               };
             }
           });
         });
-
         newWorksheetsData[sheetName] = spreadsheetData;
       });
       setWorksheetsData(newWorksheetsData);
@@ -270,8 +280,8 @@ const ExcelFile: React.FC<ExcelFileProps> = ({
     const baseName = 'NewSheet';
     const existingSheetNames = sheetNames;
     const newSheetName = generateUniqueSheetName(baseName, existingSheetNames);
-    const newSheetData = Array.from({ length: 26 }, () =>
-      Array.from({ length: 26 }, () => EmptyRow)
+    const newSheetData = Array.from({ length: rowCount }, () =>
+      Array.from({ length: colCount }, () => EmptyRow)
     );
     setSheetNames((prev) => [...prev, newSheetName]);
     setSelectedSheet({ index: sheetNames?.length, name: newSheetName });
@@ -468,14 +478,23 @@ const ExcelFile: React.FC<ExcelFileProps> = ({
         <div className="ff-excel" onContextMenu={setContextPosition}>
           <div ref={sheetRef} className="ff-excel-sheet">
             <Spreadsheet
+              toolbar={toolbar}
               sheetHeight={sheetHeight}
               setContextMenu={setContextMenu}
               contextOption={contextOption}
               data={selectedSheetData}
+              columnContextEnable={columnContextEnable}
+              rowContextEnable={rowContextEnable}
               onEvaluatedDataChange={onEvaluateChange}
             />
           </div>
-          <div className="ff-excel-sheet-bar">
+          <div
+            className={
+              sheetBar === 'hide'
+                ? 'ff-excel-sheet-bar-hider'
+                : 'ff-excel-sheet-bar'
+            }
+          >
             <div className="ff-excel-add-sheet-set">
               <Tooltip title="Add Sheet" placement="top">
                 <Icon