Update all forms to only call page template in single place #76

Makespace · Nov 7, 2024 · 94176f1 · 94176f1
1 parent 1da1155
commit 94176f1
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 160 deletions.
diff --git a/src/commands/area/add-owner-form.ts b/src/commands/area/add-owner-form.ts
@@ -2,7 +2,7 @@ import {flow, pipe} from 'fp-ts/lib/function';
 import * as RA from 'fp-ts/ReadonlyArray';
 import * as E from 'fp-ts/Either';
 import * as O from 'fp-ts/Option';
-import {EmailAddress, User} from '../../types';
+import {EmailAddress} from '../../types';
 import * as t from 'io-ts';
 import {StatusCodes} from 'http-status-codes';
 import {formatValidationErrors} from 'io-ts-reporters';
@@ -11,8 +11,13 @@ import {
   failureWithStatus,
 } from '../../types/failure-with-status';
 import {Form} from '../../types/form';
-import {html, joinHtml, safe, sanitizeString} from '../../types/html';
-import {pageTemplate} from '../../templates';
+import {
+  html,
+  joinHtml,
+  safe,
+  sanitizeString,
+  toLoggedInContent,
+} from '../../types/html';
 import {renderMemberNumber} from '../../templates/member-number';
 import {SharedReadModel} from '../../read-models/shared-state';
 import {
@@ -31,7 +36,6 @@ type Member = {
 };
 
 type ViewModel = {
-  user: User;
   areaId: string;
   areaOwners: {
     existing: ReadonlyArray<Member>;
@@ -112,7 +116,7 @@ const renderBody = (viewModel: ViewModel) => html`
 `;
 
 const renderForm = (viewModel: ViewModel) =>
-  pipe(viewModel, renderBody, pageTemplate(safe('Add Owner'), viewModel.user));
+  pipe(viewModel, renderBody, toLoggedInContent(safe('Add Owner')));
 
 const paramsCodec = t.strict({
   area: t.string,
@@ -199,10 +203,9 @@ const getAreaName = (db: SharedReadModel['db'], areaId: string) =>
 
 const constructForm: Form<ViewModel>['constructForm'] =
   input =>
-  ({user, readModel}): E.Either<FailureWithStatus, ViewModel> =>
+  ({readModel}): E.Either<FailureWithStatus, ViewModel> =>
     pipe(
-      {user},
-      E.right,
+      E.Do,
       E.bind('areaId', () => getAreaId(input)),
       E.bind('areaName', ({areaId}) => getAreaName(readModel.db, areaId)),
       E.bind('areaOwners', ({areaId}) =>

diff --git a/src/commands/area/create-form.ts b/src/commands/area/create-form.ts
@@ -1,20 +1,15 @@
 import * as E from 'fp-ts/Either';
-import {pageTemplate} from '../../templates';
-import {User} from '../../types';
 import {Form} from '../../types/form';
 import {pipe} from 'fp-ts/lib/function';
-import {html, safe} from '../../types/html';
+import {html, safe, toLoggedInContent} from '../../types/html';
 import {v4} from 'uuid';
 import {UUID} from 'io-ts-types';
 
-type ViewModel = {
-  user: User;
-};
+type ViewModel = unknown;
 
-const renderForm = (viewModel: ViewModel) =>
+const renderForm = () =>
   pipe(
-    viewModel,
-    () => html`
+    html`
       <h1>Create an area</h1>
       <form action="#" method="post">
         <label for="name">What is this area called</label>
@@ -23,13 +18,10 @@ const renderForm = (viewModel: ViewModel) =>
         <button type="submit">Confirm and send</button>
       </form>
     `,
-    pageTemplate(safe('Create Area'), viewModel.user)
+    toLoggedInContent(safe('Create Area'))
   );
 
 export const createForm: Form<ViewModel> = {
   renderForm,
-  constructForm:
-    () =>
-    ({user}) =>
-      E.right({user}),
+  constructForm: () => () => E.right({}),
 };
diff --git a/src/commands/area/remove-area-form.ts b/src/commands/area/remove-area-form.ts
@@ -1,25 +1,21 @@
 import * as E from 'fp-ts/Either';
 import * as t from 'io-ts';
-import {pageTemplate} from '../../templates';
-import {User} from '../../types';
 import {Form} from '../../types/form';
 import {flow, pipe} from 'fp-ts/lib/function';
-import {html, safe, sanitizeString} from '../../types/html';
+import {html, safe, sanitizeString, toLoggedInContent} from '../../types/html';
 import {StatusCodes} from 'http-status-codes';
 import {failureWithStatus} from '../../types/failure-with-status';
 import {formatValidationErrors} from 'io-ts-reporters';
 import {getAreaName} from './get-area-name';
 
 type ViewModel = {
-  user: User;
   areaId: string;
   areaName: string;
 };
 
 const renderForm = (viewModel: ViewModel) =>
   pipe(
-    viewModel,
-    () => html`
+    html`
       <div class="stack-large">
         <h1>Remove '${sanitizeString(viewModel.areaName)}'?</h1>
         <form action="#" method="post">
@@ -28,7 +24,7 @@ const renderForm = (viewModel: ViewModel) =>
         </form>
       </div>
     `,
-    pageTemplate(safe('Remove Area'), viewModel.user)
+    toLoggedInContent(safe('Remove Area'))
   );
 
 const paramsCodec = t.strict({
@@ -55,10 +51,9 @@ export const removeAreaForm: Form<ViewModel> = {
   renderForm,
   constructForm:
     input =>
-    ({user, readModel}) =>
+    ({readModel}) =>
       pipe(
-        {user},
-        E.right,
+        E.Do,
         E.bind('areaId', () => getAreaId(input)),
         E.bind('areaName', ({areaId}) => getAreaName(readModel.db, areaId))
       ),

diff --git a/src/commands/area/remove-owner-form.ts b/src/commands/area/remove-owner-form.ts
@@ -2,11 +2,10 @@
 import * as tt from 'io-ts-types';
 import * as t from 'io-ts';
 import * as E from 'fp-ts/Either';
-import {pageTemplate} from '../../templates';
-import {EmailAddress, User} from '../../types';
+import {EmailAddress} from '../../types';
 import {Form} from '../../types/form';
 import {flow, pipe} from 'fp-ts/lib/function';
-import {html, safe, sanitizeString} from '../../types/html';
+import {html, safe, sanitizeString, toLoggedInContent} from '../../types/html';
 import {StatusCodes} from 'http-status-codes';
 import {failureWithStatus} from '../../types/failure-with-status';
 import {formatValidationErrors} from 'io-ts-reporters';
@@ -17,7 +16,6 @@ import {SharedReadModel} from '../../read-models/shared-state';
 import * as O from 'fp-ts/Option';
 
 type ViewModel = {
-  user: User;
   areaId: string;
   areaName: string;
   owner: {
@@ -73,7 +71,7 @@ const renderForm = (viewModel: ViewModel) =>
         </form>
       </div>
     `,
-    pageTemplate(safe('Remove Owner'), viewModel.user)
+    toLoggedInContent(safe('Remove Owner'))
   );
 
 const getOwner = (db: SharedReadModel['db'], memberNumber: number) =>
@@ -119,11 +117,10 @@ export const removeOwnerForm: Form<ViewModel> = {
   renderForm,
   constructForm:
     input =>
-    ({user, readModel}) =>
+    ({readModel}) =>
       pipe(
         input,
         decodeParams,
-        E.bind('user', () => E.right(user)),
         E.bind('areaName', ({areaId}) => getAreaName(readModel.db, areaId)),
         E.bind('owner', ({memberNumber}) =>
           getOwner(readModel.db, memberNumber)

diff --git a/src/commands/equipment/add-form.ts b/src/commands/equipment/add-form.ts
@@ -1,9 +1,8 @@
 import {pipe} from 'fp-ts/lib/function';
 import * as t from 'io-ts';
 import * as E from 'fp-ts/Either';
-import {pageTemplate} from '../../templates';
-import {html, safe, sanitizeString} from '../../types/html';
-import {DomainEvent, User} from '../../types';
+import {html, safe, sanitizeString, toLoggedInContent} from '../../types/html';
+import {DomainEvent} from '../../types';
 import {v4} from 'uuid';
 import {Form} from '../../types/form';
 import {formatValidationErrors} from 'io-ts-reporters';
@@ -13,7 +12,6 @@ import {readModels} from '../../read-models';
 import {UUID} from 'io-ts-types';
 
 type ViewModel = {
-  user: User;
   areaId: UUID;
   areaName: string;
 };
@@ -30,7 +28,7 @@ const renderForm = (viewModel: ViewModel) =>
         <button type="submit">Confirm and send</button>
       </form>
     `,
-    pageTemplate(safe('Create Equipment'), viewModel.user)
+    toLoggedInContent(safe('Create Equipment'))
   );
 
 const getAreaId = (input: unknown) =>
@@ -54,12 +52,11 @@ const getAreaName = (events: ReadonlyArray<DomainEvent>, areaId: UUID) =>
 
 const constructForm: Form<ViewModel>['constructForm'] =
   input =>
-  ({user, events}) =>
+  ({events}) =>
     pipe(
       E.Do,
       E.bind('areaId', () => getAreaId(input)),
-      E.bind('areaName', ({areaId}) => getAreaName(events, areaId)),
-      E.bind('user', () => E.right(user))
+      E.bind('areaName', ({areaId}) => getAreaName(events, areaId))
     );
 
 export const addForm: Form<ViewModel> = {

diff --git a/src/commands/equipment/register-training-sheet-form.ts b/src/commands/equipment/register-training-sheet-form.ts
@@ -1,15 +1,12 @@
 import {pipe} from 'fp-ts/lib/function';
 import * as E from 'fp-ts/Either';
-import {html, safe, sanitizeString} from '../../types/html';
-import {User} from '../../types';
+import {html, safe, sanitizeString, toLoggedInContent} from '../../types/html';
 import {Form} from '../../types/form';
-import {pageTemplate} from '../../templates';
 import {getEquipmentName} from './get-equipment-name';
 import {getEquipmentIdFromForm} from './get-equipment-id-from-form';
 import {UUID} from 'io-ts-types';
 
 type ViewModel = {
-  user: User;
   equipmentId: UUID;
   equipmentName: string;
 };
@@ -31,15 +28,14 @@ const renderForm = (viewModel: ViewModel) =>
         <button type="submit">Confirm and send</button>
       </form>
     `,
-    pageTemplate(safe('Register training sheet'), viewModel.user)
+    toLoggedInContent(safe('Register training sheet'))
   );
 
 const constructForm: Form<ViewModel>['constructForm'] =
   input =>
-  ({events, user}) =>
+  ({events}) =>
     pipe(
-      {user},
-      E.right,
+      E.Do,
       E.bind('equipmentId', () => getEquipmentIdFromForm(input)),
       E.bind('equipmentName', ({equipmentId}) =>
         getEquipmentName(events, equipmentId)

diff --git a/src/commands/member-numbers/link-number-to-email-form.ts b/src/commands/member-numbers/link-number-to-email-form.ts
@@ -1,15 +1,11 @@
 import {pipe} from 'fp-ts/lib/function';
 import * as E from 'fp-ts/Either';
-import {pageTemplate} from '../../templates';
-import {html, safe} from '../../types/html';
-import {User} from '../../types';
+import {html, safe, toLoggedInContent} from '../../types/html';
 import {Form} from '../../types/form';
 
-type ViewModel = {
-  user: User;
-};
+type ViewModel = unknown;
 
-const renderForm = (viewModel: ViewModel) =>
+const renderForm = () =>
   pipe(
     html`
       <h1>Link a member number to an e-mail address</h1>
@@ -24,16 +20,10 @@ const renderForm = (viewModel: ViewModel) =>
         <button type="submit">Confirm and send</button>
       </form>
     `,
-    pageTemplate(
-      safe('Link a member number to an e-mail address'),
-      viewModel.user
-    )
+    toLoggedInContent(safe('Link a member number to an e-mail address'))
   );
 
-const constructForm: Form<ViewModel>['constructForm'] =
-  () =>
-  ({user}) =>
-    E.right({user});
+const constructForm: Form<ViewModel>['constructForm'] = () => () => E.right({});
 
 export const linkNumberToEmailForm: Form<ViewModel> = {
   renderForm,

diff --git a/src/commands/members/edit-name-form.ts b/src/commands/members/edit-name-form.ts
@@ -1,7 +1,6 @@
 import {flow, pipe} from 'fp-ts/lib/function';
 import * as E from 'fp-ts/Either';
-import {pageTemplate} from '../../templates';
-import {html, safe} from '../../types/html';
+import {html, safe, toLoggedInContent} from '../../types/html';
 import {User} from '../../types';
 import {Form} from '../../types/form';
 import * as t from 'io-ts';
@@ -30,7 +29,7 @@ const renderForm = (viewModel: ViewModel) =>
         <button type="submit">Confirm</button>
       </form>
     `,
-    pageTemplate(safe('Edit name'), viewModel.user)
+    toLoggedInContent(safe('Edit name'))
   );
 
 const paramsCodec = t.strict({

diff --git a/src/commands/members/edit-pronouns-form.ts b/src/commands/members/edit-pronouns-form.ts
@@ -1,7 +1,6 @@
 import {flow, pipe} from 'fp-ts/lib/function';
 import * as E from 'fp-ts/Either';
-import {pageTemplate} from '../../templates';
-import {html, safe} from '../../types/html';
+import {html, safe, toLoggedInContent} from '../../types/html';
 import {User} from '../../types';
 import {Form} from '../../types/form';
 import * as t from 'io-ts';
@@ -30,7 +29,7 @@ const renderForm = (viewModel: ViewModel) =>
         <button type="submit">Confirm</button>
       </form>
     `,
-    pageTemplate(safe('Edit pronouns'), viewModel.user)
+    toLoggedInContent(safe('Edit pronouns'))
   );
 
 const paramsCodec = t.strict({

diff --git a/src/commands/members/sign-owner-agreement-form.ts b/src/commands/members/sign-owner-agreement-form.ts
@@ -1,7 +1,6 @@
 import {pipe} from 'fp-ts/lib/function';
 import * as E from 'fp-ts/Either';
-import {pageTemplate} from '../../templates';
-import {html, safe} from '../../types/html';
+import {html, safe, toLoggedInContent} from '../../types/html';
 import {Form} from '../../types/form';
 import {User} from '../../types';
 import {ownerAgreement} from './owner-agreement';
@@ -27,7 +26,7 @@ const renderForm = (viewModel: ViewModel) =>
         <button type="submit">Sign Agreement</button>
       </form>
     `,
-    pageTemplate(safe('Sign Owner Agreement'), viewModel.user)
+    toLoggedInContent(safe('Sign Owner Agreement'))
   );
 
 const constructForm: Form<ViewModel>['constructForm'] =

diff --git a/src/commands/super-user/declare-form.ts b/src/commands/super-user/declare-form.ts
@@ -1,15 +1,12 @@
 import {pipe} from 'fp-ts/lib/function';
 import * as E from 'fp-ts/Either';
-import {pageTemplate} from '../../templates';
-import {html, safe} from '../../types/html';
-import {User} from '../../types';
+import {html, safe, toLoggedInContent} from '../../types/html';
 import {Form} from '../../types/form';
 import {memberInput} from '../../templates/member-input';
 import {readModels} from '../../read-models';
 import {Member} from '../../read-models/members';
 
 type ViewModel = {
-  user: User;
   members: ReadonlyArray<Member>;
 };
 
@@ -25,11 +22,7 @@ const render = (viewModel: ViewModel) => html`
 `;
 
 const renderForm = (viewModel: ViewModel) =>
-  pipe(
-    viewModel,
-    render,
-    pageTemplate(safe('Declare super user'), viewModel.user)
-  );
+  pipe(viewModel, render, toLoggedInContent(safe('Declare super user')));
 
 const constructForm: Form<ViewModel>['constructForm'] =
   () =>