swoop-common 2.1.33 → 2.1.35

package/dist/rendering/renderers/ComponentPicker.js

@@ -7,18 +7,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { Paper, Button } from '@mui/material';
 import { useLocalErrors } from '../hooks/errors';
 import { ComponentPool } from '../registry/types';
 import { registerComponent } from '../registry/components';
 import { CoreService } from '../../api/generated/core';
 import { useComponentPicker } from '../contexts/ComponentPickerContext';
-const FormComponentPicker = ({ components, selectedComponent, onChange, templateIds, getError, label, enabled }) => {
-    const selected = components.find(c => c.id === selectedComponent) || null;
+import { InternalServices } from '../../api/init';
+const FormComponentPicker = ({ selectedComponent, onChange, templateIds, getError, label, enabled }) => {
+    const [selected, setSelected] = useState();
     const { get } = useComponentPicker();
+    useEffect(() => {
+        if (selectedComponent)
+            InternalServices.CoreService.componentGet(selectedComponent).then(setSelected);
+        else
+            setSelected(undefined);
+    }, [selectedComponent]);
     return (React.createElement(Paper, { component: "form", sx: { display: 'flex', flexDirection: 'column', gap: 1, p: 2, mb: 1 }, noValidate: true, autoComplete: "off" },
-        React.createElement(Button, { onClick: () => {
+        React.createElement(Button, { disabled: !enabled, onClick: () => {
                 get(templateIds)
                     .then((comp) => {
                     onChange(comp.id);
@@ -42,29 +49,10 @@ const FormComponentPicker = ({ components, selectedComponent, onChange, template
             } }, selectedComponent ? selected === null || selected === void 0 ? void 0 : selected.name : "Select " + label + " Component")));
 };
 const FormRendererComponentPicker = ({ data, handleChange, path, label, enabled, schema }) => {
-    const [components, setComponents] = useState([]);
     const getError = useLocalErrors(path);
-    console.log("STINKY", JSON.stringify(schema, null, 2));
-    const templateIds = useMemo(() => 
-    // @ts-ignore
-    schema['x-templateIds'] || [], [schema]);
-    useEffect(() => {
-        const load = () => __awaiter(void 0, void 0, void 0, function* () {
-            try {
-                const fetched = yield fetchComponents();
-                let filtered = fetched.data;
-                if (templateIds.length > 0) {
-                    filtered = filtered.filter(c => templateIds.includes(c.templateId));
-                }
-                setComponents(filtered);
-            }
-            catch (err) {
-                console.error('Error loading components:', err);
-            }
-        });
-        load();
-    }, [templateIds]);
-    return (React.createElement(FormComponentPicker, { components: components, selectedComponent: data || null, onChange: (id) => handleChange(path, id), templateIds: templateIds, getError: getError, label: label, enabled: enabled }));
+    // @ts-expect-error
+    const templateIds = schema['x-templateIds'];
+    return (React.createElement(FormComponentPicker, { selectedComponent: data || null, onChange: (id) => handleChange(path, id), templateIds: templateIds, getError: getError, label: label, enabled: enabled }));
 };
 registerComponent("component", FormRendererComponentPicker, ComponentPool.FORM);
 export const fetchComponents = () => __awaiter(void 0, void 0, void 0, function* () {

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

@@ -73,7 +73,6 @@ const defaultConverter = (field, stage, omitTitle, isChild) => {
     let templates = field.fieldType === "component"
         ? { "x-templateIds": field.componentOptions["x-templateIds"] }
         : {};
-    console.log(templates);
     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 && !(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 })), (field.fieldType === "object" && { required: requiredFields })), (enumOpts && { enum: enumOpts })), (stagedEnumOpts && { items: { enum: stagedEnumOpts, type: "string" } })), (arrayItems && { items: arrayItems })), (field.fieldType === "object" && { properties }));
 };

package/package.json

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