swoop-common 2.0.5 → 2.0.6

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

@@ -7,6 +7,7 @@ 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 { ComponentDetails } from './index';
 export type { componentId } from './index';

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

@@ -9,6 +9,7 @@ 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 { ComponentDetails } from './models/ComponentDetails';
 export type { componentId } from './models/componentId';

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

@@ -1,8 +1,8 @@
-import type { BundleItem } from './BundleItem';
+import type { BundleDay } from './BundleDay';
 export type Bundle = {
-    startDay: number;
-    endDay: number;
-    items: Array<BundleItem>;
+    days: Array<BundleDay>;
     title: string;
-    summary: string;
+    description: string;
+    start: string;
+    end: string;
 };

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

@@ -0,0 +1,8 @@
+import type { BundleItem } from './BundleItem';
+export type BundleDay = {
+    title?: string;
+    description?: string;
+    items?: Array<BundleItem>;
+    startDay?: string;
+    endDay?: string;
+};

package/dist/api/generated/core/models/BundleDay.js

@@ -0,0 +1 @@
+export {};

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

@@ -9,6 +9,7 @@ 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 { ComponentDetails } from './models/ComponentDetails';
 export type { componentId } from './models/componentId';

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

@@ -1,8 +1,8 @@
-import type { BundleItem } from './BundleItem';
+import type { BundleDay } from './BundleDay';
 export type Bundle = {
-    startDay: number;
-    endDay: number;
-    items: Array<BundleItem>;
+    days: Array<BundleDay>;
     title: string;
-    summary: string;
+    description: string;
+    start: string;
+    end: string;
 };

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

@@ -0,0 +1,8 @@
+import type { BundleItem } from './BundleItem';
+export type BundleDay = {
+    title?: string;
+    description?: string;
+    items?: Array<BundleItem>;
+    startDay?: string;
+    endDay?: string;
+};

package/dist/api/generated/itinerary/models/BundleDay.js

@@ -0,0 +1 @@
+export {};

package/dist/rendering/prebuild/generated/import_generated.d.ts

@@ -6,6 +6,7 @@ import "../../renderers/Example";
 import "../../renderers/Image/ImageForm";
 import "../../renderers/Image/ImagePresentation";
 import "../../renderers/StagedText";
+import "../../renderers/Subset";
 import "../../renderers/TemplatePicker";
 import "../../renderers/textfield/MultilineForm";
 import "../../renderers/textfield/MultilinePresentation";

package/dist/rendering/prebuild/generated/import_generated.js

@@ -8,6 +8,7 @@ import "../../renderers/Example";
 import "../../renderers/Image/ImageForm";
 import "../../renderers/Image/ImagePresentation";
 import "../../renderers/StagedText";
+import "../../renderers/Subset";
 import "../../renderers/TemplatePicker";
 import "../../renderers/textfield/MultilineForm";
 import "../../renderers/textfield/MultilinePresentation";

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

@@ -0,0 +1,20 @@
+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;
+    }[];
+}>;

package/dist/rendering/renderers/Subset.js

@@ -0,0 +1,67 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import React, { useEffect, useMemo, useState } from 'react';
+import { Paper, Typography, Box, TextField, Autocomplete } from '@mui/material';
+import { useLocalErrors } from '../hooks/errors';
+import { ComponentPool } from '../registry/types';
+import { registerComponent } from '../registry/components';
+import { CoreService } from '../../api/generated/core';
+const FormComponentPicker = ({ components, selectedComponent, onChange, set, getError, label, enabled }) => {
+    const selected = components.find(c => c.id === selectedComponent) || null;
+    return (React.createElement(Paper, { component: "form", sx: { display: 'flex', flexDirection: 'column', gap: 1, p: 2, mb: 1 }, noValidate: true, autoComplete: "off" },
+        React.createElement(Typography, { variant: 'h6' }, label),
+        React.createElement(Autocomplete, { options: components, getOptionLabel: (option) => option.name, getOptionKey: o => o.id, value: selected, onChange: (_, newValue) => onChange(newValue ? newValue.id : null), renderInput: (params) => (React.createElement(TextField, Object.assign({}, params, { variant: "outlined", placeholder: "Search and select a component", disabled: !enabled }))), renderOption: (props, option) => (React.createElement("li", Object.assign({}, props),
+                React.createElement(Box, null,
+                    React.createElement(Typography, { variant: "body1" }, option.name),
+                    React.createElement(Typography, { variant: "caption", color: "text.secondary" },
+                        "Version: v",
+                        option.revision)))), isOptionEqualToValue: (option, value) => option.id === value.id })));
+};
+const FormRendererComponentPicker = ({ data, handleChange, path, label, enabled, schema }) => {
+    const [components, setComponents] = useState([]);
+    const getError = useLocalErrors(path);
+    const set = useMemo(() => 
+    // @ts-ignore
+    schema['x-set'] || [], [schema]);
+    useEffect(() => {
+        const load = () => __awaiter(void 0, void 0, void 0, function* () {
+            try {
+                const fetched = yield fetchComponents();
+                let filtered = fetched.data;
+                if (set.length > 0) {
+                    filtered = filtered.filter(c => set.includes(c.templateId));
+                }
+                setComponents(filtered);
+            }
+            catch (err) {
+                console.error('Error loading components:', err);
+            }
+        });
+        load();
+    }, [set]);
+    return (React.createElement(FormComponentPicker, { components: components, selectedComponent: data || null, onChange: (id) => handleChange(path, id), set: set, getError: getError, label: label, enabled: enabled }));
+};
+registerComponent("TEMP DONT USE", FormRendererComponentPicker, ComponentPool.FORM);
+export const fetchComponents = () => __awaiter(void 0, void 0, void 0, function* () {
+    const componentsByGroup = new Map();
+    const data = yield (new CoreService).componentList(1, 1000);
+    (data.data || []).forEach((component) => {
+        const groupId = component.revisionGroupId;
+        if (!componentsByGroup.has(groupId)) {
+            componentsByGroup.set(groupId, []);
+        }
+        componentsByGroup.get(groupId).push(component);
+    });
+    const latestComponents = Array.from(componentsByGroup.values()).map((components) => {
+        const sortedComponents = components.sort((a, b) => b.revision - a.revision);
+        return Object.assign(Object.assign({}, sortedComponents[0]), { revisions: sortedComponents });
+    });
+    return { data: latestComponents };
+});

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

