Flatten forms-service (#159)

* Add defaultChecked back to radio and checkbox patterns * Move form-service into the forms package * In-progress work on end-to-end test for marijuana pardon application form * Comment out in-progress test * Update lockfile * Linting
GSA-TTS · Jun 5, 2024 · 0b502f6 · 0b502f6
1 parent 6616eb5
commit 0b502f6
Show file tree

Hide file tree

Showing 46 changed files with 99 additions and 127 deletions.
diff --git a/apps/doj-demo/package.json b/apps/doj-demo/package.json
@@ -14,7 +14,6 @@
     "@astrojs/node": "^8.2.3",
     "@astrojs/react": "^3.0.9",
     "@atj/design": "workspace:*",
-    "@atj/form-service": "workspace:*",
     "@atj/forms": "workspace:*",
     "astro": "^4.4.11",
     "react": "^18.2.0",

diff --git a/apps/doj-demo/src/context.ts b/apps/doj-demo/src/context.ts
@@ -1,15 +1,11 @@
 import { FormConfig } from '@atj/forms';
 import { defaultFormConfig } from '@atj/forms';
-import {
-  type FormService,
-  createBrowserFormService,
-  createTestFormService,
-} from '@atj/form-service';
+import { service } from '@atj/forms';
 
 export type AppContext = {
   baseUrl: `${string}/`;
   formConfig: FormConfig;
-  formService: FormService;
+  formService: service.FormService;
   uswdsRoot: `${string}/`;
 };
 
@@ -33,8 +29,8 @@ const createAppContext = (env: any): AppContext => {
 
 const createAppFormService = () => {
   if (globalThis.window) {
-    return createBrowserFormService();
+    return service.createBrowserFormService();
   } else {
-    return createTestFormService();
+    return service.createTestFormService();
   }
 };
diff --git a/apps/rest-api/package.json b/apps/rest-api/package.json
@@ -10,7 +10,7 @@
     "dev": "tsup src/* --watch"
   },
   "dependencies": {
-    "@atj/form-service": "workspace:*"
+    "@atj/forms": "workspace:*"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.109",

diff --git a/apps/spotlight/package.json b/apps/spotlight/package.json
@@ -12,7 +12,6 @@
   "dependencies": {
     "@astrojs/react": "^3.0.9",
     "@atj/design": "workspace:*",
-    "@atj/form-service": "workspace:*",
     "@atj/forms": "workspace:*",
     "astro": "^4.3.3",
     "react": "^18.2.0",

diff --git a/apps/spotlight/src/context.ts b/apps/spotlight/src/context.ts
@@ -1,18 +1,14 @@
 import { FormConfig } from '@atj/forms';
 import { defaultFormConfig } from '@atj/forms';
-import {
-  type FormService,
-  createBrowserFormService,
-  createTestFormService,
-} from '@atj/form-service';
+import { service } from '@atj/forms';
 
 import { type GithubRepository } from './lib/github';
 
 export type AppContext = {
   baseUrl: `${string}/`;
   github: GithubRepository;
   formConfig: FormConfig;
-  formService: FormService;
+  formService: service.FormService;
   uswdsRoot: `${string}/`;
 };
 
@@ -37,8 +33,8 @@ const createAppContext = (env: any): AppContext => {
 
 const createAppFormService = () => {
   if (globalThis.window) {
-    return createBrowserFormService();
+    return service.createBrowserFormService();
   } else {
-    return createTestFormService();
+    return service.createTestFormService();
   }
 };
diff --git a/packages/design/package.json b/packages/design/package.json
@@ -59,7 +59,6 @@
   },
   "dependencies": {
     "@atj/common": "workspace:*",
-    "@atj/form-service": "workspace:*",
     "@atj/forms": "workspace:*",
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/sortable": "^8.0.0",

diff --git a/packages/design/src/AvailableFormList/AvailableFormList.stories.tsx b/packages/design/src/AvailableFormList/AvailableFormList.stories.tsx
@@ -1,21 +1,18 @@
 import type { Meta, StoryObj } from '@storybook/react';
 
 import AvailableFormList from '.';
-import { createTestFormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 import { createForm, nullSession } from '@atj/forms';
 import { MemoryRouter } from 'react-router-dom';
 import { FormManagerProvider } from '../FormManager/store';
-import {
-  createTestFormManagerContext,
-  createTwoPatternTestForm,
-} from '../test-form';
+import { createTestFormManagerContext } from '../test-form';
 import React from 'react';
 
 const meta: Meta<typeof AvailableFormList> = {
   title: 'FormManager/AvailableFormList',
   component: AvailableFormList,
   args: {
-    formService: createTestFormService({
+    formService: service.createTestFormService({
       'form-1': createForm({
         title: 'Form 1',
         description: 'Use this form to...',
@@ -33,7 +30,6 @@ const meta: Meta<typeof AvailableFormList> = {
       <MemoryRouter initialEntries={['/']}>
         <FormManagerProvider
           context={createTestFormManagerContext()}
-          form={createTwoPatternTestForm()}
           session={nullSession}
         >
           <Story {...args} />
@@ -50,7 +46,7 @@ export const Empty = {
   title: 'Empty form list',
   component: AvailableFormList,
   args: {
-    formService: createTestFormService({}),
+    formService: service.createTestFormService({}),
     urlForForm: () => `#`,
     urlForFormManager: () => `#`,
   },

diff --git a/packages/design/src/AvailableFormList/index.tsx b/packages/design/src/AvailableFormList/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { FormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 import * as AppRoutes from '../FormManager/routes';
 import { Link } from 'react-router-dom';
 
@@ -16,7 +16,7 @@ export default function AvailableFormList({
   urlForForm,
   urlForFormManager,
 }: {
-  formService: FormService;
+  formService: service.FormService;
   urlForForm: UrlForForm;
   urlForFormManager: UrlForFormManager;
 }) {

diff --git a/packages/design/src/Form/components/Checkbox/Checkbox.tsx b/packages/design/src/Form/components/Checkbox/Checkbox.tsx
@@ -13,6 +13,7 @@ export const CheckboxPattern: PatternComponent<CheckboxProps> = props => {
         id={props.id}
         type="checkbox"
         className="usa-checkbox__input"
+        defaultChecked={props.defaultChecked}
         {...register(props.id)}
       />
       <label className="usa-checkbox__label" htmlFor={props.id}>

diff --git a/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx b/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx
@@ -19,6 +19,7 @@ export const RadioGroupPattern: PatternComponent<RadioGroupProps> = props => {
               id={option.id}
               {...register(props.groupId)}
               value={option.id}
+              defaultChecked={option.defaultChecked}
             />
             <label htmlFor={option.id} className="usa-radio__label">
               {option.label}

diff --git a/packages/design/src/FormManager/FormDelete/FormDelete.stories.tsx b/packages/design/src/FormManager/FormDelete/FormDelete.stories.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import type { Meta, StoryObj } from '@storybook/react';
 
-import { createTestFormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 
 import FormDelete from '.';
 import { createTwoPatternTestForm } from '../../test-form';
@@ -19,7 +19,7 @@ const meta: Meta<typeof FormDelete> = {
   ],
   args: {
     formId: 'test-form',
-    formService: createTestFormService({
+    formService: service.createTestFormService({
       'test-form': createTwoPatternTestForm(),
     }),
   },

diff --git a/packages/design/src/FormManager/FormDelete/index.tsx b/packages/design/src/FormManager/FormDelete/index.tsx
@@ -1,14 +1,14 @@
 import React from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import type { FormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 
 export default function FormDelete({
   formId,
   formService,
 }: {
   formId: string;
-  formService: FormService;
+  formService: service.FormService;
 }) {
   const navigate = useNavigate();
   const result = formService.getForm(formId);

diff --git a/packages/design/src/FormManager/FormDocumentImport/DocumentImporter/index.tsx b/packages/design/src/FormManager/FormDocumentImport/DocumentImporter/index.tsx
@@ -8,7 +8,7 @@ import {
   addDocumentFieldsToForm,
   createFormSession,
 } from '@atj/forms';
-import { type FormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 
 import Form, { FormUIContext } from '../../../Form';
 import { onFileInputChangeGetFile } from '../../FormList/CreateNew/file-input';
@@ -24,7 +24,7 @@ const DocumentImporter = ({
   formId: string;
   context: FormUIContext;
   form: Blueprint;
-  formService: FormService;
+  formService: service.FormService;
 }) => {
   const { state, actions } = useDocumentImporter(formService, form, baseUrl);
 
@@ -131,7 +131,7 @@ type State = {
 };
 
 const useDocumentImporter = (
-  formService: FormService,
+  formService: service.FormService,
   form: Blueprint,
   baseUrl: string
 ) => {

diff --git a/packages/design/src/FormManager/FormDocumentImport/index.tsx b/packages/design/src/FormManager/FormDocumentImport/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { type FormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 
 import { type FormUIContext } from '../../Form';
 import DocumentImporter from './DocumentImporter';
@@ -14,7 +14,7 @@ export const FormDocumentImport = ({
   baseUrl: string;
   context: FormUIContext;
   formId: string;
-  formService: FormService;
+  formService: service.FormService;
 }) => {
   // Fallback to hardcoded data if a magic ID is chosen.
   const result = formService.getForm(formId);

diff --git a/packages/design/src/FormManager/FormList/FormList.stories.tsx b/packages/design/src/FormManager/FormList/FormList.stories.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import type { Meta, StoryObj } from '@storybook/react';
 
-import { createTestFormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 
 import FormList from '.';
 import {
@@ -28,7 +28,7 @@ const meta: Meta<typeof FormList> = {
     ),
   ],
   args: {
-    formService: createTestFormService({
+    formService: service.createTestFormService({
       'test-form': createTwoPatternTestForm(),
     }),
   },

diff --git a/packages/design/src/FormManager/FormList/ManageFormsTable.tsx b/packages/design/src/FormManager/FormList/ManageFormsTable.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 
-import { FormListItem } from '@atj/form-service/src/operations/get-form-list';
+import { type FormListItem } from '@atj/forms/src/service/operations/get-form-list';
 
 type ManageFormsTableProps = {
   formListItems: FormListItem[];

diff --git a/packages/design/src/FormManager/FormList/index.tsx b/packages/design/src/FormManager/FormList/index.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
-import { FormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 
 import CreateNew from './CreateNew';
 
 export default function FormList({
   formService,
 }: {
-  formService: FormService;
+  formService: service.FormService;
 }) {
   const result = formService.getFormList();
   if (!result.success) {

diff --git a/packages/design/src/FormManager/index.tsx b/packages/design/src/FormManager/index.tsx
@@ -8,7 +8,7 @@ import {
 } from 'react-router-dom';
 
 import { type FormConfig, createFormSession, nullSession } from '@atj/forms';
-import { FormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 
 import { type ComponentForPattern } from '../Form';
 
@@ -32,7 +32,7 @@ export type FormManagerContext = {
   components: ComponentForPattern;
   config: FormConfig;
   editComponents: EditComponentForPattern;
-  formService: FormService;
+  formService: service.FormService;
   uswdsRoot: `${string}/`;
   urlForForm: UrlForForm;
   urlForFormManager: UrlForFormManager;

diff --git a/packages/design/src/FormRouter/FormRouter.stories.ts b/packages/design/src/FormRouter/FormRouter.stories.ts
@@ -1,14 +1,14 @@
 import type { Meta, StoryObj } from '@storybook/react';
 
-import { createTestFormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 
 import FormRouter from '.';
 
 export default {
   title: 'Form',
   component: FormRouter,
   args: {
-    formService: createTestFormService(),
+    formService: service.createTestFormService(),
   },
   tags: ['autodocs'],
 } satisfies Meta<typeof FormRouter>;

diff --git a/packages/design/src/FormRouter/index.tsx b/packages/design/src/FormRouter/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { useParams, HashRouter, Route, Routes } from 'react-router-dom';
 
-import { type FormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 import { createFormSession } from '@atj/forms';
 
 import Form, { type FormUIContext } from '../Form';
@@ -13,7 +13,7 @@ export default function FormRouter({
   formService,
 }: {
   context: FormUIContext;
-  formService: FormService;
+  formService: service.FormService;
 }) {
   return (
     <HashRouter>

diff --git a/packages/design/src/test-form.ts b/packages/design/src/test-form.ts
@@ -7,7 +7,7 @@ import {
 } from '@atj/forms';
 import { type SequencePattern } from '@atj/forms/src/patterns/sequence';
 import { type InputPattern } from '@atj/forms/src/patterns/input';
-import { createTestFormService } from '@atj/form-service';
+import { service } from '@atj/forms';
 
 import { type FormUIContext } from './Form';
 import { defaultPatternComponents } from './Form/components';
@@ -209,7 +209,7 @@ export const createTestFormManagerContext = (): FormManagerContext => {
     components: defaultPatternComponents,
     config: defaultFormConfig,
     editComponents: defaultPatternEditComponents,
-    formService: createTestFormService(),
+    formService: service.createTestFormService(),
     uswdsRoot: `/static/uswds/`,
     urlForForm: mockGetUrl,
     urlForFormManager: mockGetUrl,

diff --git a/packages/form-service/.gitignore b/packages/form-service/.gitignore
diff --git a/packages/form-service/README.md b/packages/form-service/README.md
diff --git a/packages/form-service/package.json b/packages/form-service/package.json
diff --git a/packages/form-service/tsconfig.json b/packages/form-service/tsconfig.json
diff --git a/packages/form-service/vitest.config.ts b/packages/form-service/vitest.config.ts