swoop-common 2.0.6 → 2.0.8

package/dist/api/generated/core/exports.d.ts

@@ -5,16 +5,15 @@ export type { AssignedTravellerGroup } from './index';
 export type { Assignments } from './index';
 export type { BookingItem } from './index';
 export type { BookingItemResponse } from './index';
-export type { BookingResponse } from './index';
 export type { Bundle } from './index';
 export type { BundleDay } from './index';
 export type { BundleItem } from './index';
+export type { Component } from './index';
 export type { ComponentDetails } from './index';
 export type { componentId } from './index';
 export type { ComponentInstance } from './index';
 export type { CurrencyItem } from './index';
 export type { CurrencyItemResponse } from './index';
-export type { CurrencyResponse } from './index';
 export type { DTOComponentCreate } from './index';
 export type { DTOComponentRead } from './index';
 export type { DTOComponentUpdate } from './index';
@@ -23,29 +22,29 @@ export type { DTOItineraryRead } from './index';
 export type { DTOItineraryUpdate } from './index';
 export type { DTORegionCreate } from './index';
 export type { DTORegionRead } from './index';
+export type { DTORegionUpdate } from './index';
 export type { DTOTemplateCreate } from './index';
 export type { DTOTemplateRead } from './index';
 export type { DTOTemplateUpdate } from './index';
 export type { enquiryId } from './index';
+export type { Fee } from './index';
 export type { Field } from './index';
 export type { IBEvent } from './index';
 export type { id } from './index';
 export type { itemsPerPage } from './index';
+export type { Itinerary } from './index';
 export type { itineraryId } from './index';
 export type { Limit } from './index';
 export type { Member } from './index';
 export type { Metadata } from './index';
 export type { Page } from './index';
 export type { Pagination } from './index';
-export type { Partner } from './index';
-export type { PartnerResponse } from './index';
 export type { Region } from './index';
 export { regionParam } from './index';
 export { regionRequired } from './index';
 export type { search } from './index';
 export type { sortParam } from './index';
-export type { SwooperResponse } from './index';
+export type { Template } from './index';
 export type { templateId } from './index';
-export type { TravellerResponse } from './index';
 export type { UserComponentInstanceField } from './index';
 export type { ValidationSchemas } from './index';

package/dist/api/generated/core/index.d.ts

@@ -7,16 +7,15 @@ export type { AssignedTravellerGroup } from './models/AssignedTravellerGroup';
 export type { Assignments } from './models/Assignments';
 export type { BookingItem } from './models/BookingItem';
 export type { BookingItemResponse } from './models/BookingItemResponse';
-export type { BookingResponse } from './models/BookingResponse';
 export type { Bundle } from './models/Bundle';
 export type { BundleDay } from './models/BundleDay';
 export type { BundleItem } from './models/BundleItem';
+export type { Component } from './models/Component';
 export type { ComponentDetails } from './models/ComponentDetails';
 export type { componentId } from './models/componentId';
 export type { ComponentInstance } from './models/ComponentInstance';
 export type { CurrencyItem } from './models/CurrencyItem';
 export type { CurrencyItemResponse } from './models/CurrencyItemResponse';
-export type { CurrencyResponse } from './models/CurrencyResponse';
 export type { DTOComponentCreate } from './models/DTOComponentCreate';
 export type { DTOComponentRead } from './models/DTOComponentRead';
 export type { DTOComponentUpdate } from './models/DTOComponentUpdate';
@@ -25,31 +24,30 @@ export type { DTOItineraryRead } from './models/DTOItineraryRead';
 export type { DTOItineraryUpdate } from './models/DTOItineraryUpdate';
 export type { DTORegionCreate } from './models/DTORegionCreate';
 export type { DTORegionRead } from './models/DTORegionRead';
+export type { DTORegionUpdate } from './models/DTORegionUpdate';
 export type { DTOTemplateCreate } from './models/DTOTemplateCreate';
 export type { DTOTemplateRead } from './models/DTOTemplateRead';
 export type { DTOTemplateUpdate } from './models/DTOTemplateUpdate';
 export type { enquiryId } from './models/enquiryId';
+export type { Fee } from './models/Fee';
 export type { Field } from './models/Field';
 export type { IBEvent } from './models/IBEvent';
 export type { id } from './models/id';
 export type { itemsPerPage } from './models/itemsPerPage';
+export type { Itinerary } from './models/Itinerary';
 export type { itineraryId } from './models/itineraryId';
 export type { Limit } from './models/Limit';
 export type { Member } from './models/Member';
 export type { Metadata } from './models/Metadata';
 export type { Page } from './models/Page';
 export type { Pagination } from './models/Pagination';