@@ -9,7 +9,7 @@ export const generateJsonSchema = (formSchema, stage, onlyEditableFields) => {
             properties: {},
             required: [],
         };
-        formSchema.forEach((s) => {
+        formSchema.forEach(s => {
             if (stage < s.existsFrom)
                 return;
             if (onlyEditableFields && !s.editableIn.includes(stage))
@@ -32,17 +32,12 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
     field.fieldType = (_a = field.fieldType) !== null && _a !== void 0 ? _a : "string";
     let schema = getType(field.fieldType);
     if (!schema)
-        throw new Error("tried to generate schema from unknown type: " +
-            field.fieldType +
-            "\nFull object: " +
-            JSON.stringify(field, null, 2));
+        throw new Error("tried to generate schema from unknown type: " + field.fieldType + "\nFull object: " + JSON.stringify(field, null, 2));
     const requiredFields = [];
     if (field.required)
         requiredFields.push(field.name);
     // Specific for array
-    let arrayItems = field.fieldType === "array"
-        ? defaultConverter((_b = field.arrayOptions) === null || _b === void 0 ? void 0 : _b.itemDefinition, stage, true, true)
-        : undefined;
+    let arrayItems = field.fieldType === "array" ? defaultConverter((_b = field.arrayOptions) === null || _b === void 0 ? void 0 : _b.itemDefinition, stage, true, true) : undefined;
     // Obj childs
     const properties = {};
     for (const child of (_d = (_c = field.objectOptions) === null || _c === void 0 ? void 0 : _c.properties) !== null && _d !== void 0 ? _d : []) {
@@ -51,20 +46,16 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
         if (child.required)
             requiredFields.push(fieldId);
     }
-    let enumOpts = field.fieldType === "enum" || field.fieldType === "stagedEnum"
-        ? (() => {
-            var _a;
-            let enumOptions = (((_a = field.enumOptions) === null || _a === void 0 ? void 0 : _a.enumValues) ||
-                []);
-            if (enumOptions.length === 0)
-                enumOptions.push("");
-            return enumOptions;
-        })()
-        : undefined;
+    // Enum fails if empty, fixes
+    let enumOpts = field.fieldType === "enum" ? (() => {
+        var _a;
+        let enumOptions = (((_a = field.enumOptions) === null || _a === void 0 ? void 0 : _a.enumValues) || []);
+        if (enumOptions.length === 0)
+            enumOptions.push("");
+        return enumOptions;
+    })() : undefined;
     // Component (probably should change this)
-    let templates = field.fieldType === "componentPicker"
-        ? { "x-templateIds": (_e = field.componentOptions) === null || _e === void 0 ? void 0 : _e.templateIds }
-        : {};
+    let templates = field.fieldType === "componentPicker" ? { "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({}, (!isChild && !field.editableIn.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 })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties }));
+    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, ((!isChild && !field.editableIn.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 })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties }));
 };

package/dist/rendering/type_registration/register.js

@@ -37,7 +37,17 @@ registerType("enum", "Dropdown", { type: "string" }, {
             title: "Dropdown Values",
             type: "array",
             items: { type: "string" },
-        },
+        }
+    }
+}, true);
+registerType("array", "List", { type: "array" }, {
+    type: "object",
+    title: "List Options",
+    properties: {
+        minItems: { type: "integer", minimum: 0 },
+        maxItems: { type: "integer", minimum: 1 },
+        uniqueItems: { type: "boolean", default: false },
+        itemDefinition: { $ref: "#/$defs/arrayItemDefinition" },
     },
 }, true);
 registerType("stagedEnum", "Staged Dropdown", {
@@ -54,16 +64,6 @@ registerType("stagedEnum", "Staged Dropdown", {
         },
     },
 }, true);
-registerType("array", "List", { type: "array" }, {
-    type: "object",
-    title: "List Options",
-    properties: {
-        minItems: { type: "integer", minimum: 0 },
-        maxItems: { type: "integer", minimum: 1 },
-        uniqueItems: { type: "boolean", default: false },
-        itemDefinition: { $ref: "#/$defs/arrayItemDefinition" },
-    },
-}, true);
 registerType("object", "Group", { type: "object" }, {
     type: "object",
     title: "Group",

package/package.json

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