pixel-react-excel-sheet 1.0.23 → 1.0.24

package/src/components/PhoneInput/types.ts

@@ -7,4 +7,10 @@ export interface PhoneInputProps {
   width?: string;
   placeholder?: string;
   isValid: any;
+  id: string;
+  international?: boolean;
+  dropdownStyle?: React.CSSProperties;
+  enableAreaCodeStretch?: boolean;
+  defaultCountry?: string;
+  disabled?: boolean;
 }

package/src/components/SequentialConnectingBranch/SequentialConnectingBranch.stories.tsx

@@ -1,6 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react';
 import SequentialConnectingBranch from './SequentialConnectingBranch';
 import { useState } from 'react';
+import React from 'react';
 
 const meta: Meta<typeof SequentialConnectingBranch> = {
   title: 'Components/SequentialConnectingBranch',
@@ -44,9 +45,19 @@ export const Primary: Story = {
           onHandleSelect={(option) => {
             setSelectedMachine(option);
           }}
-          onAddBrowserInstance={() => {
-            setMachineInstances([...machineInstances, {}]);
+          onAddBrowserInstance={() => {}}
+          onUpdateAddBrowserInstance={() => {}}
+          onAddRunBrowserInstance={() => {}}
+          onDeleteMachineInstance={() => {}}
+          onDeleteBrowserInstance={() => {}}
+          dataSetValues={{
+            peVariableSetId: 'Test dev',
+            globalVariableSetId: 'Test dev',
+            testDataSetId: 'Test dev',
           }}
+          onUpdateDataSetList={() => {}}
+          machineColumnWidth={500}
+          machineColumnCount={3}
         />
       </>
     );

package/src/components/SequentialConnectingBranch/SequentialConnectingBranch.tsx

@@ -27,6 +27,9 @@ const SequentialConnectingBranch: FC<SequentialConnectingBranchProps> = ({
     peVariableSetId: '',
   },
   onUpdateAddBrowserInstance = () => {},
+  addInstanceLabel = 'Add Environment',
+  scriptType = 'Automation',
+  projectType = 'Web',
 }) => {
   const [selectedMachineInstance, setSelectedMachineInstance] = useState({});
   const selectButtonRef = useRef<HTMLButtonElement>(null);
@@ -38,7 +41,11 @@ const SequentialConnectingBranch: FC<SequentialConnectingBranchProps> = ({
   >([]);
 
   const isMachineInstances = checkEmpty(machineInstances);
-  const isMachineSelected = checkEmpty(selectedMachine.value?.clientId);
+  let isMachineSelected = checkEmpty(selectedMachine.value?.clientId);
+
+  if (scriptType === 'Manual') {
+    isMachineSelected = checkEmpty(selectedMachine.value);
+  }
 
   const getMachineStatusColor = (machineStatus: string = '') => {
     if (machineStatus.toLowerCase().includes('inactive'))
@@ -57,6 +64,9 @@ const SequentialConnectingBranch: FC<SequentialConnectingBranchProps> = ({
   useEffect(() => {
     setMachineBranchInstances([...machineInstances, {}]);
   }, [machineInstances]);
+
+  const hideDataSet = scriptType.toLowerCase() !== 'manual';
+
   return (
     <div className="ff-sequential-connecting-branch-wrapper">
       <div className="ff-connecting-select-branch-wrapper">
@@ -119,25 +129,27 @@ const SequentialConnectingBranch: FC<SequentialConnectingBranchProps> = ({
             </div>
 
             <div className="ff-datalist-wrapper">
-              <div
-                id="ff-sequential-machine-datalist"
-                onClick={() =>
-                  onUpdateDataSetList(
-                    'ff-sequential-machine-datalist',
-                    dataSetValues
-                  )
-                }
-              >
-                <Icon name="datalist_icon" className="ff-dataset-icon" />
-                <Typography
-                  as="span"
-                  fontSize={12}
-                  color="var(--ff-connecting-branch-color)"
-                  className="ff-datalist-text"
+              {hideDataSet && (
+                <div
+                  id="ff-sequential-machine-datalist"
+                  onClick={() =>
+                    onUpdateDataSetList(
+                      'ff-sequential-machine-datalist',
+                      dataSetValues
+                    )
+                  }
                 >
-                  Dataset List
-                </Typography>
-              </div>
+                  <Icon name="datalist_icon" className="ff-dataset-icon" />
+                  <Typography
+                    as="span"
+                    fontSize={12}
+                    color="var(--ff-connecting-branch-color)"
+                    className="ff-datalist-text"
+                  >
+                    Dataset List
+                  </Typography>
+                </div>
+              )}
               <Icon
                 name="delete"
                 className="ff-run-delete-icon"
@@ -159,6 +171,9 @@ const SequentialConnectingBranch: FC<SequentialConnectingBranchProps> = ({
             onAddRunBrowser={onAddRunBrowserInstance}
             onUpdateDataSetList={onUpdateDataSetList}
             onUpdateAddBrowserInstance={onUpdateAddBrowserInstance}
+            addInstanceLabel={addInstanceLabel}
+            scriptType={scriptType}
+            projectType={projectType}
           />
         )}
       </div>

package/src/components/SequentialConnectingBranch/components/Branches/Branches.tsx

@@ -9,6 +9,7 @@ import Icon from '../../../Icon';
 import Typography from '../../../Typography';
 import Button from '../../../Button';
 import './Branches.scss';
+import { MachineType } from '../../../MachineInputField/types';
 
 const Branches = ({
   machineInstances,
@@ -22,6 +23,9 @@ const Branches = ({
   onAddRunBrowser,
   onUpdateDataSetList,
   onUpdateAddBrowserInstance,
+  addInstanceLabel = '',
+  scriptType = '',
+  projectType = '',
 }: BranchesProps) => {
   const evenRow = rowIndex % 2 === 0;
   const lastMachineInstance = checkEmpty(
@@ -57,6 +61,78 @@ const Branches = ({
     }, 40px ${machineColumnWidth}px) 24px`;
   };
 
+  const getMachineLabelOptionList = (
+    type: string = '',
+    machineInstance: ExecutionContext | {}
+  ) => {
+    const {
+      executionEnv,
+      browserName,
+      browserVersion,
+      machineInfo: { osVersion, iconName },
+      deviceInfo,
+    } = machineInstance as ExecutionContext;
+    // Helper to handle device info safely
+    const getDeviceOption = (platform: string, defaultType: string = '', index = 0) =>
+      deviceInfo?.[index]?.platform?.toLowerCase().includes(platform ?? '')
+        ? defaultType
+        : undefined;
+
+    const getEnvironment = (environment: string = '') => {
+      if (environment.toLowerCase().includes('browserstack'))
+        return 'Browserstack';
+      if (environment.toLowerCase().includes('lambdatest')) return 'LambdaTest';
+      if (environment.toLowerCase().includes('saucelabs')) return 'SauceLabs';
+      return '';
+    };
+
+    // Base options
+    const baseOptions = [
+      {
+        label: executionEnv,
+        type: getEnvironment(executionEnv),
+      },
+    ];
+
+    // Web-specific options
+    const webOptions = [
+      {
+        label: osVersion,
+        type: iconName,
+      },
+      {
+        label: browserVersion,
+        type: browserName,
+      },
+    ];
+
+    // Mobile-specific options
+    const mobileOptions = [
+      {
+        label: deviceInfo?.[0]?.name,
+        type: getDeviceOption('android', 'android_icon', 0),
+      },
+      {
+        label: deviceInfo?.[1]?.name,
+        type: getDeviceOption('ios', 'mac_icon', 1),
+      },
+    ];
+
+    // Determine options based on the type
+    switch (type.toLowerCase()) {
+      case 'web':
+        return [...baseOptions, ...webOptions];
+      case 'web & mobile':
+        return [...baseOptions, ...webOptions, ...mobileOptions];
+      case 'mobile':
+        return [...baseOptions, ...mobileOptions];
+      default:
+        return [];
+    }
+  };
+
+  const hideDataSet = scriptType.toLowerCase() !== 'manual';
+
   return (
     <div
       className={classNames({
@@ -92,9 +168,6 @@ const Branches = ({
       </div>
       {machineInstances?.map((machineInstance, index) => {
         const {
-          executionEnv = 'Local',
-          browserName = 'Local',
-          browserVersion = '1',
           numberOfRuns = 'numberOfRuns' in machineInstance
             ? machineInstance.numberOfRuns
             : 0,
@@ -118,16 +191,18 @@ const Branches = ({
                     width={`${machineColumnWidth}px`}
                     runCount={numberOfRuns}
                     key={ffid()}
-                    options={[
-                      { label: executionEnv, type: executionEnv },
-                      { label: browserVersion, type: browserName },
-                    ]}
+                    options={
+                      getMachineLabelOptionList(
+                        projectType,
+                        machineInstance
+                      ) as MachineType[]
+                    }
                     contentReverse={!evenRow}
                     modalId={`${machineInstanceId}-runCount-${numberOfRuns}`}
                     onClick={() =>
                       onUpdateAddBrowserInstance(
                         `${machineInstanceId}-runCount-0`,
-                        machineInstanceId
+                          machineInstance as ExecutionContext
                       )
                     }
                   />
@@ -138,31 +213,36 @@ const Branches = ({
                     'ff-connecting-branch-datalist-reverse': !evenRow,
                   })}
                 >
-                  <div
-                    id={`ff-sequential-branch-dataset-${machineInstanceId}-${numberOfRuns}`}
-                    className="ff-dataset-list-branch"
-                    onClick={() =>
-                      onUpdateDataSetList(
-                        `ff-sequential-branch-dataset-${machineInstanceId}-${numberOfRuns}`,
-                        {
-                          peVariableSetId: peVariableSetId,
-                          globalVariableSetId: globalVariableSetId,
-                          testDataSetId: testDataSetId,
-                        },
-                        true,
-                        numberOfRuns,
-                        machineInstanceId
-                      )
-                    }
-                  >
-                    <Icon name="datalist_icon" className="ff-connecting-icon" />
-                    <Typography
-                      className="ff-connecting-text"
-                      color="var(--ff-connecting-branch-color)"
+                  {hideDataSet && (
+                    <div
+                      id={`ff-sequential-branch-dataset-${machineInstanceId}-${numberOfRuns}`}
+                      className="ff-dataset-list-branch"
+                      onClick={() =>
+                        onUpdateDataSetList(
+                          `ff-sequential-branch-dataset-${machineInstanceId}-${numberOfRuns}`,
+                          {
+                            peVariableSetId: peVariableSetId,
+                            globalVariableSetId: globalVariableSetId,
+                            testDataSetId: testDataSetId,
+                          },
+                          true,
+                          numberOfRuns,
+                          machineInstanceId
+                        )
+                      }
                     >
-                      Dataset List
-                    </Typography>
-                  </div>
+                      <Icon
+                        name="datalist_icon"
+                        className="ff-connecting-icon"
+                      />
+                      <Typography
+                        className="ff-connecting-text"
+                        color="var(--ff-connecting-branch-color)"
+                      >
+                        Dataset List
+                      </Typography>
+                    </div>
+                  )}
                   <Icon
                     name="plus_icon"
                     className="ff-connecting-icon"
@@ -190,7 +270,7 @@ const Branches = ({
                 <Button
                   id={`ff-sequential-branch-add-${machineInstanceId}`}
                   variant="tertiary"
-                  label="Add Environrment"
+                  label={addInstanceLabel}
                   onClick={() =>
                     onAddBrowser(
                       `ff-sequential-branch-add-${machineInstanceId}`

package/src/components/SequentialConnectingBranch/components/Branches/types.ts

@@ -10,7 +10,6 @@ export interface BranchesProps {
   onAddBrowser: (modalId: string) => void;
   onDeleteBrowser: (id: string, runCount: number) => void;
   onAddRunBrowser: (id: string) => void;
-  onUpdateAddBrowserInstance: (id: string, machineInstanceId: string) => void;
   onUpdateDataSetList: (
     id: string,
     dataSetObject: dataSetValues,
@@ -18,6 +17,13 @@ export interface BranchesProps {
     noOfRuns?: number,
     machineInstanceId?: string
   ) => void;
+  addInstanceLabel?: string;
+  scriptType?: string;
+  onUpdateAddBrowserInstance: (
+    modalId: string,
+    machineInstance: ExecutionContext
+  ) => void;
+  projectType?: string;
 }
 
 export interface branchTypeProps {

package/src/components/SequentialConnectingBranch/components/ConnectingBranches/ConnectingBranches.tsx

@@ -15,6 +15,9 @@ const ConnectingBranches = ({
   onAddRunBrowser,
   onUpdateDataSetList,
   onUpdateAddBrowserInstance,
+  addInstanceLabel = '',
+  scriptType = '',
+  projectType = 'Web',
 }: ConnectingBranchesProps) => {
   const [machineInstance, setMachineInstance] = useState<
     ExecutionContext[] | {}[]
@@ -60,6 +63,9 @@ const ConnectingBranches = ({
             }
             onUpdateDataSetList={onUpdateDataSetList}
             onUpdateAddBrowserInstance={onUpdateAddBrowserInstance}
+            addInstanceLabel={addInstanceLabel}
+            scriptType={scriptType}
+            projectType={projectType}
           />
         </Fragment>
       ))}

package/src/components/SequentialConnectingBranch/components/ConnectingBranches/types.ts

@@ -7,7 +7,6 @@ export interface ConnectingBranchesProps {
   onAddBrowser: (modalId: string) => void;
   onDeleteBrowser: (id: string, runCount: number) => void;
   onAddRunBrowser: (id: string) => void;
-  onUpdateAddBrowserInstance: (id: string, machineInstanceId: string) => void;
   onUpdateDataSetList: (
     id: string,
     dataSetObject: dataSetValues,
@@ -15,4 +14,11 @@ export interface ConnectingBranchesProps {
     noOfRuns?: number,
     machineInstanceId?: string
   ) => void;
+  addInstanceLabel?: string;
+  scriptType?: string;
+  projectType?: string;
+  onUpdateAddBrowserInstance: (
+    modalId: string,
+    machineInstance: ExecutionContext
+  ) => void;
 }

package/src/components/SequentialConnectingBranch/types.ts

@@ -8,7 +8,7 @@ export interface SequentialConnectingBranchProps {
   machineOptionsList?: Option[];
   onHandleSelect?: (option: Option) => void;
   onAddBrowserInstance?: (modalId: string) => void;
-  onUpdateAddBrowserInstance: (id: string, machineInstanceId: string) => void;
+  onUpdateAddBrowserInstance: (modalId: string, machineInstance: ExecutionContext) => void;
   onDeleteBrowserInstance?: (id: string, runCount: number) => void;
   onAddRunBrowserInstance?: (machineInstanceId: string) => void;
   onDeleteMachineInstance?: () => void;
@@ -20,6 +20,9 @@ export interface SequentialConnectingBranchProps {
     machineInstanceId?: string
   ) => void;
   dataSetValues: dataSetValues;
+  addInstanceLabel?: string;
+  scriptType?: string;
+  projectType?: string;
 }
 
 // Type for machine information
@@ -27,14 +30,13 @@ export interface MachineInfo {
   osName: string;
   osVersion: string;
   hostName: string;
+  iconName: string;
 }
 
 // Type for device information
 export interface DeviceInfo {
-  // Define properties as needed; assuming it can have various structures.
-  // For example:
-  // deviceName: string;
-  // deviceType: string;
+  name: string;
+  platform: string;
 }
 
 export interface ExecutionContext {

package/src/components/TableTree/TableTree.tsx

@@ -28,9 +28,7 @@ const TreeTable: React.FC<TreeTableProps> = ({
           if (entry.target.id === 'ff-table-tree-last-node') {
             direction = 'down';
           }
-          loadMore();
-          console.log(direction);
-          
+          loadMore(direction);
         }
         console.log('Element in view:', entry.target.id);
       }

package/src/components/TableTree/data.ts

@@ -74,51 +74,6 @@ const data = [
     },
     level: 1,
   },
-  {
-    node: {
-      subModuleCount: 10,
-      title: 'Home',
-      scriptCount: 0,
-      path: '/Root/Home',
-      expanded: true,
-      modifiedOn: '19-12-2023 15:43',
-      folder: true,
-      children: false,
-      parentId: 'MOD100', // Parent is '/Root'
-      id: 'MOD10030', // Unique ID
-    },
-    level: 1,
-  },
-  {
-    node: {
-      subModuleCount: 10,
-      title: 'Home',
-      scriptCount: 0,
-      path: '/Root/Home',
-      expanded: true,
-      modifiedOn: '19-12-2023 15:43',
-      folder: true,
-      children: false,
-      parentId: 'MOD1001', // Parent is '/Root'
-      id: 'MOD100301', // Unique ID
-    },
-    level: 1,
-  },
-  {
-    node: {
-      subModuleCount: 10,
-      title: 'Home',
-      scriptCount: 0,
-      path: '/Root/Home',
-      expanded: true,
-      modifiedOn: '19-12-2023 15:43',
-      folder: true,
-      children: false,
-      parentId: 'MOD1001', // Parent is '/Root'
-      id: 'MOD100302', // Unique ID
-    },
-    level: 1,
-  },
   {
     node: {
       ver: 1,

package/src/components/TableTree/types.ts

@@ -49,11 +49,11 @@ export interface Column {
   accessor: string;
   width: string;
   isClickable?: boolean;
-  cell?: (row: any) => JSX
-  actions?: (row: any) => JSX
+  cell?: (row: any) => JSX;
+  actions?: (row: any) => JSX;
   isTree?: boolean;
   defaultValue?: string;
-  defaultActions?: () => JSX
+  defaultActions?: () => JSX;
 }
 
 export interface TreeTableProps {

package/src/utils/getSequentialPayload/types.ts

@@ -2,6 +2,7 @@ export interface OperatingSystemInfo {
   osName: string;
   osVersion: string;
   hostName: string;
+  iconName: string;
 }
 
 export interface RunLevelExecutionDataSet {