swoop-common 2.0.28 → 2.0.30

package/dist/api/generated/core/models/DTOComponentCreate.d.ts

@@ -7,9 +7,10 @@ export type DTOComponentCreate = {
     componentFields: Array<Field>;
     partners: Array<string>;
     details: ComponentDetails;
-    bundle: Bundle;
+    bundle?: Bundle;
     startDate?: string | null;
     endDate?: string | null;
     duration?: number | null;
     state: string;
+    templateId?: string;
 };

package/dist/api/generated/core/models/DTOComponentRead.d.ts

@@ -13,7 +13,7 @@ export type DTOComponentRead = {
     componentFields: Array<Field>;
     partners: Array<string>;
     details: ComponentDetails;
-    bundle: Bundle;
+    bundle?: Bundle;
     startDate?: string | null;
     endDate?: string | null;
     duration?: number | null;

package/dist/api/generated/core/models/DTOComponentUpdate.d.ts

@@ -2,13 +2,13 @@ import type { Bundle } from './Bundle';
 import type { ComponentDetails } from './ComponentDetails';
 import type { Field } from './Field';
 export type DTOComponentUpdate = {
-    name: string;
-    componentFields: Array<Field>;
-    partners: Array<string>;
-    details: ComponentDetails;
-    bundle: Bundle;
+    name?: string;
+    componentFields?: Array<Field>;
+    partners?: Array<string>;
+    details?: ComponentDetails;
+    bundle?: Bundle;
     startDate?: string | null;
     endDate?: string | null;
     duration?: number | null;
-    state: string;
+    state?: string;
 };

package/dist/api/generated/core/models/DTOItineraryCreate.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentInstance } from './ComponentInstance';
 import type { Fee } from './Fee';
 export type DTOItineraryCreate = {
-    enquirerId: string;
+    enquiryId: string;
     title: string;
     componentInstances: Array<ComponentInstance>;
     fees: Array<Fee>;

package/dist/api/generated/core/models/DTOItineraryEntity.d.ts

@@ -3,7 +3,7 @@ import type { Fee } from './Fee';
 import type { Metadata } from './Metadata';
 export type DTOItineraryEntity = {
     id: string;
-    enquirerId: string;
+    enquiryId: string;
     metadata: Metadata;
     title: string;
     componentInstances: Array<ComponentInstance>;

package/dist/api/generated/core/models/DTOItineraryRead.d.ts

@@ -3,7 +3,7 @@ import type { Fee } from './Fee';
 import type { Metadata } from './Metadata';
 export type DTOItineraryRead = {
     id: string;
-    enquirerId: string;
+    enquiryId: string;
     metadata: Metadata;
     title: string;
     componentInstances: Array<ComponentInstance>;

package/dist/api/generated/core/models/DTOItineraryUpdate.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentInstance } from './ComponentInstance';
 import type { Fee } from './Fee';
 export type DTOItineraryUpdate = {
-    enquirerId: string;
+    enquiryId: string;
     title: string;
     componentInstances: Array<ComponentInstance>;
     fees: Array<Fee>;

package/dist/api/generated/itinerary/models/DTOComponentCreate.d.ts

@@ -7,9 +7,10 @@ export type DTOComponentCreate = {
     componentFields: Array<Field>;
     partners: Array<string>;
     details: ComponentDetails;
-    bundle: Bundle;
+    bundle?: Bundle;
     startDate?: string | null;
     endDate?: string | null;
     duration?: number | null;
     state: string;
+    templateId?: string;
 };

package/dist/api/generated/itinerary/models/DTOComponentRead.d.ts

@@ -13,7 +13,7 @@ export type DTOComponentRead = {
     componentFields: Array<Field>;
     partners: Array<string>;
     details: ComponentDetails;
-    bundle: Bundle;
+    bundle?: Bundle;
     startDate?: string | null;
     endDate?: string | null;
     duration?: number | null;

package/dist/api/generated/itinerary/models/DTOComponentUpdate.d.ts

@@ -2,13 +2,13 @@ import type { Bundle } from './Bundle';
 import type { ComponentDetails } from './ComponentDetails';
 import type { Field } from './Field';
 export type DTOComponentUpdate = {
-    name: string;
-    componentFields: Array<Field>;
-    partners: Array<string>;
-    details: ComponentDetails;
-    bundle: Bundle;
+    name?: string;
+    componentFields?: Array<Field>;
+    partners?: Array<string>;
+    details?: ComponentDetails;
+    bundle?: Bundle;
     startDate?: string | null;
     endDate?: string | null;
     duration?: number | null;
-    state: string;
+    state?: string;
 };

package/dist/api/generated/itinerary/models/DTOItineraryCreate.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentInstance } from './ComponentInstance';
 import type { Fee } from './Fee';
 export type DTOItineraryCreate = {
-    enquirerId: string;
+    enquiryId: string;
     title: string;
     componentInstances: Array<ComponentInstance>;
     fees: Array<Fee>;

package/dist/api/generated/itinerary/models/DTOItineraryEntity.d.ts

@@ -3,7 +3,7 @@ import type { Fee } from './Fee';
 import type { Metadata } from './Metadata';
 export type DTOItineraryEntity = {
     id: string;
-    enquirerId: string;
+    enquiryId: string;
     metadata: Metadata;
     title: string;
     componentInstances: Array<ComponentInstance>;

package/dist/api/generated/itinerary/models/DTOItineraryRead.d.ts

@@ -3,7 +3,7 @@ import type { Fee } from './Fee';
 import type { Metadata } from './Metadata';
 export type DTOItineraryRead = {
     id: string;
-    enquirerId: string;
+    enquiryId: string;
     metadata: Metadata;
     title: string;
     componentInstances: Array<ComponentInstance>;

package/dist/api/generated/itinerary/models/DTOItineraryUpdate.d.ts

@@ -1,7 +1,7 @@
 import type { ComponentInstance } from './ComponentInstance';
 import type { Fee } from './Fee';
 export type DTOItineraryUpdate = {
-    enquirerId: string;
+    enquiryId: string;
     title: string;
     componentInstances: Array<ComponentInstance>;
     fees: Array<Fee>;

package/dist/rendering/components/StyledFormView.d.ts

@@ -17,7 +17,7 @@ interface BaseProps {
      * Dictates which mode the form will display in.
      * Each mode has a different pool of renderers.
      */
-    pool: ComponentPool;
+    pool?: ComponentPool;
     /**
      * Whether this form should be readonly.
      * Has little to no effect if using the presentation pool of components

package/dist/rendering/components/StyledFormView.js

@@ -11,5 +11,5 @@ export const StyledFormView = ({ initialData, schema, onChange, stage, pool, rea
     const json = overrideJsonSchema || generateJsonSchema(schema, stage, hideReadonlyFields);
     const ui = overrideUiSchema || generateUiSchema(schema, stage, hideReadonlyFields);
     return (React.createElement(ComponentContext, { componentId: hintComponentId, stage: stage },
-        React.createElement(JsonForms, { onChange: onChange, data: initialData, schema: json, uischema: ui, renderers: [...materialRenderers, ...getComponents(pool)], readonly: readonly, cells: materialCells })));
+        React.createElement(JsonForms, { onChange: onChange, data: initialData, schema: json, uischema: ui, renderers: [...materialRenderers, ...(pool && getComponents(pool) || [])], readonly: readonly, cells: materialCells })));
 };

package/dist/rendering/renderers/ComponentPicker.d.ts

@@ -12,7 +12,7 @@ export declare const fetchComponents: () => Promise<{
         componentFields: Array<import("../../api/generated/core").Field>;
         partners: Array<string>;
         details: import("../../api/generated/core").ComponentDetails;
-        bundle: import("../../api/generated/core").Bundle;
+        bundle?: import("../../api/generated/core").Bundle;
         startDate?: string | null;
         endDate?: string | null;
         duration?: number | null;

package/dist/rendering/renderers/TemplatePicker.js

@@ -15,10 +15,7 @@ import { registerComponent } from '../registry/components';
 import { ComponentPool } from '../registry/types';
 import { CoreService } from '../../api/generated/core';
 const FormTemplatePicker = ({ templates, selectedTemplates, onChange, label, enabled }) => {
-    const selectedValues = templates.filter(t => (Array.isArray(selectedTemplates) ? selectedTemplates : (() => {
-        console.log("SELECTED TEMPLATES IS NOT ARRAY", selectedTemplates);
-        return [];
-    })()).includes(t.id));
+    const selectedValues = templates.filter(t => (Array.isArray(selectedTemplates) ? selectedTemplates : [...selectedTemplates]).includes(t.id));
     return (React.createElement(Paper, { component: "form", sx: { display: 'flex', flexDirection: 'column', gap: 2, p: 2, mb: 1 }, noValidate: true, autoComplete: "off" },
         React.createElement(Typography, { variant: "h6" }, label),
         React.createElement(Autocomplete, { multiple: true, options: templates, getOptionLabel: (option) => option.name, getOptionKey: o => o.id, value: selectedValues, onChange: (_, newValue) => {

package/dist/rendering/schema/formBuilders/formBuilderJsonSchema.js

@@ -26,7 +26,7 @@ export const FORM_BUILDER_JSON_SCHEMA = {
             items: { $ref: "#/$defs/fieldDefinition" },
         },
     },
-    required: ["name", "formFields"],
+    required: ["name", "fields"],
     $defs: {
         fieldDefinition: {
             type: "object",

package/dist/rendering/schema/generate/jsonSchemaGenerate.js

@@ -12,7 +12,7 @@ export const generateJsonSchema = (formSchema, stage, onlyEditableFields) => {
         formSchema.forEach((s) => {
             if (stage < +s.existsFrom)
                 return;
-            if (onlyEditableFields && !s.editableIn.map(Number).includes(stage))
+            if (onlyEditableFields && !(Array.isArray(s.editableIn) ? s.editableIn : []).map(Number).includes(stage))
                 return;
             const fieldSchema = defaultConverter(s, stage);
             built.properties[generateFieldId(s.name)] = fieldSchema;
@@ -76,5 +76,5 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
         ? { "x-templateIds": (_e = field.componentOptions) === null || _e === void 0 ? void 0 : _e.templateIds }
         : {};
     let title = omitTitle ? undefined : field.name;
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (!isChild && !field.editableIn.map(Number).includes(stage) && { readOnly: true })), { title, type: schema.schema.type, "x-type": schema.schema["x-type"] }), templates), (schema.schema.type === "object" && { properties })), { required: requiredFields }), (enumOpts && { enum: enumOpts })), (stagedEnumOpts && { items: { enum: stagedEnumOpts, type: "string" } })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties }));
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (!isChild && !(Array.isArray(field.editableIn) ? field.editableIn : []).map(Number).includes(stage) && { readOnly: true })), { title, type: schema.schema.type, "x-type": schema.schema["x-type"] }), templates), (schema.schema.type === "object" && { properties })), { required: requiredFields }), (enumOpts && { enum: enumOpts })), (stagedEnumOpts && { items: { enum: stagedEnumOpts, type: "string" } })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties }));
 };

package/dist/rendering/schema/generate/uiSchemaGenerate.js

@@ -5,7 +5,7 @@ export const generateUiSchema = (formSchema, stage, onlyEditableFields) => {
     formSchema.forEach((field) => {
         if (stage < +field.existsFrom)
             return;
-        if (onlyEditableFields && !field.editableIn.map(Number).includes(stage))
+        if (onlyEditableFields && !(Array.isArray(field.editableIn) ? field.editableIn : []).map(Number).includes(stage))
             return;
         uiSchema.elements.push(uiFieldSchemaFromFieldDefinition(field));
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "swoop-common",
-    "version": "2.0.28",
+    "version": "2.0.30",
     "main": "dist/api/index.js",
     "types": "dist/api/index.d.ts",
     "exports": {