-export type { Partner } from './models/Partner';
-export type { PartnerResponse } from './models/PartnerResponse';
 export type { Region } from './models/Region';
 export { regionParam } from './models/regionParam';
 export { regionRequired } from './models/regionRequired';
 export type { search } from './models/search';
 export type { sortParam } from './models/sortParam';
-export type { SwooperResponse } from './models/SwooperResponse';
+export type { Template } from './models/Template';
 export type { templateId } from './models/templateId';
-export type { Traveller } from './models/Traveller';
-export type { TravellerResponse } from './models/TravellerResponse';
 export type { UserComponentInstanceField } from './models/UserComponentInstanceField';
 export type { ValidationSchemas } from './models/ValidationSchemas';
 export { CoreService } from './services/CoreService';

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

@@ -0,0 +1,24 @@
+import type { Bundle } from './Bundle';
+import type { ComponentDetails } from './ComponentDetails';
+import type { Field } from './Field';
+import type { Metadata } from './Metadata';
+export type Component = {
+    /**
+     * Unique identifier
+     */
+    id: string;
+    orgId: string;
+    templateId: string;
+    revisionGroupId: string;
+    revision: number;
+    metadata: Metadata;
+    name: string;
+    componentFields: Array<Field>;
+    partners: Array<string>;
+    startDate?: string | null;
+    endDate?: string | null;
+    duration?: number | null;
+    details: ComponentDetails;
+    bundle: Bundle;
+    state?: string | null;
+};

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

@@ -11,4 +11,10 @@ export type ComponentInstance = {
     userComponentInstanceFields: Array<UserComponentInstanceField>;
     assignedPassengers: Array<AssignedPassenger>;
     assignedTravellerGroups: Array<AssignedTravellerGroup>;
+    startDate?: string;
+    endDate?: string;
+    price?: number;
+    currency?: string;
+    commissionPercent?: number;
+    partner?: string;
 };

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

@@ -0,0 +1,6 @@
+export type DTORegionUpdate = {
+    name: string;
+    description: string;
+    destination: string;
+    images: Array<string>;
+};

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

@@ -0,0 +1,9 @@
+import type { AssignedPassenger } from './AssignedPassenger';
+export type Fee = {
+    name: string;
+    reason: string;
+    type: string;
+    price: number;
+    currency: string;
+    assignedPassenger: AssignedPassenger;
+};

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

@@ -0,0 +1,14 @@
+import type { ComponentInstance } from './ComponentInstance';
+import type { Fee } from './Fee';
+import type { Metadata } from './Metadata';
+export type Itinerary = {
+    /**
+     * Unique identifier
+     */
+    id: string;
+    title: string;
+    enquirerId: string;
+    metadata: Metadata;
+    componentInstances: Array<ComponentInstance>;
+    fees: Array<Fee>;
+};

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

@@ -0,0 +1,13 @@
+import type { Metadata } from './Metadata';
+import type { ValidationSchemas } from './ValidationSchemas';
+export type Template = {
+    id: string;
+    orgId: string;
+    parentRevisionGroupId: string;
+    revisionGroupId: string;
+    revision: number;
+    metadata: Metadata;
+    name: string;
+    masterSchema: string;
+    validationSchemas: ValidationSchemas;
+};

package/dist/api/generated/itinerary/index.d.ts

@@ -7,16 +7,15 @@ export type { AssignedTravellerGroup } from './models/AssignedTravellerGroup';
 export type { Assignments } from './models/Assignments';
 export type { BookingItem } from './models/BookingItem';
 export type { BookingItemResponse } from './models/BookingItemResponse';
-export type { BookingResponse } from './models/BookingResponse';
 export type { Bundle } from './models/Bundle';
 export type { BundleDay } from './models/BundleDay';
 export type { BundleItem } from './models/BundleItem';
+export type { Component } from './models/Component';
 export type { ComponentDetails } from './models/ComponentDetails';
 export type { componentId } from './models/componentId';
 export type { ComponentInstance } from './models/ComponentInstance';
 export type { CurrencyItem } from './models/CurrencyItem';
 export type { CurrencyItemResponse } from './models/CurrencyItemResponse';
-export type { CurrencyResponse } from './models/CurrencyResponse';
 export type { DTOComponentCreate } from './models/DTOComponentCreate';
 export type { DTOComponentRead } from './models/DTOComponentRead';
 export type { DTOComponentUpdate } from './models/DTOComponentUpdate';
