npm run lint-branch-fix

Author: cnathe

packages/components/src/internal/components/domainproperties/NameExpressionGenIdBanner.tsx

@@ -12,7 +12,7 @@ export interface NameExpressionGenIdProps {
     containerPath?: string;
     dataTypeLSID?: string;
     dataTypeName: string; // sampletype or dataclass name
-    kindName: 'SampleSet' | 'DataClass';
+    kindName: 'DataClass' | 'SampleSet';
     rowId: number;
 }
 
@@ -144,8 +144,8 @@ export const NameExpressionGenIdBanner: FC<NameExpressionGenIdProps> = props =>
             </Alert>
             {showResetDialog && (
                 <Modal
-                    confirmText="Reset"
                     confirmClass="btn-danger"
+                    confirmText="Reset"
                     onCancel={onResetCancel}
                     onConfirm={onResetConfirm}
                     title={`Are you sure you want to reset genId for ${dataTypeName}?`}
@@ -159,8 +159,8 @@ export const NameExpressionGenIdBanner: FC<NameExpressionGenIdProps> = props =>
             )}
             {showEditDialog && (
                 <Modal
-                    confirmText="Update"
                     confirmClass="btn-danger"
+                    confirmText="Update"
                     onCancel={onEditCancel}
                     onConfirm={onEditConfirm}
                     title={`Are you sure you want to update genId for ${dataTypeName}?`}
@@ -177,12 +177,12 @@ export const NameExpressionGenIdBanner: FC<NameExpressionGenIdProps> = props =>
                                 aria-label="GenId value"
                                 className="form-control update-genId-input "
                                 min={minNewGenId}
-                                step={1}
                                 name="newgenidval"
                                 onChange={(event: any) => setNewGenId(event?.target?.value)}
+                                placeholder="Enter new genId..."
+                                step={1}
                                 type="number"
                                 value={newGenId ?? minNewGenId}
-                                placeholder="Enter new genId..."
                             />
                         </div>
                         <div className="col-xs-7" />

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

@@ -119,7 +119,13 @@ export const QCStatesInput: FC<InputProps> = memo(props => (
         }
         label="QC States"
     >
-        <input aria-label="QC States" checked={props.model.qcEnabled} id={FORM_IDS.QC_ENABLED} onChange={props.onChange} type="checkbox" />
+        <input
+            aria-label="QC States"
+            checked={props.model.qcEnabled}
+            id={FORM_IDS.QC_ENABLED}
+            onChange={props.onChange}
+            type="checkbox"
+        />
     </AssayPropertiesInput>
 ));
 QCStatesInput.displayName = 'QCStatesInput';
@@ -227,7 +233,13 @@ export const AssayStatusInput: FC<InputProps> = memo(props => (
         hideAdvancedProperties={props.hideAdvancedProperties}
         label="Active"
     >
-        <input aria-label="Active" checked={props.model.isActive()} id={FORM_IDS.STATUS} onChange={props.onChange} type="checkbox" />
+        <input
+            aria-label="Active"
+            checked={props.model.isActive()}
+            id={FORM_IDS.STATUS}
+            onChange={props.onChange}
+            type="checkbox"
+        />
     </AssayPropertiesInput>
 ));
 AssayStatusInput.displayName = 'AssayStatusInput';

packages/components/src/internal/components/domainproperties/samples/UniqueIdBanner.tsx

@@ -7,8 +7,8 @@ import { UNIQUE_ID_TYPE } from '../PropDescType';
 import { SampleTypeModel } from './models';
 
 interface Props {
-    model: SampleTypeModel;
     isFieldsPanel: boolean;
+    model: SampleTypeModel;
     onAddField: (fieldConfig: Partial<IDomainField>) => void;
 }
 

packages/components/src/internal/components/search/SearchPanel.tsx

@@ -91,14 +91,14 @@ export const SearchPanelImpl: FC<SearchPanelImplProps> = memo(props => {
     const hasPages = totalHits > pageSize;
 
     const helpLink = (
-        <HelpLink topic={SEARCH_HELP_TOPIC} className="search-form__help-link">
+        <HelpLink className="search-form__help-link" topic={SEARCH_HELP_TOPIC}>
             <i className="fa fa-question-circle search-form__help-icon" />
             Help with search
         </HelpLink>
     );
 
     return (
-        <Section panelClassName="test-loc-search-panel" title={title} context={helpLink}>
+        <Section context={helpLink} panelClassName="test-loc-search-panel" title={title}>
             <div className="search-form panel-body">
                 <form onSubmit={onSubmit}>
                     <span className="input-group">
@@ -126,16 +126,16 @@ export const SearchPanelImpl: FC<SearchPanelImplProps> = memo(props => {
                 {hasPages && (
                     <div className="page-buttons">
                         <PaginationButtons
-                            total={totalHits}
                             currentPage={currentPage}
+                            nextPage={pageForward}
                             perPage={pageSize}
                             previousPage={pageBack}
-                            nextPage={pageForward}
+                            total={totalHits}
                         />
                     </div>
                 )}
             </div>
-            {searchTerm && <SearchResultsPanel model={model} emptyResultDisplay={emptyTextMessage} offset={offset} />}
+            {searchTerm && <SearchResultsPanel emptyResultDisplay={emptyTextMessage} model={model} offset={offset} />}
         </Section>
     );
 });
@@ -228,6 +228,6 @@ export const SearchPanel: FC<SearchPanelProps> = memo(props => {
         [search, searchTerm, pageSize, offset]
     );
 
-    return <SearchPanelImpl {...props} search={search} model={model} onPageChange={onPage} offset={offset} />;
+    return <SearchPanelImpl {...props} model={model} offset={offset} onPageChange={onPage} search={search} />;
 });
 SearchPanel.displayName = 'SearchPanel';

packages/components/src/public/files/TemplateDownloadButton.test.tsx

@@ -123,9 +123,9 @@ describe('TemplateDownloadButton', () => {
     test('editor, with custom properties', () => {
         const { container } = renderWithAppContext(
             <TemplateDownloadButton
+                className="custom-styling"
                 onDownloadDefault={jest.fn()}
                 text="Test Text"
-                className="custom-styling"
                 user={TEST_USER_EDITOR}
             />
         );

packages/components/src/public/files/TemplateDownloadButton.tsx

@@ -141,7 +141,7 @@ const TemplateDownloadButtonImpl: FC<Props> = memo(props => {
             {customTemplates.map(template => {
                 if (template.url.endsWith('(unavailable)')) {
                     return (
-                        <DisableableMenuItem key={template.label} disabled disabledMessage="File not found">
+                        <DisableableMenuItem disabled disabledMessage="File not found" key={template.label}>
                             {template.label}
                         </DisableableMenuItem>
                     );
@@ -166,7 +166,7 @@ export const TemplateDownloadButton: FC<Props> = memo(props => {
     if (!onDownloadDefault && !defaultTemplateUrl?.length) return null;
 
     return (
-        <RequiresPermission perms={[PermissionTypes.Insert, PermissionTypes.Update]} permissionCheck="any" user={user}>
+        <RequiresPermission permissionCheck="any" perms={[PermissionTypes.Insert, PermissionTypes.Update]} user={user}>
             <TemplateDownloadButtonImpl {...props} />
         </RequiresPermission>
     );