Merge branch 'develop' into fb_assayDesignerFixes258

# Conflicts:
#	packages/components/package-lock.json
#	packages/components/package.json
#	packages/components/releaseNotes/components.md

Author: cnathe

packages/components/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "6.56.2-assayDesignerFixes258.0",
+  "version": "6.56.3",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
@@ -50,7 +50,7 @@
   "homepage": "https://github.com/LabKey/labkey-ui-components#readme",
   "dependencies": {
     "@hello-pangea/dnd": "18.0.1",
-    "@labkey/api": "1.42.0",
+    "@labkey/api": "1.42.1",
     "@testing-library/dom": "~10.4.0",
     "@testing-library/jest-dom": "~6.6.3",
     "@testing-library/react": "~16.3.0",

packages/components/package.json

@@ -6,6 +6,13 @@ Components, models, actions, and utility functions for LabKey applications and p
 - GitHub Issue 783: Hide domain designer field Advanced Settings that are not currently implemented in app
 - GitHub Issue 788: Domain Designer better handling of invalid lookup query value for Sample data type
 
+### version 6.56.3
+*Released*: 24 July 2025
+- Address Issue 53366 by not putting `undefined` into `List<ValueDescriptor>`
+- Address Issue 53443 by fixing where we check for optional prop
+- Export `ValueDescriptor` for external usage
+- Update `NameIdSettings`, `BarTenderSettingsForm` and `ManageSampleStatusesPanel` to use app context for api
+
 ### version 6.56.2
 *Released*: 21 July 2025
 - Issue 53451: JS error when deleting numeric filter values with Between operator

packages/components/releaseNotes/components.md

@@ -1889,6 +1889,7 @@ export type {
     GridResponse,
     UpdatedRow,
     UpdatedRowValue,
+    ValueDescriptor,
 } from './internal/components/editable/models';
 export type { GetParentTypeDataForLineage } from './internal/components/entities/actions';
 export type {

packages/components/src/index.ts

@@ -139,10 +139,10 @@ export class GridHeader extends PureComponent<GridHeaderProps, State> {
         }
     };
     handleDrop = (e): void => {
-        var source = e.dataTransfer.getData('dragIndex');
+        const source = e.dataTransfer.getData('dragIndex');
         const target = this.state.dragTarget;
         if (source && target && source !== target) {
-            this.props?.onColumnDrop(source, target);
+            this.props.onColumnDrop?.(source, target); // Issue 53443
         }
     };
 
@@ -200,24 +200,24 @@ export class GridHeader extends PureComponent<GridHeaderProps, State> {
 
                                 return (
                                     <th
-                                        id={index}
-                                        key={index}
                                         className={className}
-                                        style={style}
-                                        title={hideTooltip ? undefined : description}
+                                        data-fieldkey={column.raw?.fieldKeyPath}
                                         draggable={draggable}
-                                        onDragStart={this.handleDragStart}
+                                        id={index}
+                                        key={index}
+                                        onClick={this.handleHeaderClick}
+                                        onDragEnd={this.handleDragEnd}
+                                        onDragEnter={this.handleDragEnter}
                                         onDragOver={this.handleDragOver}
+                                        onDragStart={this.handleDragStart}
                                         onDrop={this.handleDrop}
-                                        onDragEnter={this.handleDragEnter}
-                                        onDragEnd={this.handleDragEnd}
-                                        onClick={this.handleHeaderClick}
-                                        data-fieldkey={column.raw?.fieldKeyPath}
+                                        style={style}
+                                        title={hideTooltip ? undefined : description}
                                     >
                                         {headerCell ? headerCell(column, i, columns.size) : title}
                                         {/* headerCell will render the helpTip, so only render here if not using headerCell() */}
                                         {!headerCell && column.helpTipRenderer && (
-                                            <LabelHelpTip title={title} popoverClassName="label-help-arrow-top">
+                                            <LabelHelpTip popoverClassName="label-help-arrow-top" title={title}>
                                                 <HelpTipRenderer type={column.helpTipRenderer} />
                                             </LabelHelpTip>
                                         )}
@@ -242,7 +242,6 @@ const GridMessages: FC<GridMessagesProps> = memo(({ messages }) => (
         {messages
             .map((message: Map<string, string>, i) => {
                 return (
-                    // eslint-disable-next-line react/no-array-index-key
                     <div className={classNames('grid-message', message.get('type'))} key={i}>
                         {message.get('content')}
                     </div>
@@ -297,7 +296,7 @@ interface EmptyGridRowProps {
 }
 
 const EmptyGridRow: FC<EmptyGridRowProps> = memo(({ colSpan, emptyText, isLoading, loadingText }) => (
-    <tr key="grid-default-row" className={isLoading ? 'grid-loading' : 'grid-empty'}>
+    <tr className={isLoading ? 'grid-loading' : 'grid-empty'} key="grid-default-row">
         <td colSpan={colSpan}>{isLoading ? loadingText : emptyText}</td>
     </tr>
 ));
@@ -339,7 +338,7 @@ const GridBody: FC<GridBodyProps> = memo(props => {
 });
 GridBody.displayName = 'GridBody';
 
-export type GridData = Array<Record<string, any>> | List<Map<string, any>>;
+export type GridData = List<Map<string, any>> | Record<string, any>[];
 
 export interface GridProps {
     bordered?: boolean;

packages/components/src/internal/components/base/Grid.tsx

@@ -191,7 +191,7 @@ interface MessageAndValue {
     valueDescriptor: ValueDescriptor;
 }
 
-type MessageAndValueMap = { [colKey: string]: MessageAndValue[] };
+type MessageAndValueMap = Record<string, MessageAndValue[]>;
 
 function resolveValueDescriptors(
     col: QueryColumn,
@@ -442,12 +442,12 @@ interface CellData {
 }
 
 async function convertRowToEditorModelData(
-    data: string | number | boolean,
+    data: boolean | number | string,
     col: QueryColumn,
     containerPath: string
 ): Promise<CellData> {
     let message: CellMessage;
-    let valueDescriptors = List<ValueDescriptor>();
+    const valueDescriptors: ValueDescriptor[] = [];
 
     if (data && col?.isPublicLookup()) {
         // value had better be the rowId here, but it may be several in a comma-separated list.
@@ -456,18 +456,21 @@ async function convertRowToEditorModelData(
 
         for (const val of values) {
             const messageAndValue = await getLookupDisplayValue(col, parseIntIfNumber(val), containerPath);
-            valueDescriptors = valueDescriptors.push(messageAndValue.valueDescriptor);
             message = messageAndValue.message;
+
+            if (messageAndValue.valueDescriptor) {
+                valueDescriptors.push(messageAndValue.valueDescriptor);
+            }
         }
     } else {
         let display = data;
         if (col?.isTimeOrDateTimeColumn && typeof data === 'string') {
             display = getDateTimeDisplayValueFromStr(data, col);
         }
-        valueDescriptors = valueDescriptors.push({ display, raw: data });
+        valueDescriptors.push({ display, raw: data });
     }
 
-    return { message, valueDescriptors };
+    return { message, valueDescriptors: List(valueDescriptors) };
 }
 
 async function prepareInsertRowDataFromBulkForm(
@@ -510,7 +513,6 @@ async function addBulkRowsToEditorModel(
     const rowCount = editorModel.rowCount + numToAdd;
 
     for (let rowIdx = editorModel.rowCount; rowIdx < rowCount; rowIdx++) {
-        // eslint-disable-next-line no-loop-func
         rowData.forEach((value, colIdx) => {
             const fieldKey = editorModel.getFieldKeyByIndex(colIdx);
             const cellKey = genCellKey(fieldKey, rowIdx);
@@ -594,7 +596,6 @@ export function addColumns(
     let newCellValues = editorModel.cellValues;
 
     for (let rowIdx = 0; rowIdx < editorModel.rowCount; rowIdx++) {
-        // eslint-disable-next-line no-loop-func
         queryColumns.forEach((value: QueryColumn) => {
             newCellValues = newCellValues.set(genCellKey(value.fieldKey, rowIdx), List<ValueDescriptor>());
         });
@@ -745,7 +746,7 @@ export async function updateGridFromBulkForm(
     lockedOrReadonlyRows?: number[],
     isIncludedColumn?: (col: QueryColumn) => boolean,
     containerPath?: string,
-    useEditorModelCols: boolean = false
+    useEditorModelCols = false
 ): Promise<Partial<EditorModel>> {
     let cellMessages = editorModel.cellMessages;
     let cellValues = editorModel.cellValues;
@@ -820,7 +821,7 @@ type PrefixAndNumber = [string | undefined, string | undefined];
  * number the number suffix is undefined. If the entire string is a number the prefix will be undefined. This method
  * intentionally does not parse the numbers.
  */
-export function splitPrefixedNumber(value: string | number): PrefixAndNumber {
+export function splitPrefixedNumber(value: number | string): PrefixAndNumber {
     if (value === undefined || value === null || value === '') return [undefined, undefined];
     const text = value.toString();
     const matches = text?.toString().match(POSTFIX_REGEX);
@@ -871,7 +872,7 @@ interface SelectionIncrement {
     direction: IncrementDirection;
     increment?: number;
     incrementType: IncrementType;
-    initialSelectionValues: Array<List<ValueDescriptor>>; // yes this is a very odd type, but we can clean it up when we rip out Immutable
+    initialSelectionValues: List<ValueDescriptor>[]; // yes this is a very odd type, but we can clean it up when we rip out Immutable
     padLength?: number;
     prefix?: string;
     startingValue: number | string;
@@ -1041,7 +1042,7 @@ export function generateFillCellKeys(
 export function parsePastedLookup(
     column: QueryColumn,
     descriptors: ValueDescriptor[],
-    value: string[] | string
+    value: string | string[]
 ): CellData {
     const originalValues = List([{ display: value, raw: value }]);
 
@@ -1102,7 +1103,7 @@ async function getParsedLookup(
     column: QueryColumn,
     lookupValueCache: LookupValueCache,
     display: any[],
-    value: string[] | string,
+    value: string | string[],
     cellKey: string,
     forUpdate: boolean,
     targetContainerPath: string,

packages/components/src/internal/components/editable/actions.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { fromJS, List, Map, OrderedMap, Record as ImmutableRecord } from 'immutable';
+import { fromJS, Record as ImmutableRecord, List, Map, OrderedMap } from 'immutable';
 import { Filter, Query } from '@labkey/api';
 
 import { QueryInfo } from '../../../public/QueryInfo';