FLS-1450: Integrate Pre-Award API with form routes

- Extend existing API routes with Pre-Award API support
- Update form save operations to use Pre-Award API
- Add new form creation with Pre-Award API integration
- Maintain backward compatibility with original routes

Author: israr-ulhaq

designer/server/plugins/DesignerRouteRegister.ts

@@ -1,6 +1,8 @@
-import {newConfig, api, app} from "../../../digital-form-builder/designer/server/plugins/routes";
+import {app} from "../../../digital-form-builder/designer/server/plugins/routes";
 import {envStore, flagg} from "flagg";
 import {putFormWithIdRouteRegister} from "./routes/PutFormWithIdRouteRegister";
+import {registerNewFormWithRunner} from "./routes/newConfig";
+import {getFormWithId, getAllPersistedConfigurations, log} from "./routes/api";
 import config from "../config";
 import {jwtAuthStrategyName} from "./AuthPlugin";
 
@@ -83,15 +85,15 @@ export const designerPlugin = {
                 // @ts-ignore
                 app.redirectOldUrlToDesigner.options.auth = jwtAuthStrategyName
                 // @ts-ignore
-                newConfig.registerNewFormWithRunner.options.auth = jwtAuthStrategyName
+                registerNewFormWithRunner.options.auth = jwtAuthStrategyName
                 // @ts-ignore
-                api.getFormWithId.options.auth = jwtAuthStrategyName
+                getFormWithId.options.auth = jwtAuthStrategyName
                 // @ts-ignore
                 putFormWithIdRouteRegister.options.auth = jwtAuthStrategyName
                 // @ts-ignore
-                api.getAllPersistedConfigurations.options.auth = jwtAuthStrategyName
+                getAllPersistedConfigurations.options.auth = jwtAuthStrategyName
                 // @ts-ignore
-                api.log.options.auth = jwtAuthStrategyName
+                log.options.auth = jwtAuthStrategyName
             }
 
             server.route(startRoute);
@@ -118,6 +120,7 @@ export const designerPlugin = {
                             store: envStore(process.env),
                             definitions: {
                                 featureEditPageDuplicateButton: {default: false},
+
                             },
                         });
 
@@ -128,11 +131,11 @@ export const designerPlugin = {
                 },
             });
 
-            server.route(newConfig.registerNewFormWithRunner);
-            server.route(api.getFormWithId);
+            server.route(registerNewFormWithRunner);
+            server.route(getFormWithId);
             server.route(putFormWithIdRouteRegister);
-            server.route(api.getAllPersistedConfigurations);
-            server.route(api.log);
+            server.route(getAllPersistedConfigurations);
+            server.route(log);
         },
     },
 };

designer/server/plugins/routes/PutFormWithIdRouteRegister.ts

@@ -1,6 +1,8 @@
 import {ServerRoute} from "@hapi/hapi";
 import {AdapterSchema} from "@communitiesuk/model";
 import {publish} from "../../../../digital-form-builder/designer/server/lib/publish";
+import {preAwardApiClient} from "../../lib/preAwardApiClient";
+import config from "../../config";
 
 
 export const putFormWithIdRouteRegister: ServerRoute = {
@@ -31,6 +33,10 @@ export const putFormWithIdRouteRegister: ServerRoute = {
                     `${id}`,
                     JSON.stringify(value)
                 );
+                // Save to Pre-Award API
+                const formData = { name: id, form_json: value };
+                await preAwardApiClient.createOrUpdateForm(formData);
+                // Publish to runner for preview
                 await publish(id, value);
                 return h.response({ok: true}).code(204);
             } catch (err) {

designer/server/plugins/routes/api.ts

@@ -0,0 +1,60 @@
+import { api as originalApi } from "../../../../digital-form-builder/designer/server/plugins/routes";
+import { preAwardApiClient } from "../../lib/preAwardApiClient";
+import config from "../../config";
+import { ServerRoute, ResponseObject } from "@hapi/hapi";
+
+// Extend the original getFormWithId with Pre-Award API support
+export const getFormWithId: ServerRoute = {
+  ...originalApi.getFormWithId,
+  options: {
+    ...originalApi.getFormWithId.options || {},
+    handler: async (request, h) => {
+      const { id } = request.params;
+      const formJson = await preAwardApiClient.getFormDraft(id);
+      return h.response(formJson).type("application/json");
+    },
+  },
+};
+
+// Extend the original putFormWithId with Pre-Award API support
+export const putFormWithId: ServerRoute = {
+  ...originalApi.putFormWithId,
+  options: {
+    ...originalApi.putFormWithId.options || {},
+    handler: async (request, h) => {
+      const { id } = request.params;
+      const { Schema } = await import("../../../../digital-form-builder/model/src");
+      const { value, error } = Schema.validate(request.payload, {
+        abortEarly: false,
+      });
+
+      if (error) {
+        throw new Error("Schema validation failed, reason: " + error.message);
+      }
+      const formData = { name: id, form_json: value };
+      await preAwardApiClient.createOrUpdateForm(formData);
+      
+      return h.response({ ok: true }).code(204);
+    },
+  },
+};
+
+// Extend the original getAllPersistedConfigurations with Pre-Award API support
+export const getAllPersistedConfigurations: ServerRoute = {
+  ...originalApi.getAllPersistedConfigurations,
+  options: {
+    ...originalApi.getAllPersistedConfigurations.options || {},
+    handler: async (request, h): Promise<ResponseObject | undefined> => {
+      const forms = await preAwardApiClient.getAllForms();
+      const response = forms.map(form => ({
+        Key: form.name,
+        DisplayName: form.name,
+        LastModified: form.updated_at
+      }));
+      return h.response(response).type("application/json");
+    },
+  },
+};
+
+// Use original log route as-is
+export const log = originalApi.log;

designer/server/plugins/routes/newConfig.ts

@@ -0,0 +1,42 @@
+import { newConfig as originalNewConfig } from "../../../../digital-form-builder/designer/server/plugins/routes";
+import { preAwardApiClient } from "../../lib/preAwardApiClient";
+import config from "../../config";
+import { ServerRoute } from "@hapi/hapi";
+import { HapiRequest } from "../../../../digital-form-builder/designer/server/types";
+import { nanoid } from "nanoid";
+import newFormJson from "../../../../digital-form-builder/designer/new-form.json";
+
+// Extend the original registerNewFormWithRunner with Pre-Award API support
+export const registerNewFormWithRunner: ServerRoute = {
+  ...originalNewConfig.registerNewFormWithRunner,
+  options: {
+    ...originalNewConfig.registerNewFormWithRunner.options,
+    handler: async (request: HapiRequest, h) => {
+      const { selected, name } = request.payload as any;
+      
+      if (name && name !== "" && !name.match(/^[a-zA-Z0-9 _-]+$/)) {
+        return h
+          .response("Form name should not contain special characters")
+          .type("application/json")
+          .code(400);
+      }
+      
+      const newName = name === "" ? nanoid(10) : name;
+      
+      if (selected.Key === "New") {
+        const formData = { name: newName, form_json: newFormJson };
+        await preAwardApiClient.createOrUpdateForm(formData);
+      } else {
+        const existingForm = await preAwardApiClient.getFormDraft(selected.Key);
+        const formData = { name: newName, form_json: existingForm };
+        await preAwardApiClient.createOrUpdateForm(formData);
+      }
+      
+      const response = JSON.stringify({
+        id: `${newName}`,
+        previewUrl: config.previewUrl,
+      });
+      return h.response(response).type("application/json").code(200);
+    },
+  },
+};