Fix: Script Gen Textbox Input Don’t Accept Numbers Without Units (#48)

* TSP-947 Script generation infrastructure first cut

* TSP-947 Fix multiple channel issue in script

* TSP-948 Fix linting issues

* TSP-Script-Gen-UI- Linting done (both angular and rust)

* TSP-Script-Gen-UI step and sweep points update fixed to show on plot

* TSP-Script-Gen All linitng done with standalones

* TSP-960-Scrolling input containers to view done

* TSP-Scrip-Gen-UI- Scroll into view feature done

* Script-Gen-UI- UI changes done (through reviews from UX team)

* Revert "Merge branch 'main' into task/TSP-960-style-layout"

This reverts commit 12b90fcd4c35917273d40a01e1c5f21dfc5ac79e, reversing
changes made to beb512d73be7731c565fec696796c0cd47e5878a.

* Reapply "Merge branch 'main' into task/TSP-960-style-layout"

This reverts commit 712497e134fc83278e4ec837ff50212ac1f77484.

* TSP-960-Scroll-Into-View done with UI changes

* TSP-944-resizing and layout of the input containers done

* Script-Gen-UI- Fixed the error and bias plot background color

* Script-Gen-UI- Sweep color fix

* Script-Gen-UI- fixed arrows and step add and remove button

* TSP-944- Input panes reflow when shrunk done

* Added styles to timing popup

* Removed files as per review comment

* tsp-1123-Fix start and stop CSS in Step and Sweep Section

* Fix start and stop border in step and sweep

* tsp-1123-Fix leaking CSS in start and stop

* Task/tsp-1201-Correct the spelling of the "Aperture" textbox in the Timing tab

* task/tsp-1199-fix-automation name & IDs are missing for the combo box and textboxes in the Timing Tab

* fix automation IDs for measure delay and rate

* remove duplicate automationID from input-numeric

* TSP-1202-add automation Names and automationIDs for Bias

* Fix automation names for NPLC and Aperture in Timing

* fix issue with automation names in timing and bias (script-gen)

* fix: bias plot range for source range AUTO

* fix: tsp-1230 and tsp-1231
-The automation name & IDs are missing for the combo box and textboxes in the Step
-The automation name & IDs are missing for the combo box and textboxes in the Sweep

* fix: Script Gen- Sweep Graph Preview Cuts Off End of Graph

* refactor: move repeated code into function generatePlotData()

* fix: restrict timing tab drag to webview panel

* fix: Script Gen Textbox Input Don’t Accept Numbers Without Units

---------

Co-authored-by: GT, Shreya <[email protected]>
Co-authored-by: Rajeshwari Kiwad <[email protected]>

Author: 3 people

script-gen-ui/src/app/components/controls/input-parser.util.ts

@@ -23,8 +23,8 @@ export const REVERSE_PREFIXES: Record<string, number> = {
   'T': 12,
 };
 
-export function parseScientificInput(input: string): string {
-  const regex = /^(-?[\d.]+)(e([+-]?\d+))?\s*([a-zA-Zµ]*)?\s*([a-zA-Z]+)$/;
+export function parseScientificInput(input: string, unit: string | undefined): string {
+  const regex = /^(-?[\d.]+)(e([+-]?\d+))?\s*([a-zA-Zµ]?)\s*([a-zA-Z]+)?$/;
   const match = input.match(regex);
 
   if (!match) {
@@ -38,7 +38,7 @@ export function parseScientificInput(input: string): string {
   let numericValue = parseFloat(value) * Math.pow(10, parseInt(exponent || '0'));
 
   if (numericValue === 0) {
-    return `0 ${baseUnit}`;
+    return `0 ${baseUnit || unit}`;
   }
 
   const existingExponent = REVERSE_PREFIXES[normalizedPrefix || ''] || 0;
@@ -49,18 +49,21 @@ export function parseScientificInput(input: string): string {
   const roundedValue = parseFloat(scaledValue.toFixed(3));
   const newPrefix = finalExponent === 0 ? '' : SCIENTIFIC_PREFIXES[finalExponent] || `e${finalExponent}`;
 
-  return `${roundedValue} ${newPrefix}${baseUnit || ''}`;
+  return `${roundedValue} ${newPrefix}${baseUnit || unit || ''}`;
 }
 
-export function parseToDecimal(input: string): number | null {
-  const regex = /^(-?[\d.]+)(e([+-]?\d+))?\s*([a-zA-Zµ]*)?\s*([a-zA-Z]+)$/;
+export function parseToDecimal(input: string, unit?: string | undefined): number | null {
+  const regex = /^(-?[\d.]+)(e([+-]?\d+))?\s*([a-zA-Zµ]?)\s*([a-zA-Z]+)?$/;
   const match = input.match(regex);
 
   if (!match) {
     return null; // Invalid input
   }
 
-  const [, value, , exponent, prefix] = match;
+  const [, value, , exponent, prefix, baseUnit] = match;
+  if (baseUnit && baseUnit !== unit) {
+    return null; // Incompatible units
+  }
   let normalizedPrefix = prefix;
   if (normalizedPrefix === 'µ') normalizedPrefix = 'u';
 

script-gen-ui/src/app/components/controls/input-plain/input-plain.component.ts

@@ -50,7 +50,7 @@ export class InputPlainComponent implements ControlValueAccessor, OnInit {
   // TODO: have to make the rounding off based on the resolution defined for each range
 
   get displayValue(): string {
-    const parsedValue = parseScientificInput(`${this._value} ${this.unit}`);
+    const parsedValue = parseScientificInput(`${this._value} ${this.unit}`, this.unit);
     // If parseScientificInput returns a valid value, update _displayValue
     if (parsedValue && parsedValue !== 'Invalid input') {
       this._displayValue = parsedValue;
@@ -63,7 +63,7 @@ export class InputPlainComponent implements ControlValueAccessor, OnInit {
   }
 
   set displayValue(val: string) {
-    const decimalValue = parseToDecimal(val);
+    const decimalValue = parseToDecimal(val,this.unit);
     if (decimalValue !== null) {
       this._value = decimalValue;
 
@@ -96,12 +96,11 @@ export class InputPlainComponent implements ControlValueAccessor, OnInit {
 
   onInputChange(event: Event): void {
     const inputElement = event.target as HTMLInputElement;
-
     if (this.displayValue !== inputElement.value) {
       const previousValue = this.displayValue;
       this.displayValue = inputElement.value;
 
-      if (parseToDecimal(inputElement.value) === null) {
+      if (parseToDecimal(inputElement.value, this.unit) === null) {
         inputElement.value = previousValue; // If the input is invalid, revert to the previous value
       } else {
         inputElement.value = this.displayValue; // Update the input element with the parsed value