@@ -25,31 +24,30 @@ export type { DTOItineraryRead } from './models/DTOItineraryRead';
 export type { DTOItineraryUpdate } from './models/DTOItineraryUpdate';
 export type { DTORegionCreate } from './models/DTORegionCreate';
 export type { DTORegionRead } from './models/DTORegionRead';
+export type { DTORegionUpdate } from './models/DTORegionUpdate';
 export type { DTOTemplateCreate } from './models/DTOTemplateCreate';
 export type { DTOTemplateRead } from './models/DTOTemplateRead';
 export type { DTOTemplateUpdate } from './models/DTOTemplateUpdate';
 export type { enquiryId } from './models/enquiryId';
+export type { Fee } from './models/Fee';
 export type { Field } from './models/Field';
 export type { IBEvent } from './models/IBEvent';
 export type { id } from './models/id';
 export type { itemsPerPage } from './models/itemsPerPage';
+export type { Itinerary } from './models/Itinerary';
 export type { itineraryId } from './models/itineraryId';
 export type { Limit } from './models/Limit';
 export type { Member } from './models/Member';
 export type { Metadata } from './models/Metadata';
 export type { Page } from './models/Page';
 export type { Pagination } from './models/Pagination';
-export type { Partner } from './models/Partner';
-export type { PartnerResponse } from './models/PartnerResponse';
 export type { Region } from './models/Region';
 export { regionParam } from './models/regionParam';
 export { regionRequired } from './models/regionRequired';
 export type { search } from './models/search';
 export type { sortParam } from './models/sortParam';
-export type { SwooperResponse } from './models/SwooperResponse';
+export type { Template } from './models/Template';
 export type { templateId } from './models/templateId';
-export type { Traveller } from './models/Traveller';
-export type { TravellerResponse } from './models/TravellerResponse';
 export type { UserComponentInstanceField } from './models/UserComponentInstanceField';
 export type { ValidationSchemas } from './models/ValidationSchemas';
 export { ItineraryService } from './services/ItineraryService';

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

@@ -0,0 +1,24 @@
+import type { Bundle } from './Bundle';
+import type { ComponentDetails } from './ComponentDetails';
+import type { Field } from './Field';
+import type { Metadata } from './Metadata';
+export type Component = {
+    /**
+     * Unique identifier
+     */
+    id: string;
+    orgId: string;
+    templateId: string;
+    revisionGroupId: string;
+    revision: number;
+    metadata: Metadata;
+    name: string;
+    componentFields: Array<Field>;
+    partners: Array<string>;
+    startDate?: string | null;
+    endDate?: string | null;
+    duration?: number | null;
+    details: ComponentDetails;
+    bundle: Bundle;
+    state?: string | null;
+};

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

@@ -11,4 +11,10 @@ export type ComponentInstance = {
     userComponentInstanceFields: Array<UserComponentInstanceField>;
     assignedPassengers: Array<AssignedPassenger>;
     assignedTravellerGroups: Array<AssignedTravellerGroup>;
+    startDate?: string;
+    endDate?: string;
+    price?: number;
+    currency?: string;
+    commissionPercent?: number;
+    partner?: string;
 };

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

@@ -0,0 +1,6 @@
+export type DTORegionUpdate = {
+    name: string;
+    description: string;
+    destination: string;
+    images: Array<string>;
+};

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

@@ -0,0 +1,9 @@
+import type { AssignedPassenger } from './AssignedPassenger';
+export type Fee = {
+    name: string;
+    reason: string;
+    type: string;
+    price: number;
+    currency: string;
+    assignedPassenger: AssignedPassenger;
+};

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

@@ -0,0 +1,14 @@
+import type { ComponentInstance } from './ComponentInstance';
+import type { Fee } from './Fee';
+import type { Metadata } from './Metadata';
+export type Itinerary = {
+    /**
+     * Unique identifier
+     */
+    id: string;
+    title: string;
+    enquirerId: string;
+    metadata: Metadata;
+    componentInstances: Array<ComponentInstance>;
+    fees: Array<Fee>;
+};

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

@@ -0,0 +1,13 @@
+import type { Metadata } from './Metadata';
+import type { ValidationSchemas } from './ValidationSchemas';
+export type Template = {
+    id: string;
+    orgId: string;
+    parentRevisionGroupId: string;
+    revisionGroupId: string;
+    revision: number;
+    metadata: Metadata;
+    name: string;
+    masterSchema: string;
+    validationSchemas: ValidationSchemas;
+};

package/dist/api/generated/swoop/core/request.js

