Merge pull request #529 from digirati-co-uk/feature/capture-model-merge

Capture model merge
digirati-co-uk · Mar 14, 2022 · de0d1ce · de0d1ce
2 parents 9ac0133 + 9470f24
commit de0d1ce
Show file tree

Hide file tree

Showing 529 changed files with 35,840 additions and 641 deletions.
diff --git a/services/madoc-ts/.eslintrc.js b/services/madoc-ts/.eslintrc.js
@@ -51,17 +51,17 @@ module.exports = {
         additionalHooks: '(useEventHandler)',
       },
     ],
-    'import/no-restricted-paths': [
-      2,
-      {
-        zones: [
-          {
-            target: './src/!(frontend)/**/*',
-            from: './src/frontend/**/*',
-          },
-        ],
-      },
-    ],
+    // 'import/no-restricted-paths': [
+    //   2,
+    //   {
+    //     zones: [
+    //       {
+    //         target: './src/!(frontend)/**/*',
+    //         from: './src/frontend/**/*',
+    //       },
+    //     ],
+    //   },
+    // ],
     'no-undef': OFF,
     'no-use-before-define': OFF,
     'react-hooks/rules-of-hooks': 'error',

diff --git a/services/madoc-ts/.storybook/main.js b/services/madoc-ts/.storybook/main.js
@@ -1,5 +1,8 @@
 module.exports = {
-    stories: ['../stories/**/*.stories.@(tsx|mdx)'],
+    stories: [
+      '../stories/**/*.stories.@(tsx|mdx)',
+      '../src/**/*.stories.@(tsx|mdx)'
+    ],
     addons: [
         '@storybook/preset-typescript',
         '@storybook/addon-knobs',

diff --git a/services/madoc-ts/__tests__/capture-model-to-indexables.ts b/services/madoc-ts/__tests__/capture-model-to-indexables.ts
@@ -1,5 +1,6 @@
-import { generateId, hydrateCompressedModel } from '@capture-models/helpers';
-import { CaptureModel } from '@capture-models/types';
+import { generateId } from '../src/frontend/shared/capture-models/helpers/generate-id';
+import { hydrateCompressedModel } from '../src/frontend/shared/capture-models/helpers/hydrate-compressed-model';
+import { CaptureModel } from '../src/frontend/shared/capture-models/types/capture-model';
 import { captureModelToIndexables } from '../src/utility/capture-model-to-indexables';
 
 describe('Capture model to indexables', () => {

diff --git a/services/madoc-ts/__tests__/capture-models/document-to-default-structure.ts b/services/madoc-ts/__tests__/capture-models/document-to-default-structure.ts
@@ -1,6 +1,6 @@
-import { captureModelShorthand } from '@capture-models/helpers';
-import { documentFragmentWrapper } from '../../src/frontend/shared/caputre-models/utility/document-fragment-wrapper';
-import { documentToDefaultStructure } from '../../src/frontend/shared/caputre-models/utility/document-to-default-structure';
+import { captureModelShorthand } from '../../src/frontend/shared/capture-models/helpers/capture-model-shorthand';
+import { documentFragmentWrapper } from '../../src/frontend/shared/capture-models/utility/document-fragment-wrapper';
+import { documentToDefaultStructure } from '../../src/frontend/shared/capture-models/utility/document-to-default-structure';
 import { siteConfigurationModel } from '../../src/frontend/shared/configuration/site-config';
 
 describe('document to default structure', () => {