* changed tb imports * cleanup: replace console.log/warn with $console, remove commented-out code Removed various commented-out code and replaced direct `console.log` and `console.warn` usage across the codebase with `$console` from "core" for standardized logging. Also adjusted linting rules in biome.json to enable warnings for `console.log` usage. * ts: enable incremental * fix imports in test files reorganize imports to use "@sinclair/typebox" directly, replacing local utility references, and add missing "override" keywords in test classes. * added media permissions (#142) * added permissions support for media module introduced `MediaPermissions` for fine-grained access control in the media module, updated routes to enforce these permissions, and adjusted permission registration logic. * fix: handle token absence in getUploadHeaders and add tests for transport modes ensure getUploadHeaders does not set Authorization header when token is missing. Add unit tests to validate behavior for different token_transport options. * remove console.log on DropzoneContainer.tsx Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * add bcrypt and refactored auth resolve (#147) * reworked auth architecture with improved password handling and claims Refactored password strategy to prepare supporting bcrypt, improving hashing/encryption flexibility. Updated authentication flow with enhanced user resolution mechanisms, safe JWT generation, and consistent profile handling. Adjusted dependencies to include bcryptjs and updated lock files accordingly. * fix strategy forms handling, add register route and hidden fields Refactored strategy forms to include hidden fields for type and name. Added a registration route with necessary adjustments to the admin controller and routes. Corrected field handling within relevant forms and components. * refactored auth handling to support bcrypt, extracted user pool * update email regex to allow '+' and '_' characters * update test stub password for AppAuth spec * update data exceptions to use HttpStatus constants, adjust logging level in AppUserPool * rework strategies to extend a base class instead of interface * added simple bcrypt test * add validation logs and improve data validation handling (#157) Added warning logs for invalid data during mutator validation, refined field validation logic to handle undefined values, and adjusted event validation comments for clarity. Minor improvements include exporting events from core and handling optional chaining in entity field validation. * modify MediaApi to support custom fetch implementation, defaults to native fetch (#158) * modify MediaApi to support custom fetch implementation, defaults to native fetch added an optional `fetcher` parameter to allow usage of a custom fetch function in both `upload` and `fetcher` methods. Defaults to the standard `fetch` if none is provided. * fix tests and improve api fetcher types * update admin basepath handling and window context integration (#155) Refactored `useBkndWindowContext` to include `admin_basepath` and updated its usage in routing. Improved type consistency with `AdminBkndWindowContext` and ensured default values are applied for window context. * trigger `repository-find-[one|many]-[before|after]` based on `limit` (#160) * refactor error handling in authenticator and password strategy (#161) made `respondWithError` method public, updated login and register routes in `PasswordStrategy` to handle errors using `respondWithError` for consistency. * add disableSubmitOnError prop to NativeForm and export getFlashMessage (#162) Introduced a `disableSubmitOnError` prop to NativeForm to control submit button behavior when errors are present. Also exported `getFlashMessage` from the core for external usage. * update dependencies in package.json (#156) moved several dependencies between devDependencies and dependencies for better categorization and removed redundant entries. * update imports to adjust nodeTestRunner path and remove unused export (#163) updated imports in test files to reflect the correct path for nodeTestRunner. removed redundant export of nodeTestRunner from index file to clean up module structure. In some environments this could cause issues requiring to exclude `node:test`, just removing it for now. * fix sync events not awaited (#164) * refactor(dropzone): extract DropzoneInner and unify state management with zustand (#165) Simplified Dropzone implementation by extracting inner logic to a new component, `DropzoneInner`. Replaced local dropzone state logic with centralized state management using zustand. Adjusted API exports and props accordingly for consistency and maintainability. * replace LiquidJs rendering with simplified renderer (#167) * replace LiquidJs rendering with simplified renderer Removed dependency on LiquidJS and replaced it with a custom templating solution using lodash `get`. Updated corresponding components, editors, and tests to align with the new rendering approach. Removed unused filters and tags. * remove liquid js from package json * feat/cli-generate-types (#166) * init types generation * update type generation for entities and fields Refactored `EntityTypescript` to support improved field types and relations. Added `toType` method overrides for various fields to define accurate TypeScript types. Enhanced CLI `types` command with new options for output style and file handling. Removed redundant test files. * update type generation code and CLI option description removed unused imports definition, adjusted formatting in EntityTypescript, and clarified the CLI style option description. * fix json schema field type generation * reworked system entities to prevent recursive types * reworked system entities to prevent recursive types * remove unused object function * types: use number instead of Generated * update data hooks and api types * update data hooks and api types * update data hooks and api types * update data hooks and api types --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
463 lines
16 KiB
TypeScript
463 lines
16 KiB
TypeScript
import { typeboxResolver } from "@hookform/resolvers/typebox";
|
|
import { Tabs, TextInput, Textarea, Tooltip, Switch } from "@mantine/core";
|
|
import { useDisclosure } from "@mantine/hooks";
|
|
import {
|
|
Default,
|
|
type Static,
|
|
StringIdentifier,
|
|
objectCleanEmpty,
|
|
ucFirstAllSnakeToPascalWithSpaces,
|
|
} from "core/utils";
|
|
import {
|
|
type TAppDataEntityFields,
|
|
fieldsSchemaObject as originalFieldsSchemaObject,
|
|
} from "data/data-schema";
|
|
import { omit } from "lodash-es";
|
|
import { forwardRef, memo, useEffect, useImperativeHandle } from "react";
|
|
import { type FieldArrayWithId, type UseFormReturn, useFieldArray, useForm } from "react-hook-form";
|
|
import { TbGripVertical, TbSettings, TbTrash } from "react-icons/tb";
|
|
import { twMerge } from "tailwind-merge";
|
|
import { Button } from "ui/components/buttons/Button";
|
|
import { IconButton } from "ui/components/buttons/IconButton";
|
|
import { JsonViewer } from "ui/components/code/JsonViewer";
|
|
import { MantineSwitch } from "ui/components/form/hook-form-mantine/MantineSwitch";
|
|
import { JsonSchemaForm } from "ui/components/form/json-schema";
|
|
import { type SortableItemProps, SortableList } from "ui/components/list/SortableList";
|
|
import { Popover } from "ui/components/overlay/Popover";
|
|
import { type TFieldSpec, fieldSpecs } from "ui/modules/data/components/fields-specs";
|
|
import { dataFieldsUiSchema } from "../../settings/routes/data.settings";
|
|
import * as tbbox from "@sinclair/typebox";
|
|
const { Type } = tbbox;
|
|
|
|
const fieldsSchemaObject = originalFieldsSchemaObject;
|
|
const fieldsSchema = Type.Union(Object.values(fieldsSchemaObject));
|
|
|
|
const fieldSchema = Type.Object(
|
|
{
|
|
name: StringIdentifier,
|
|
new: Type.Optional(Type.Boolean({ const: true })),
|
|
field: fieldsSchema,
|
|
},
|
|
{
|
|
additionalProperties: false,
|
|
},
|
|
);
|
|
type TFieldSchema = Static<typeof fieldSchema>;
|
|
|
|
const schema = Type.Object({
|
|
fields: Type.Array(fieldSchema),
|
|
});
|
|
type TFieldsFormSchema = Static<typeof schema>;
|
|
|
|
const fieldTypes = Object.keys(fieldsSchemaObject);
|
|
const defaultType = fieldTypes[0];
|
|
const commonProps = ["label", "description", "required", "fillable", "hidden", "virtual"];
|
|
|
|
function specificFieldSchema(type: keyof typeof fieldsSchemaObject) {
|
|
//console.log("specificFieldSchema", type);
|
|
return Type.Omit(fieldsSchemaObject[type]?.properties.config, commonProps);
|
|
}
|
|
|
|
export type EntityFieldsFormProps = {
|
|
fields: TAppDataEntityFields;
|
|
onChange?: (formData: TAppDataEntityFields) => void;
|
|
sortable?: boolean;
|
|
additionalFieldTypes?: (TFieldSpec & { onClick: () => void })[];
|
|
};
|
|
|
|
export type EntityFieldsFormRef = {
|
|
getValues: () => TFieldsFormSchema;
|
|
getData: () => TAppDataEntityFields;
|
|
isValid: () => boolean;
|
|
getErrors: () => any;
|
|
reset: () => void;
|
|
};
|
|
|
|
export const EntityFieldsForm = forwardRef<EntityFieldsFormRef, EntityFieldsFormProps>(
|
|
function EntityFieldsForm({ fields: _fields, sortable, additionalFieldTypes, ...props }, ref) {
|
|
const entityFields = Object.entries(_fields).map(([name, field]) => ({
|
|
name,
|
|
field,
|
|
}));
|
|
|
|
const {
|
|
control,
|
|
formState: { isValid, errors },
|
|
getValues,
|
|
watch,
|
|
register,
|
|
setValue,
|
|
setError,
|
|
reset,
|
|
} = useForm({
|
|
mode: "all",
|
|
resolver: typeboxResolver(schema),
|
|
defaultValues: {
|
|
fields: entityFields,
|
|
} as TFieldsFormSchema,
|
|
});
|
|
const { fields, append, remove, move } = useFieldArray({
|
|
control,
|
|
name: "fields",
|
|
});
|
|
|
|
function toCleanValues(formData: TFieldsFormSchema): TAppDataEntityFields {
|
|
return Object.fromEntries(
|
|
formData.fields.map((field) => [field.name, objectCleanEmpty(field.field)]),
|
|
);
|
|
}
|
|
|
|
useEffect(() => {
|
|
if (props?.onChange) {
|
|
watch((data: any) => {
|
|
props?.onChange?.(toCleanValues(data));
|
|
});
|
|
}
|
|
}, []);
|
|
|
|
useImperativeHandle(ref, () => ({
|
|
reset,
|
|
getValues: () => getValues(),
|
|
getData: () => {
|
|
return toCleanValues(getValues());
|
|
},
|
|
isValid: () => isValid,
|
|
getErrors: () => errors,
|
|
}));
|
|
|
|
function handleAppend(_type: keyof typeof fieldsSchemaObject) {
|
|
const newField = {
|
|
name: "",
|
|
new: true,
|
|
field: {
|
|
type: _type,
|
|
config: Default(fieldsSchemaObject[_type]?.properties.config, {}) as any,
|
|
},
|
|
};
|
|
append(newField);
|
|
}
|
|
|
|
const formProps = {
|
|
watch,
|
|
register,
|
|
setValue,
|
|
getValues,
|
|
control,
|
|
setError,
|
|
};
|
|
return (
|
|
<>
|
|
<div className="flex flex-col gap-6">
|
|
<div className="flex flex-col gap-3">
|
|
<div className="flex flex-col gap-4">
|
|
{sortable ? (
|
|
<SortableList
|
|
data={fields}
|
|
key={fields.length}
|
|
onReordered={move}
|
|
extractId={(item) => item.id}
|
|
disableIndices={[0]}
|
|
renderItem={({ dnd, ...props }, index) => (
|
|
<EntityFieldMemo
|
|
key={props.id}
|
|
field={props as any}
|
|
index={index}
|
|
form={formProps}
|
|
errors={errors}
|
|
remove={remove}
|
|
dnd={dnd}
|
|
/>
|
|
)}
|
|
/>
|
|
) : (
|
|
<div>
|
|
{fields.map((field, index) => (
|
|
<EntityField
|
|
key={field.id}
|
|
field={field as any}
|
|
index={index}
|
|
form={formProps}
|
|
errors={errors}
|
|
remove={remove}
|
|
/>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
<Popover
|
|
className="flex flex-col w-full"
|
|
target={({ toggle }) => (
|
|
<SelectType
|
|
additionalFieldTypes={additionalFieldTypes}
|
|
onSelected={toggle}
|
|
onSelect={(type) => {
|
|
handleAppend(type as any);
|
|
}}
|
|
/>
|
|
)}
|
|
>
|
|
<Button className="justify-center">Add Field</Button>
|
|
</Popover>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</>
|
|
);
|
|
},
|
|
);
|
|
|
|
const SelectType = ({
|
|
onSelect,
|
|
additionalFieldTypes = [],
|
|
onSelected,
|
|
}: {
|
|
onSelect: (type: string) => void;
|
|
additionalFieldTypes?: (TFieldSpec & { onClick?: () => void })[];
|
|
onSelected?: () => void;
|
|
}) => {
|
|
const types: (TFieldSpec & { onClick?: () => void })[] = fieldSpecs.filter(
|
|
(s) => s.addable !== false,
|
|
);
|
|
|
|
if (additionalFieldTypes) {
|
|
types.push(...additionalFieldTypes);
|
|
}
|
|
|
|
return (
|
|
<div className="flex flex-row gap-2 justify-center flex-wrap">
|
|
{types.map((type) => (
|
|
<Button
|
|
key={type.type}
|
|
IconLeft={type.icon}
|
|
variant="ghost"
|
|
onClick={() => {
|
|
if (type.addable !== false) {
|
|
onSelect(type.type);
|
|
} else {
|
|
type.onClick?.();
|
|
}
|
|
onSelected?.();
|
|
}}
|
|
>
|
|
{type.label}
|
|
</Button>
|
|
))}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
const Debug = ({ watch, errors }) => {
|
|
return (
|
|
<div>
|
|
<div>
|
|
{Object.entries(errors).map(([key, value]) => (
|
|
<p key={key}>
|
|
{/* @ts-ignore */}
|
|
{key}: {value.message}
|
|
</p>
|
|
))}
|
|
</div>
|
|
<pre>{JSON.stringify(watch(), null, 2)}</pre>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
const EntityFieldMemo = memo(EntityField, (prev, next) => {
|
|
return prev.field.id !== next.field.id;
|
|
});
|
|
|
|
function EntityField({
|
|
field,
|
|
index,
|
|
form: { watch, register, setValue, getValues, control, setError },
|
|
remove,
|
|
errors,
|
|
dnd,
|
|
}: {
|
|
field: FieldArrayWithId<TFieldsFormSchema, "fields", "id">;
|
|
index: number;
|
|
form: Pick<
|
|
UseFormReturn<any>,
|
|
"watch" | "register" | "setValue" | "getValues" | "control" | "setError"
|
|
>;
|
|
remove: (index: number) => void;
|
|
errors: any;
|
|
dnd?: SortableItemProps;
|
|
}) {
|
|
const [opened, handlers] = useDisclosure(false);
|
|
const prefix = `fields.${index}.field` as const;
|
|
const type = field.field.type;
|
|
const name = watch(`fields.${index}.name`);
|
|
const fieldSpec = fieldSpecs.find((s) => s.type === type)!;
|
|
const specificData = omit(field.field.config, commonProps);
|
|
const disabled = fieldSpec.disabled || [];
|
|
const hidden = fieldSpec.hidden || [];
|
|
const dragDisabled = index === 0;
|
|
const hasErrors = !!errors?.fields?.[index];
|
|
const is_primary = type === "primary";
|
|
|
|
function handleDelete(index: number) {
|
|
return () => {
|
|
if (name.length === 0) {
|
|
remove(index);
|
|
return;
|
|
}
|
|
window.confirm(`Sure to delete "${name}"?`) && remove(index);
|
|
};
|
|
}
|
|
//console.log("register", register(`${prefix}.config.required`));
|
|
const dndProps = dnd ? { ...dnd.provided.draggableProps, ref: dnd.provided.innerRef } : {};
|
|
|
|
return (
|
|
<div
|
|
key={field.id}
|
|
className={twMerge(
|
|
"flex flex-col border border-muted rounded bg-background mb-2",
|
|
opened && "mb-6",
|
|
hasErrors && "border-red-500 ",
|
|
)}
|
|
{...dndProps}
|
|
>
|
|
<div className="flex flex-row gap-2 px-2 py-2">
|
|
{dnd ? (
|
|
<div className="flex items-center" {...dnd.provided.dragHandleProps}>
|
|
<IconButton Icon={TbGripVertical} className="mt-1" disabled={dragDisabled} />
|
|
</div>
|
|
) : null}
|
|
<div className="flex flex-row flex-grow gap-4 items-center md:mr-6">
|
|
<Tooltip label={fieldSpec.label}>
|
|
<div className="flex flex-row items-center p-2 bg-primary/5 rounded">
|
|
<fieldSpec.icon className="size-5" />
|
|
</div>
|
|
</Tooltip>
|
|
|
|
{field.new ? (
|
|
<TextInput
|
|
error={!!errors?.fields?.[index]?.name.message}
|
|
placeholder="Enter a property name..."
|
|
classNames={{
|
|
root: "w-full h-full",
|
|
wrapper: "font-mono h-full",
|
|
input: "pt-px !h-full",
|
|
}}
|
|
{...register(`fields.${index}.name`)}
|
|
disabled={!field.new}
|
|
/>
|
|
) : (
|
|
<div className="font-mono flex-grow flex flex-row gap-3">
|
|
<span>{name}</span>
|
|
{field.field.config?.label && (
|
|
<span className="opacity-50">{field.field.config?.label}</span>
|
|
)}
|
|
</div>
|
|
)}
|
|
<div className="flex-col gap-1 hidden md:flex">
|
|
<span className="text-xs text-primary/50 leading-none">Required</span>
|
|
{is_primary ? (
|
|
<Switch size="sm" defaultChecked disabled />
|
|
) : (
|
|
<MantineSwitch
|
|
size="sm"
|
|
name={`${prefix}.config.required`}
|
|
control={control}
|
|
/>
|
|
)}
|
|
</div>
|
|
</div>
|
|
<div className="flex items-end">
|
|
<div className="flex flex-row gap-4">
|
|
<IconButton
|
|
size="lg"
|
|
Icon={TbSettings}
|
|
disabled={is_primary}
|
|
iconProps={{ strokeWidth: 1.5 }}
|
|
onClick={handlers.toggle}
|
|
variant={opened ? "primary" : "ghost"}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{opened && (
|
|
<div className="flex flex-col border-t border-t-muted px-3 py-2 bg-lightest/50">
|
|
{/*<pre>{JSON.stringify(field, null, 2)}</pre>*/}
|
|
<Tabs defaultValue="general">
|
|
<Tabs.List className="flex flex-row">
|
|
<Tabs.Tab value="general">General</Tabs.Tab>
|
|
<Tabs.Tab value="specific">{ucFirstAllSnakeToPascalWithSpaces(type)}</Tabs.Tab>
|
|
<Tabs.Tab value="visibility" disabled>
|
|
Visiblity
|
|
</Tabs.Tab>
|
|
<div className="flex flex-grow" />
|
|
<Tabs.Tab value="code" className="!self-end">
|
|
Code
|
|
</Tabs.Tab>
|
|
</Tabs.List>
|
|
<Tabs.Panel value="general">
|
|
<div className="flex flex-col gap-2 pt-3 pb-1" key={`${prefix}_${type}`}>
|
|
<div className="flex flex-row">
|
|
<MantineSwitch
|
|
label="Required"
|
|
name={`${prefix}.config.required`}
|
|
control={control}
|
|
/>
|
|
</div>
|
|
<TextInput
|
|
label="Label"
|
|
placeholder="Label"
|
|
{...register(`${prefix}.config.label`)}
|
|
/>
|
|
<Textarea
|
|
label="Description"
|
|
placeholder="Description"
|
|
{...register(`${prefix}.config.description`)}
|
|
/>
|
|
{!hidden.includes("virtual") && (
|
|
<MantineSwitch
|
|
label="Virtual"
|
|
name={`${prefix}.config.virtual`}
|
|
control={control}
|
|
disabled={disabled.includes("virtual")}
|
|
/>
|
|
)}
|
|
</div>
|
|
</Tabs.Panel>
|
|
<Tabs.Panel value="specific">
|
|
<div className="flex flex-col gap-2 pt-3 pb-1">
|
|
<JsonSchemaForm
|
|
key={type}
|
|
schema={specificFieldSchema(type as any)}
|
|
formData={specificData}
|
|
uiSchema={dataFieldsUiSchema.config}
|
|
className="legacy hide-required-mark fieldset-alternative mute-root"
|
|
onChange={(value) => {
|
|
setValue(`${prefix}.config`, {
|
|
...getValues([`fields.${index}.config`])[0],
|
|
...value,
|
|
});
|
|
}}
|
|
/>
|
|
</div>
|
|
</Tabs.Panel>
|
|
<Tabs.Panel value="code">
|
|
{(() => {
|
|
const { id, ...json } = field;
|
|
return <JsonViewer json={json} expand={4} />;
|
|
})()}
|
|
</Tabs.Panel>
|
|
<div className="flex flex-row justify-end">
|
|
<Button
|
|
IconLeft={TbTrash}
|
|
onClick={handleDelete(index)}
|
|
size="small"
|
|
variant="subtlered"
|
|
>
|
|
Delete
|
|
</Button>
|
|
</div>
|
|
</Tabs>
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|