@@ -243,7 +243,7 @@ const unwrapHydra = (json) => {
     // Get keys
     const keys = Object.keys(context);
     if (keys.length != 3) {
-        console.log("Unexpected number of keys within hydra context:", keys);
+        console.error("Unexpected number of keys within hydra context:", keys);
         return json;
     }
     // Get the key that is not hydra
@@ -251,7 +251,7 @@ const unwrapHydra = (json) => {
     // Main WILL exist, as there are 3 keys and filter max 2
     const data = json[main];
     if (!data) {
-        console.log("Hydra defined key did not exist within object:", Object.keys(json));
+        console.error("Hydra defined key did not exist within object:", Object.keys(json));
         return json;
     }
     return data;

package/dist/api/init.d.ts

@@ -1,6 +1,11 @@
 import * as Core from "./generated/core/index";
 import * as Itinerary from "./generated/itinerary/index";
 import * as Swoop from "./generated/swoop/index";
+export declare const InternalServices: {
+    SwoopService: Swoop.SwoopService;
+    CoreService: Core.CoreService;
+    ItineraryService: Itinerary.ItineraryService;
+};
 export declare const init: (opts: {
     itineraryServiceUrl: string;
     coreServiceUrl: string;

package/dist/api/init.js

@@ -2,6 +2,12 @@ import * as Core from "./generated/core/index";
 import * as Itinerary from "./generated/itinerary/index";
 import * as Swoop from "./generated/swoop/index";
 let initalised = false;
+// For internal use
+export const InternalServices = {
+    SwoopService: new Swoop.SwoopService(),
+    CoreService: new Core.CoreService(),
+    ItineraryService: new Itinerary.ItineraryService(),
+};
 export const init = (opts) => {
     // Keeps it consitent
     if (opts.coreServiceUrl.endsWith("/"))

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

@@ -1,16 +1,13 @@
 import React from 'react';
 import { ComponentPool } from '../registry/types';
 import { MasterSchema, Stage } from '../schema/formSchemaTypes';
-interface Props {
+import { JsonSchema, Layout } from '@jsonforms/core';
+interface BaseProps {
     /**
      * This should only be used for the initial values, as this is not truly a controlled component.
-     * Frequent updates of this can cause significant perfomance dips.
+     * Frequent updates of this can cause significant performance dips.
      */
     initialData: any;
-    /**
-     * The master schema for this template
-     */
-    schema: MasterSchema;
     /**
      * This should not be fed back into the form.
      * Instead store it as a ref.
@@ -34,6 +31,36 @@ interface Props {
      * Should readonly fields be hidden
      */
     hideReadonlyFields?: boolean;
+    /**
+     * Hint at which component is being rendered, some forms may depend on component data
+     */
+    hintComponentId?: string;
+}
+interface SchemaProps extends BaseProps {
+    /**
+     * The master schema for this template
+     */
+    schema: MasterSchema;
+    /**
+     * These overrides are mutually exclusive with `schema`
+     */
+    overrideJsonSchema?: never;
+    overrideUiSchema?: never;
+}
+interface OverrideProps extends BaseProps {
+    /**
+     * The master schema for this template is mutually exclusive with overrides
+     */
+    schema?: never;
+    /**
+     * Override JSON schema
+     */
+    overrideJsonSchema: JsonSchema;
+    /**
+     * Override UI layout schema
+     */
+    overrideUiSchema: Layout;
 }
+type Props = SchemaProps | OverrideProps;
 export declare const StyledFormView: React.FC<Props>;
 export {};

package/dist/rendering/components/StyledFormView.js

@@ -5,9 +5,11 @@ import { getComponents } from '../registry/components';
 import { generateJsonSchema } from '../schema/generate/jsonSchemaGenerate';
 import { generateUiSchema } from '../schema/generate/uiSchemaGenerate';
 import { initialisedCheck } from '../../api/init';
-export const StyledFormView = ({ initialData, schema, onChange, stage, pool, readonly, hideReadonlyFields }) => {
+import ComponentContext from '../contexts/ComponentContext';
+export const StyledFormView = ({ initialData, schema, onChange, stage, pool, readonly, hideReadonlyFields, hintComponentId, overrideJsonSchema, overrideUiSchema }) => {
     useEffect(initialisedCheck, []);
-    const json = generateJsonSchema(schema, stage, hideReadonlyFields);
-    const ui = generateUiSchema(schema, stage, hideReadonlyFields);
-    return (React.createElement(JsonForms, { onChange: onChange, data: initialData, schema: json, uischema: ui, renderers: [...materialRenderers, ...getComponents(pool)], readonly: readonly, cells: materialCells }));
+    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 })));
 };

package/dist/rendering/contexts/ComponentContext.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import { DTOComponentRead } from '../../api';
+import { Stage } from '../schema/formSchemaTypes';
+interface Exported {
+    component?: DTOComponentRead;
+    stage: Stage;
+}
+export declare const CompContext: React.Context<Exported | null>;
+export declare const useCompContext: () => Exported;
+interface Props {
+    children: React.ReactNode;
+    componentId?: string;
+    stage: Stage;
+}
+declare const ComponentContext: React.FC<Props>;
+export default ComponentContext;

package/dist/rendering/contexts/ComponentContext.js

@@ -0,0 +1,30 @@
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { InternalServices } from '../../api/init';
+import { CircularProgress } from "@mui/material";
+export const CompContext = createContext(null);
+export const useCompContext = () => {
+    const cont = useContext(CompContext);
+    if (!cont)
+        throw new Error("useCompContext must be used from within a styled form");
+    return cont;
+};
+const ComponentContext = ({ children, componentId, stage }) => {
+    const [loading, setLoading] = useState(true);
+    const [component, setComponent] = useState();
+    useEffect(() => {
+        setLoading(true);
+        if (!componentId)
+            setLoading(false);
+        else {
+            setLoading(true);
+            InternalServices.CoreService.componentGet(componentId)
+                .then(setComponent)
+                .catch((e) => console.error(e.message))
+                .finally(() => setLoading(false));
+        }
+    }, [componentId]);
+    if (loading)
+        return React.createElement(CircularProgress, null);
+    return (React.createElement(CompContext.Provider, { value: { component, stage } }, children));
+};
+export default ComponentContext;

package/dist/rendering/hooks/errors.js

@@ -7,7 +7,6 @@ import React from "react";
  */
 export const useLocalErrors = (path) => {
     const { core } = useJsonForms();
-    console.log(core);
     // Filters out errors for the current scope
     const local = React.useMemo(() => {
         var _a;

package/dist/rendering/registry/fields.d.ts

@@ -1,10 +1,9 @@
-import { JsonSchema } from "@jsonforms/core";
 import { TemplateField } from "../schema/formBuilders/formBuilderJsonSchema";
 import { JsonSchemaWithXType } from "../types/jsonSchema";
 /**
  * If type is not a default json schema type, it is treated as x-type.
  * E.g. "number" will define the default number field, whereas "address" will define a custom field
  */
-export declare const registerType: (name: string, title: string, schema: JsonSchema, options: JsonSchemaWithXType, optionsRequired: boolean) => void;
+export declare const registerType: (name: string, title: string, schema: JsonSchemaWithXType, options: JsonSchemaWithXType, optionsRequired: boolean) => void;
 export declare const getAllTypes: () => Array<TemplateField>;
 export declare const getType: (xType: string) => TemplateField | undefined;

package/dist/rendering/renderers/Address.js

@@ -1,5 +1,5 @@
 'use client';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { Paper, Typography, TextField, Grid, Divider } from '@mui/material';
 import { registerComponent } from '../registry/components';
 import { ComponentPool } from '../registry/types';
@@ -20,11 +20,6 @@ const FormAddress = ({ data, onChange, enabled, label, postcodePattern }) => {
         onChange('postcode', value);
     };
     const hasAddress = useMemo(() => !!(data.line1 || data.line2 || data.city || data.county || data.postcode), [data]);
-    useEffect(() => {
-        if (hasAddress) {
-            console.log('Address updated:', data);
-        }
-    }, [hasAddress, data]);
     return (React.createElement(Paper, { sx: { display: 'flex', flexDirection: 'column', gap: 2, p: 2, mb: 1 }, component: "form", noValidate: true, autoComplete: "off" },
         React.createElement(Typography, { variant: "h6" }, label),
         React.createElement(Grid, { container: true, spacing: 2 },

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

@@ -1,20 +1 @@
-import { DTOComponentRead } from '../../api/generated/core/exports';
-export declare const fetchComponents: () => Promise<{
-    data: {
-        revisions: DTOComponentRead[];
-        id: string;
-        templateId: string;
-        revisionGroupId: string;
-        revision: number;
-        metadata: import("../../api/generated/core").Metadata;
-        name: string;
-        componentFields: Array<import("../../api/generated/core").Field>;
-        partners: Array<string>;
-        bundle: Array<import("../../api/generated/core").Bundle>;
-        startDate?: string | null;
-        endDate?: string | null;
-        duration?: number | null;
-        details: import("../../api/generated/core").ComponentDetails;
-        state?: string | null;
-    }[];
-}>;
+export {};