refactor: Ruleset form sections and resource imports

src/components/RulesetFormSections/ChronologyField/ChronologyField.js → src/components/RulesetFormSections/ChronologyFieldArray/ChronologyField/ChronologyField.js

@@ -20,7 +20,7 @@ import {
   CHRONOLOGY_WEEKDAY_FORMAT,
   CHRONOLOGY_MONTH_FORMAT,
   CHRONOLOGY_YEAR_FORMAT,
-} from '../../../constants/selectOptionTranslations';
+} from '../../../../constants/selectOptionTranslations';
 
 const ChronologyField = ({ name, chronologyRule, index }) => {
   const intl = useIntl();

src/components/RulesetFormSections/ChronologyField/ChronologyField.test.js → src/components/RulesetFormSections/ChronologyFieldArray/ChronologyField/ChronologyField.test.js

@@ -7,11 +7,11 @@ import {
 
 import ChronologyField from './ChronologyField';
 
-import { translationsProperties } from '../../../../test/helpers';
-import mockRefdata from '../../../../test/resources/refdata';
+import { translationsProperties } from '../../../../../test/helpers';
+import { refdata as mockRefdata } from '../../../../../test/resources';
 
-jest.mock('../../utils', () => ({
-  ...jest.requireActual('../../utils'),
+jest.mock('../../../utils', () => ({
+  ...jest.requireActual('../../../utils'),
   useSerialsManagementRefdata: () => mockRefdata,
 }));
 
@@ -42,7 +42,9 @@ const monthSelector = {
   optionsArray: ['October', '10', 'Oct', ''],
 };
 const yearSelector = {
-  selector: { name: 'templateConfig.chronologyRules[0].ruleFormat.yearFormat.value' },
+  selector: {
+    name: 'templateConfig.chronologyRules[0].ruleFormat.yearFormat.value',
+  },
   selectorName: 'Year format*',
   optionsArray: ['2023', '23', ''],
 };

src/components/RulesetFormSections/ChronologyFieldArray/ChronologyFieldArray.js

@@ -14,7 +14,7 @@ import { useKiwtFieldArray } from '@k-int/stripes-kint-components';
 
 import { useSerialsManagementRefdata } from '../../utils';
 
-import ChronologyField from '../ChronologyField';
+import ChronologyField from './ChronologyField';
 import { useLocales } from '../../../hooks';
 
 const [CHRONOLOGY_LABEL_FORMAT] = [

src/components/RulesetFormSections/ChronologyFieldArray/ChronologyFieldArray.test.js

@@ -8,17 +8,17 @@ import {
 } from '@folio/stripes-erm-testing';
 
 import { translationsProperties } from '../../../../test/helpers';
-import mockRefdata from '../../../../test/resources/refdata';
-import { locales } from '../../../../test/resources';
+import {
+  refdata as mockRefdata,
+  locales as mockLocales,
+} from '../../../../test/resources';
 
 import ChronologyFieldArray from './ChronologyFieldArray';
 
-jest.mock('../ChronologyField', () => () => <div>ChronologyField</div>);
+jest.mock('./ChronologyField', () => () => <div>ChronologyField</div>);
 
 const onSubmit = jest.fn();
 
-const mockLocales = locales;
-
 jest.mock('../../../hooks', () => ({
   ...jest.requireActual('../../../hooks'),
   useLocales: () => {

src/components/RulesetFormSections/CombinationField/CombinationField.js → src/components/RulesetFormSections/CombinationFieldArray/CombinationField/CombinationField.js

@@ -20,15 +20,15 @@ import {
 import {
   SORTED_MONTHS,
   SORTED_WEEKDAYS,
-} from '../../../constants/sortedArrays';
+} from '../../../../constants/sortedArrays';
 
 import {
   validateWithinRange,
   validateWholeNumber,
   useSerialsManagementRefdata,
-} from '../../utils';
+} from '../../../utils';
 
-import { OMISSION_COMBINATION_PATTERN_TYPE_OPTIONS } from '../../../constants/patternTypeOptions';
+import { OMISSION_COMBINATION_PATTERN_TYPE_OPTIONS } from '../../../../constants/patternTypeOptions';
 
 const [MONTHS, WEEKDAYS] = ['Global.Month', 'Global.Weekday'];
 

src/components/RulesetFormSections/CombinationField/CombinationField.test.js → src/components/RulesetFormSections/CombinationFieldArray/CombinationField/CombinationField.test.js

@@ -9,23 +9,23 @@ import {
 
 import CombinationField from './CombinationField';
 
-import { translationsProperties } from '../../../../test/helpers';
-import mockRefdata from '../../../../test/resources/refdata';
+import { translationsProperties } from '../../../../../test/helpers';
+import { refdata as mockRefdata } from '../../../../../test/resources';
 
 const combination = {
-  'timeUnit': {
-    'value': 'issue',
+  timeUnit: {
+    value: 'issue',
   },
-  'patternType': 'issue_week',
-  'pattern': {
-    'issue': '1',
-    'week': '1',
+  patternType: 'issue_week',
+  pattern: {
+    issue: '1',
+    week: '1',
   },
-  'issuesToCombine': '3',
+  issuesToCombine: '3',
 };
 
-jest.mock('../../utils', () => ({
-  ...jest.requireActual('../../utils'),
+jest.mock('../../../utils', () => ({
+  ...jest.requireActual('../../../utils'),
   useSerialsManagementRefdata: () => mockRefdata,
 }));
 
@@ -100,7 +100,9 @@ describe('CombinationField', () => {
       await Select('Combination rule type*').choose(
         'Issue (1-n), Week (1-4), Month (Jan-Dec)'
       );
-      await Select('Combination rule type*').choose('Issue (1-n), Month (Jan-Dec)');
+      await Select('Combination rule type*').choose(
+        'Issue (1-n), Month (Jan-Dec)'
+      );
     });
   });
 

src/components/RulesetFormSections/CombinationFieldArray/CombinationFieldArray.js

@@ -21,7 +21,7 @@ import { useKiwtFieldArray } from '@k-int/stripes-kint-components';
 import { useSerialsManagementRefdata } from '../../utils';
 import { SORTED_COMBINATION_TIME_UNITS } from '../../../constants/sortedArrays';
 
-import CombinationField from '../CombinationField';
+import CombinationField from './CombinationField';
 
 const [TIME_UNITS] = ['CombinationRule.TimeUnits'];
 

src/components/RulesetFormSections/CombinationFieldArray/CombinationFieldArray.test.js

@@ -1,27 +1,32 @@
 import { waitFor } from '@folio/jest-config-stripes/testing-library/react';
-import { renderWithIntl, TestForm, Button, Select, IconButton } from '@folio/stripes-erm-testing';
+import {
+  renderWithIntl,
+  TestForm,
+  Button,
+  Select,
+  IconButton,
+} from '@folio/stripes-erm-testing';
 
 import CombinationFieldArray from './CombinationFieldArray';
 import { translationsProperties } from '../../../../test/helpers';
-import mockRefdata from '../../../../test/resources/refdata';
+import { refdata as mockRefdata } from '../../../../test/resources';
 
-jest.mock('../CombinationField', () => () => <div>CombinationField</div>);
+jest.mock('./CombinationField', () => () => <div>CombinationField</div>);
 const onSubmit = jest.fn();
 
 jest.mock('../../utils', () => ({
   ...jest.requireActual('../../utils'),
-  useSerialsManagementRefdata: () => mockRefdata.filter(mr => mr.desc === 'CombinationRule.TimeUnits'),
+  useSerialsManagementRefdata: () => mockRefdata.filter((mr) => mr.desc === 'CombinationRule.TimeUnits'),
 }));
 
 let renderComponent;
 describe('CombinationFieldArray', () => {
   describe('with no values', () => {
     beforeEach(() => {
       renderComponent = renderWithIntl(
-        <TestForm
-          onSubmit={onSubmit}
-        >
-          <CombinationFieldArray /> {/* This component renders a field array, so should not be within a field array here */}
+        <TestForm onSubmit={onSubmit}>
+          <CombinationFieldArray />{' '}
+          {/* This component renders a field array, so should not be within a field array here */}
         </TestForm>,
         translationsProperties
       );
@@ -94,7 +99,7 @@ describe('CombinationFieldArray', () => {
       renderComponent = renderWithIntl(
         <TestForm
           initialValues={{
-            omission: 'testOmission'
+            omission: 'testOmission',
           }}
           onSubmit={onSubmit}
         >
@@ -106,7 +111,9 @@ describe('CombinationFieldArray', () => {
 
     test('renders the expected empty combination rule label', async () => {
       const { getByText } = renderComponent;
-      expect(getByText('No combination rules for this publication pattern')).toBeInTheDocument();
+      expect(
+        getByText('No combination rules for this publication pattern')
+      ).toBeInTheDocument();
     });
 
     test('renders a disabled Add combination rule button', async () => {

src/components/RulesetFormSections/EnumerationFieldArray/EnumerationFieldArray.js

@@ -14,8 +14,8 @@ import { useKiwtFieldArray } from '@k-int/stripes-kint-components';
 
 import { useSerialsManagementRefdata } from '../../utils';
 
-import EnumerationNumericFieldArray from '../EnumerationNumericFieldArray';
-import EnumerationTextualFieldArray from '../EnumerationTextualFieldArray';
+import EnumerationNumericFieldArray from './EnumerationNumericFieldArray';
+import EnumerationTextualFieldArray from './EnumerationTextualFieldArray';
 
 const [ENUMERATION_LABEL_FORMAT] = [
   'EnumerationTemplateMetadataRule.TemplateMetadataRuleFormat',

src/components/RulesetFormSections/EnumerationFieldArray/EnumerationFieldArray.test.js

@@ -9,21 +9,25 @@ import {
 
 import EnumerationFieldArray from './EnumerationFieldArray';
 import { translationsProperties } from '../../../../test/helpers';
-import mockRefdata from '../../../../test/resources/refdata';
+import { refdata as mockRefdata } from '../../../../test/resources';
 
-jest.mock('../EnumerationTextualFieldArray', () => () => (
+jest.mock('./EnumerationTextualFieldArray', () => () => (
   <div>EnumerationTextualFieldArray</div>
 ));
-jest.mock('../EnumerationNumericFieldArray', () => () => (
+jest.mock('./EnumerationNumericFieldArray', () => () => (
   <div>EnumerationNumericFieldArray</div>
 ));
 const onSubmit = jest.fn();
 
 jest.mock('../../utils', () => ({
   ...jest.requireActual('../../utils'),
-  useSerialsManagementRefdata: () => mockRefdata.filter(
-    (mr) => mr.desc === 'EnumerationTemplateMetadataRule.TemplateMetadataRuleFormat'
-  ),
+  useSerialsManagementRefdata: () => {
+    return mockRefdata.filter((mr) => {
+      return (
+        mr.desc === 'EnumerationTemplateMetadataRule.TemplateMetadataRuleFormat'
+      );
+    });
+  },
 }));
 
 let renderComponent;

src/components/RulesetFormSections/EnumerationNumericField/EnumerationNumericField.js → src/components/RulesetFormSections/EnumerationFieldArray/EnumerationNumericFieldArray/EnumerationNumericField/EnumerationNumericField.js

@@ -17,8 +17,8 @@ import {
   selectifyRefdata,
 } from '@folio/stripes-erm-components';
 
-import { ENUMERATION_NUMBER_FORMAT } from '../../../constants/selectOptionTranslations';
-import { validateWholeNumber, useSerialsManagementRefdata } from '../../utils';
+import { ENUMERATION_NUMBER_FORMAT } from '../../../../../constants/selectOptionTranslations';
+import { validateWholeNumber, useSerialsManagementRefdata } from '../../../../utils';
 
 const [ENUMERATION_FORMAT, ENUMERATION_SEQUENCE] = [
   'EnumerationNumericLevelTMRF.Format',

src/components/RulesetFormSections/EnumerationNumericField/EnumerationNumericField.test.js → src/components/RulesetFormSections/EnumerationFieldArray/EnumerationNumericFieldArray/EnumerationNumericField/EnumerationNumericField.test.js

@@ -9,36 +9,36 @@ import {
 
 import EnumerationNumericField from './EnumerationNumericField';
 
-import { translationsProperties } from '../../../../test/helpers';
-import mockRefdata from '../../../../test/resources/refdata';
+import { translationsProperties } from '../../../../../../test/helpers';
+import { refdata as mockRefdata } from '../../../../../../test/resources';
 
-jest.mock('../../utils', () => ({
-  ...jest.requireActual('../../utils'),
+jest.mock('../../../../utils', () => ({
+  ...jest.requireActual('../../../../utils'),
   useSerialsManagementRefdata: () => mockRefdata,
 }));
 
 const items = [
   {
-    'units': '1',
-    'format': {
-      'value': 'number',
+    units: '1',
+    format: {
+      value: 'number',
     },
-    'sequence': {
-      'value': 'continuous',
+    sequence: {
+      value: 'continuous',
     },
-    'internalNote': 'test',
+    internalNote: 'test',
   },
 ];
 
 const level = {
-  'units': '1',
-  'format': {
-    'value': 'number',
+  units: '1',
+  format: {
+    value: 'number',
   },
-  'sequence': {
-    'value': 'continuous',
+  sequence: {
+    value: 'continuous',
   },
-  'internalNote': 'test',
+  internalNote: 'test',
 };
 
 const onSubmit = jest.fn();

src/components/RulesetFormSections/EnumerationNumericFieldArray/EnumerationNumericFieldArray.js → src/components/RulesetFormSections/EnumerationFieldArray/EnumerationNumericFieldArray/EnumerationNumericFieldArray.js

@@ -15,7 +15,7 @@ import { ClipCopy } from '@folio/stripes/smart-components';
 
 import { useKiwtFieldArray } from '@k-int/stripes-kint-components';
 
-import EnumerationNumericField from '../EnumerationNumericField';
+import EnumerationNumericField from './EnumerationNumericField';
 
 const EnumerationNumericFieldArray = ({ name, index }) => {
   const { items, onAddField, onDeleteField } = useKiwtFieldArray(

src/components/RulesetFormSections/EnumerationNumericFieldArray/EnumerationNumericFieldArray.test.js → src/components/RulesetFormSections/EnumerationFieldArray/EnumerationNumericFieldArray/EnumerationNumericFieldArray.test.js

@@ -3,9 +3,9 @@ import { waitFor } from '@folio/jest-config-stripes/testing-library/react';
 import { renderWithIntl, TestForm, Button } from '@folio/stripes-erm-testing';
 
 import EnumerationNumericFieldArray from './EnumerationNumericFieldArray';
-import { translationsProperties } from '../../../../test/helpers';
+import { translationsProperties } from '../../../../../test/helpers';
 
-jest.mock('../EnumerationNumericField', () => () => (
+jest.mock('./EnumerationNumericField', () => () => (
   <div>EnumerationNumericField</div>
 ));
 const onSubmit = jest.fn();

src/components/RulesetFormSections/EnumerationTextualField/EnumerationTextualField.js → src/components/RulesetFormSections/EnumerationFieldArray/EnumerationTextualFieldArray/EnumerationTextualField/EnumerationTextualField.js

@@ -15,7 +15,7 @@ import {
   composeValidators,
 } from '@folio/stripes-erm-components';
 
-import { validateWholeNumber } from '../../utils';
+import { validateWholeNumber } from '../../../../utils';
 
 const EnumerationTextualField = ({
   items,

src/components/RulesetFormSections/EnumerationTextualField/EnumerationTextualField.test.js → src/components/RulesetFormSections/EnumerationFieldArray/EnumerationTextualFieldArray/EnumerationTextualField/EnumerationTextualField.test.js

@@ -2,7 +2,7 @@ import { renderWithIntl, TestForm, Select } from '@folio/stripes-erm-testing';
 
 import EnumerationTextualField from './EnumerationTextualField';
 
-import { translationsProperties } from '../../../../test/helpers';
+import { translationsProperties } from '../../../../../../test/helpers';
 
 const onSubmit = jest.fn();
 const onDeleteField = jest.fn();

src/components/RulesetFormSections/EnumerationTextualFieldArray/EnumerationTextualFieldArray.js → src/components/RulesetFormSections/EnumerationFieldArray/EnumerationTextualFieldArray/EnumerationTextualFieldArray.js

@@ -22,8 +22,8 @@ import { requiredValidator } from '@folio/stripes-erm-components';
 
 import { useKiwtFieldArray } from '@k-int/stripes-kint-components';
 
-import { useSerialsManagementRefdata } from '../../utils';
-import EnumerationTextualField from '../EnumerationTextualField';
+import { useSerialsManagementRefdata } from '../../../utils';
+import EnumerationTextualField from './EnumerationTextualField';
 
 const EnumerationTextualFieldArray = ({ name, index }) => {
   const { values } = useFormState();