AssayDesignerPanels: Fix issue with appDomainHeaders, fix tests

Author: labkey-alan

packages/components/src/internal/components/domainproperties/assay/AssayDesignerPanels.test.tsx

@@ -48,7 +48,7 @@ const EXISTING_MODEL = AssayProtocolModel.create({
             ],
         },
         {
-            name: 'Sample Fields',
+            name: 'Data Fields',
             fields: [
                 {
                     name: 'field1',
@@ -365,7 +365,7 @@ describe('AssayDesignerPanels', () => {
             <AssayDesignerPanels
                 {...getDefaultProps()}
                 initModel={EXISTING_MODEL}
-                appDomainHeaders={Map({ Sample: mockAppHeader })}
+                appDomainHeaders={Map({ Data: mockAppHeader })}
             />
         );
 

packages/components/src/internal/components/domainproperties/assay/AssayDesignerPanels.tsx

@@ -40,7 +40,7 @@ const DOMAIN_PANEL_INDEX = 1;
 interface AssayDomainFormProps
     extends Omit<InjectedBaseDomainDesignerProps, 'onFinish' | 'setSubmitting' | 'submitting'> {
     api: DomainPropertiesAPIWrapper;
-    appDomainHeaders?: Map<string, HeaderRenderer>;
+    appDomainHeaders: Map<string, HeaderRenderer>;
     domain: DomainDesign;
     domainFormDisplayOptions: IDomainFormDisplayOptions;
     hideAdvancedProperties?: boolean;
@@ -344,10 +344,16 @@ export class AssayDesignerPanelsImpl extends React.PureComponent<Props, State> {
         this.props.onTogglePanel(PROPERTIES_PANEL_INDEX, collapsed, callback);
     };
 
+    toggleFoldersPanel = (collapsed, callback): void => {
+        const { protocolModel } = this.state;
+        this.props.onTogglePanel(protocolModel.domains.size + 1, collapsed, callback);
+    };
+
     render() {
         const {
             allowFolderExclusion,
             api,
+            appDomainHeaders,
             appPropertiesOnly,
             hideAdvancedProperties,
             domainFormDisplayOptions,
@@ -411,6 +417,7 @@ export class AssayDesignerPanelsImpl extends React.PureComponent<Props, State> {
                             return (
                                 <AssayDomainForm
                                     api={api}
+                                    appDomainHeaders={appDomainHeaders}
                                     domain={domain}
                                     domainFormDisplayOptions={domainFormDisplayOptions}
                                     index={i}
@@ -441,9 +448,7 @@ export class AssayDesignerPanelsImpl extends React.PureComponent<Props, State> {
                         dataTypeName={protocolModel?.name}
                         entityDataType={AssayRunDataType}
                         initCollapsed={currentPanelIndex !== protocolModel.domains.size + 1}
-                        onToggle={(collapsed, callback) => {
-                            onTogglePanel(protocolModel.domains.size + 1, collapsed, callback);
-                        }}
+                        onToggle={this.toggleFoldersPanel}
                         onUpdateExcludedFolders={this.onUpdateExcludedFolders}
                     />
                 )}

packages/components/src/internal/components/domainproperties/assay/AssayPropertiesInput.tsx

@@ -735,6 +735,8 @@ export const HitCriteriaInput: FC<InputProps> = memo(({ model }) => {
     const onClick = useCallback(() => openModal(), [openModal]);
     const domain = useMemo(() => model.domains.find(domain => domain.isNameSuffixMatch('Data')), [model.domains]);
 
+    if (!domain) return null;
+
     return (
         <AssayPropertiesInput label="Hit Selection Criteria">
             <div className="hit-selection-criteria-input">