npm run lint-branch-fix

Author: cnathe

packages/components/src/internal/components/ontology/ConceptOverviewPanel.test.tsx

@@ -112,7 +112,7 @@ describe('ConceptOverviewTooltip', () => {
     });
 
     test('error', () => {
-        const { container } = render(<ConceptOverviewTooltip error="test error" concept={TEST_CONCEPT} />);
+        const { container } = render(<ConceptOverviewTooltip concept={TEST_CONCEPT} error="test error" />);
         expect(container.querySelector('[role="alert"]').textContent).toBe('test error');
         expect(container.querySelector('.overlay-trigger')).toBeNull();
     });

packages/components/src/internal/components/ontology/ConceptPathDisplay.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-cycle */
 import React, { FC, memo, useCallback, useEffect, useState } from 'react';
 import classNames from 'classnames';
 
@@ -10,10 +9,10 @@ import { PathModel } from './models';
 import { fetchParentPaths } from './actions';
 
 export interface ConceptPathDisplayProps {
-    title?: string;
-    path: PathModel;
     isSelected?: boolean;
     onClick?: (path: PathModel, isAlternatePath?: boolean) => void;
+    path: PathModel;
+    title?: string;
 }
 
 export const ConceptPathDisplay: FC<ConceptPathDisplayProps> = memo(props => {

packages/components/src/internal/components/ontology/OntologyBrowserPanel.test.tsx

@@ -69,9 +69,7 @@ describe('OntologyBrowserPanelImpl', () => {
     });
 
     test('ontology', () => {
-        const { container } = render(
-            <OntologyBrowserPanelImpl {...DEFAULT_IMPL_PROPS} ontology={TEST_ONTOLOGY} />
-        );
+        const { container } = render(<OntologyBrowserPanelImpl {...DEFAULT_IMPL_PROPS} ontology={TEST_ONTOLOGY} />);
         expect(container.querySelector('.ontology-browser-container')).not.toBeNull();
         expect(container.querySelector('.left-panel')).not.toBeNull();
         expect(container.querySelector('.right-panel')).not.toBeNull();
@@ -82,11 +80,7 @@ describe('OntologyBrowserPanelImpl', () => {
 
     test('selectedConcept', () => {
         const { container } = render(
-            <OntologyBrowserPanelImpl
-                {...DEFAULT_IMPL_PROPS}
-                ontology={TEST_ONTOLOGY}
-                selectedConcept={TEST_CONCEPT}
-            />
+            <OntologyBrowserPanelImpl {...DEFAULT_IMPL_PROPS} ontology={TEST_ONTOLOGY} selectedConcept={TEST_CONCEPT} />
         );
         expect(container.querySelector('.ontology-browser-container')).not.toBeNull();
         expect(container.querySelector('.left-panel')).not.toBeNull();
@@ -95,7 +89,7 @@ describe('OntologyBrowserPanelImpl', () => {
 
     test('asPanel', () => {
         const { container } = render(
-            <OntologyBrowserPanelImpl {...DEFAULT_IMPL_PROPS} ontology={TEST_ONTOLOGY} asPanel={true} />
+            <OntologyBrowserPanelImpl {...DEFAULT_IMPL_PROPS} asPanel={true} ontology={TEST_ONTOLOGY} />
         );
         expect(container.querySelector('.ontology-browser-container')).not.toBeNull();
         expect(container.querySelector('.panel-body')).not.toBeNull();

packages/components/src/internal/components/ontology/OntologyLookupOptions.test.tsx

@@ -97,7 +97,7 @@ describe('OntologyLookupOptions', () => {
         const field = DomainField.create({});
         const domainFields = List.of(field);
         const { container } = render(
-            <OntologyLookupOptions {...getDefaultProps()} field={field} domainFields={domainFields} />
+            <OntologyLookupOptions {...getDefaultProps()} domainFields={domainFields} field={field} />
         );
         await validateSelects(container, false, 1, 1, [null], [null]);
         expect(container.querySelector('.domain-field-section-heading')).not.toBeNull();
@@ -107,7 +107,7 @@ describe('OntologyLookupOptions', () => {
     test('with additional fields and ontology field props', async () => {
         const domainFields = List.of(field1, field2, field3, field4, field5, field6);
         const { container } = render(
-            <OntologyLookupOptions {...getDefaultProps()} field={field1} domainFields={domainFields} />
+            <OntologyLookupOptions {...getDefaultProps()} domainFields={domainFields} field={field1} />
         );
         await validateSelects(container, false, 3, 3, [null, 'field2', 'field4'], [null, 'field3', 'field4']);
     });
@@ -117,8 +117,8 @@ describe('OntologyLookupOptions', () => {
         const { container } = render(
             <OntologyLookupOptions
                 {...getDefaultProps()}
-                field={field1}
                 domainFields={domainFields}
+                field={field1}
                 lockType={DOMAIN_FIELD_FULLY_LOCKED}
             />
         );

packages/components/src/internal/components/ontology/OntologySelectionPanel.test.tsx

@@ -41,24 +41,20 @@ describe('OntologySelectionPanel', () => {
     });
 
     test('with ontologies', () => {
-        const { container } = render(
-            <OntologySelectionPanelImpl {...DEFAULT_PROPS} ontologies={[new PathModel()]} />
-        );
+        const { container } = render(<OntologySelectionPanelImpl {...DEFAULT_PROPS} ontologies={[new PathModel()]} />);
         expect(container.querySelector('.fa-spinner')).toBeNull();
         expect(container.querySelector('.alert-warning')).toBeNull();
     });
 
     test('asPanel', () => {
-        const { container } = render(
-            <OntologySelectionPanelImpl {...DEFAULT_PROPS} ontologies={[]} asPanel={true} />
-        );
+        const { container } = render(<OntologySelectionPanelImpl {...DEFAULT_PROPS} asPanel={true} ontologies={[]} />);
         expect(container.querySelector('.ontology-browser-container')).not.toBeNull();
         expect(container.querySelector('.panel-body')).not.toBeNull();
     });
 
     test('error', () => {
         const { container } = render(
-            <OntologySelectionPanelImpl {...DEFAULT_PROPS} ontologies={[]} error="test error" />
+            <OntologySelectionPanelImpl {...DEFAULT_PROPS} error="test error" ontologies={[]} />
         );
         expect(container.querySelector('[role="alert"]')).not.toBeNull();
         expect(container.querySelector('[role="alert"]').textContent).toBe('test error');

packages/components/src/internal/components/ontology/OntologyTreePanel.test.tsx

@@ -52,7 +52,7 @@ describe('FilterIcon', () => {
     test('node selected', () => {
         const testnode = { data: { code: 'test' } };
         const testFilters = new Map<string, PathModel>().set('test', new PathModel());
-        const { container } = render(<FilterIcon node={testnode} filters={testFilters} />);
+        const { container } = render(<FilterIcon filters={testFilters} node={testnode} />);
         const icon = container.querySelector('i');
         expect(icon.className).toBe('fa fa-filter selected');
         expect(icon.title).toBe('Remove filter');
@@ -61,7 +61,7 @@ describe('FilterIcon', () => {
     test('node not selected', () => {
         const testnode = { data: { code: 'test' } };
         const testFilters = new Map<string, PathModel>().set('nope', new PathModel());
-        const { container } = render(<FilterIcon node={testnode} filters={testFilters} />);
+        const { container } = render(<FilterIcon filters={testFilters} node={testnode} />);
         const icon = container.querySelector('i');
         expect(icon.className).toBe('fa fa-filter');
         expect(icon.title).toBe('Add filter');

packages/components/src/internal/components/user/UserDeleteConfirmModal.tsx

@@ -50,12 +50,12 @@ export class UserDeleteConfirmModal extends React.Component<Props, State> {
 
         return (
             <Modal
-                title={'Delete ' + Utils.pluralBasic(userCount, 'User') + '?'}
-                onConfirm={this.onConfirm}
-                onCancel={onCancel}
                 confirmClass="btn-danger"
                 confirmText="Yes, Permanently Delete"
                 isConfirming={submitting}
+                onCancel={onCancel}
+                onConfirm={this.onConfirm}
+                title={'Delete ' + Utils.pluralBasic(userCount, 'User') + '?'}
             >
                 <p>
                     Generally, <b>deactivation of a user is recommended</b>. Deactivated users may not login, but their