@headless-adminapp/fluent 1.1.9 → 1.1.11

package/DataGrid/GridColumnHeader/TableHeaderFilterCell.js

@@ -78,11 +78,14 @@ column, onResetSize, resizeHandler, resizable, disableFilter, disableSort, }) =>
         switch (attribute.type) {
             case 'money':
             case 'number':
-                return 'right';
+                return attribute.type === 'number' &&
+                    ['duration', 'time'].includes(attribute.format)
+                    ? 'left'
+                    : 'right';
             default:
                 return 'left';
         }
-    }, [attribute.type]);
+    }, [attribute]);
     const styles = useStyles();
     const isResizingRef = (0, react_1.useRef)(false);
     const [columnFilters, setColumnFilters] = (0, hooks_1.useGridColumnFilter)();

package/DataGrid/useTableColumns.js

@@ -306,7 +306,10 @@ function renderCellContent({ info, column, schema, schemaStore, locale, routeRes
     switch (attribute?.type) {
         case 'money':
         case 'number':
-            return ((0, jsx_runtime_1.jsx)(TableCell_1.TableCellText, { value: formattedValue, width: info.column.getSize(), textAlignment: "right" }, column.id));
+            return ((0, jsx_runtime_1.jsx)(TableCell_1.TableCellText, { value: formattedValue, width: info.column.getSize(), textAlignment: attribute.type === 'number' &&
+                    ['duration', 'time'].includes(attribute.format)
+                    ? 'left'
+                    : 'right' }, column.id));
         case 'lookup': {
             return renderLookupAttribute({
                 info,

package/PageCalendar/EventDialog/EventFormContent.js

@@ -4,7 +4,7 @@ exports.EventFormContent = EventFormContent;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_components_1 = require("@fluentui/react-components");
 const baseEventAttributes_1 = require("@headless-adminapp/app/calendar/baseEventAttributes");
-const AttributeController_1 = require("./AttributeController");
+const AttributeController_1 = require("../../form/AttributeController");
 function EventFormContent({ form, afterDescriptionAttributes, beforeDescriptionAttributes, readOnly, config, }) {
     const allDay = form.watch('allDay');
     return ((0, jsx_runtime_1.jsx)(react_components_1.DialogContent, { children: (0, jsx_runtime_1.jsxs)("div", { style: {
@@ -13,15 +13,15 @@ function EventFormContent({ form, afterDescriptionAttributes, beforeDescriptionA
                 gap: react_components_1.tokens.spacingVerticalM,
                 marginTop: react_components_1.tokens.spacingVerticalL,
                 marginBottom: react_components_1.tokens.spacingVerticalL,
-            }, children: [(0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { form: form, attributeName: "title", attribute: baseEventAttributes_1.baseEventAttributes.title, readOnly: readOnly }), (0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { form: form, attributeName: "start", attribute: {
+            }, children: [(0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { control: form.control, attributeName: "title", attribute: baseEventAttributes_1.baseEventAttributes.title, readOnly: readOnly }), (0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { control: form.control, attributeName: "start", attribute: {
                         ...baseEventAttributes_1.baseEventAttributes.start,
                         ...(allDay ? { format: 'date' } : { format: 'datetime' }),
-                    }, readOnly: readOnly }), (0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { form: form, attributeName: "end", attribute: {
+                    }, readOnly: readOnly }), (0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { control: form.control, attributeName: "end", attribute: {
                         ...baseEventAttributes_1.baseEventAttributes.end,
                         ...(allDay ? { format: 'date' } : { format: 'datetime' }),
-                    }, readOnly: readOnly }), !config.disableAllDay && ((0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { form: form, attributeName: "allDay", attribute: baseEventAttributes_1.baseEventAttributes.allDay, readOnly: readOnly })), Object.entries(beforeDescriptionAttributes ?? {}).map(([attributeName, attribute]) => {
-                    return ((0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { form: form, attributeName: attributeName, attribute: attribute, readOnly: readOnly }, attributeName));
-                }), (0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { form: form, attributeName: "description", attribute: baseEventAttributes_1.baseEventAttributes.description, readOnly: readOnly }), Object.entries(afterDescriptionAttributes ?? {}).map(([attributeName, attribute]) => {
-                    return ((0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { form: form, attributeName: attributeName, attribute: attribute, readOnly: readOnly }, attributeName));
+                    }, readOnly: readOnly }), !config.disableAllDay && ((0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { control: form.control, attributeName: "allDay", attribute: baseEventAttributes_1.baseEventAttributes.allDay, readOnly: readOnly })), Object.entries(beforeDescriptionAttributes ?? {}).map(([attributeName, attribute]) => {
+                    return ((0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { control: form.control, attributeName: attributeName, attribute: attribute, readOnly: readOnly }, attributeName));
+                }), (0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { control: form.control, attributeName: "description", attribute: baseEventAttributes_1.baseEventAttributes.description, readOnly: readOnly }), Object.entries(afterDescriptionAttributes ?? {}).map(([attributeName, attribute]) => {
+                    return ((0, jsx_runtime_1.jsx)(AttributeController_1.AttributeController, { control: form.control, attributeName: attributeName, attribute: attribute, readOnly: readOnly }, attributeName));
                 })] }) }));
 }

package/components/DialogLogin.d.ts

@@ -1,6 +1,9 @@
 interface LoginFormProps {
     logoImageUrl?: string;
     onLogin: (username: string, password: string) => Promise<void>;
+    beforeLoginContent?: React.ReactNode;
+    afterLoginContent?: React.ReactNode;
+    subtitle?: string;
 }
-export declare function DialogLogin(props: LoginFormProps): import("react/jsx-runtime").JSX.Element;
+export declare function DialogLogin(props: Readonly<LoginFormProps>): import("react/jsx-runtime").JSX.Element;
 export {};

package/components/DialogLogin.js

@@ -5,5 +5,5 @@ const jsx_runtime_1 = require("react/jsx-runtime");
 const react_components_1 = require("@fluentui/react-components");
 const LoginForm_1 = require("./LoginForm");
 function DialogLogin(props) {
-    return ((0, jsx_runtime_1.jsx)(react_components_1.Dialog, { open: true, onOpenChange: () => { }, modalType: "non-modal", children: (0, jsx_runtime_1.jsx)(react_components_1.DialogSurface, { style: { maxWidth: 360 }, children: (0, jsx_runtime_1.jsx)(react_components_1.DialogBody, { children: (0, jsx_runtime_1.jsx)(react_components_1.DialogContent, { children: (0, jsx_runtime_1.jsx)(LoginForm_1.LoginForm, { onLogin: props.onLogin, logoImageUrl: props.logoImageUrl }) }) }) }) }));
+    return ((0, jsx_runtime_1.jsx)(react_components_1.Dialog, { open: true, onOpenChange: () => { }, modalType: "non-modal", children: (0, jsx_runtime_1.jsx)(react_components_1.DialogSurface, { style: { maxWidth: 360 }, children: (0, jsx_runtime_1.jsx)(react_components_1.DialogBody, { children: (0, jsx_runtime_1.jsx)(react_components_1.DialogContent, { children: (0, jsx_runtime_1.jsx)(LoginForm_1.LoginForm, { onLogin: props.onLogin, logoImageUrl: props.logoImageUrl, afterLoginContent: props.afterLoginContent, beforeLoginContent: props.beforeLoginContent, subtitle: props.subtitle }) }) }) }) }));
 }

package/form/AttributeController.d.ts

@@ -0,0 +1,10 @@
+import { Attribute } from '@headless-adminapp/core';
+import { Control, FieldPath, FieldValues } from 'react-hook-form';
+interface AttributeControllerProps<TFieldValues extends FieldValues = FieldValues> {
+    attribute: Attribute;
+    attributeName: FieldPath<TFieldValues>;
+    control: Control<TFieldValues>;
+    readOnly?: boolean;
+}
+export declare function AttributeController<TFieldValues extends FieldValues = FieldValues>({ attribute, attributeName, control, readOnly, }: Readonly<AttributeControllerProps<TFieldValues>>): import("react/jsx-runtime").JSX.Element;
+export {};

package/form/AttributeController.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AttributeController = AttributeController;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_hook_form_1 = require("react-hook-form");
+const SectionControl_1 = require("../DataForm/SectionControl");
+const StandardControl_1 = require("../PageEntityForm/StandardControl");
+function AttributeController({ attribute, attributeName, control, readOnly, }) {
+    return ((0, jsx_runtime_1.jsx)(react_hook_form_1.Controller, { control: control, name: attributeName, render: ({ field, fieldState, formState }) => {
+            const isError = (fieldState.isTouched || formState.isSubmitted) &&
+                !!fieldState.error?.message;
+            const errorMessage = fieldState.isTouched || formState.isSubmitted
+                ? fieldState.error?.message
+                : '';
+            return ((0, jsx_runtime_1.jsx)(SectionControl_1.SectionControlWrapper, { label: attribute.label, labelPosition: "left", required: attribute.required, isError: isError, errorMessage: errorMessage, children: (0, jsx_runtime_1.jsx)(StandardControl_1.StandardControl, { attribute: attribute, name: attributeName, value: field.value, onChange: field.onChange, onBlur: field.onBlur, errorMessage: errorMessage, isError: isError, readOnly: readOnly || attribute.readonly }) }));
+        } }));
+}

package/form/useFormForAttributes.d.ts

@@ -0,0 +1,8 @@
+import { InferredSchemaType, SchemaAttributes } from '@headless-adminapp/core/schema';
+import { Nullable } from '@headless-adminapp/core/types';
+interface UseFormForAttributesProps<SA extends SchemaAttributes = SchemaAttributes> {
+    attributes: SA;
+    defaultValues: Partial<Nullable<InferredSchemaType<SA>>>;
+}
+export declare function useFormForAttributes<SA extends SchemaAttributes = SchemaAttributes>(props: UseFormForAttributesProps<SA>): import("react-hook-form").UseFormReturn<Nullable<InferredSchemaType<SA>>, any, undefined>;
+export {};

package/form/useFormForAttributes.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useFormForAttributes = useFormForAttributes;
+const form_1 = require("@headless-adminapp/app/form");
+const locale_1 = require("@headless-adminapp/app/locale");
+const react_hook_form_1 = require("react-hook-form");
+const PromptDialog_1 = require("../DialogContainer/PromptDialog");
+function useFormForAttributes(props) {
+    const { language, region } = (0, locale_1.useLocale)();
+    const formValidationStrings = (0, form_1.useFormValidationStrings)();
+    const form = (0, react_hook_form_1.useForm)({
+        mode: 'all',
+        defaultValues: props.defaultValues,
+        shouldUnregister: false,
+        resolver: (0, PromptDialog_1.formValidator)({
+            attributes: props.attributes,
+            language,
+            strings: formValidationStrings,
+            region,
+        }),
+    });
+    return form;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/fluent",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -50,5 +50,5 @@
     "uuid": "11.0.3",
     "yup": "^1.4.0"
   },
-  "gitHead": "5ee9022d0e1bc4c75ef4777a4cfbd4557ae34a99"
+  "gitHead": "e88cae2cc31abaf6852549e3fbc3235eec84cc8c"
 }